small refactor

Author: Cheaterdev

sources/Core/Application/Application.h

@@ -1,4 +1,5 @@
 #pragma once
+#include "patterns/Singleton.h"
 
 class Application : public Singleton<Application>
 {

sources/Core/Data/Data.cpp

@@ -1,4 +1,5 @@
 #include "pch.h"
+#include "Data.h"
 
 namespace DataPacker
 {

sources/Core/Data/Data.h

@@ -1,3 +1,7 @@
+#pragma once
+#include "Debug/Exceptions.h"
+#include "Utils/utils.h"
+
 namespace DataPacker
 {
 

sources/Core/Debug/Debug.cpp

@@ -1,5 +1,5 @@
 #include "pch.h"
-
+#include "Exceptions.h"
 #include <DbgHelp.h>
 
 namespace Exceptions

sources/Core/Debug/Debug.h

@@ -1,5 +1,7 @@
 #include <boost/stacktrace.hpp>
 
+#include "patterns/Singleton.h"
+#include "Log/Log.h"
 
 // #define LEAK_TEST_ENABLE
 #ifdef LEAK_TEST_ENABLE

sources/Core/Events/Events.h

@@ -1,4 +1,6 @@
 #pragma once
+#include "Data/Data.h"
+#include "Serialization/serialization.h"
 namespace Events
 {
 

sources/Core/Events/Tasks.cpp

@@ -1,4 +1,7 @@
 #include "pch.h"
+#include "Events/Tasks.h"
+#include "Log/Log.h"
+#include "Events/Events.h"
 
 std::shared_ptr<Task> TaskInfoManager::create_task(std::wstring name)
 {

sources/Core/Events/Tasks.h

@@ -1,6 +1,6 @@
 #pragma once
 #include "Events.h"
-
+#include "patterns/Singleton.h"
 
 class Task
 {

sources/Core/Log/Log.cpp

@@ -1,4 +1,7 @@
 #include "pch.h"
+
+#include  "Log.h"
+
 #define BOOST_DECL_EXPORTS
 #define BOOST_WARCHIVE_SOURCE
 #define BOOST_ARCHIVE_DECL
@@ -67,7 +70,7 @@ void Log::crash_error(HRESULT hr, std::string at /*= ""*/)
 
 std::string LogBlock::get_string() const
 {
-    return "[" + current_level_name + "] : " + s->str();
+    return "[" + current_level_name + "] : " + data->s.str();
 }
 
 Log& LogBlock::operator<<(const Log::endline&)
@@ -78,28 +81,36 @@ Log& LogBlock::operator<<(const Log::endline&)
 LogBlock& LogBlock::operator<<(string_view smth)
 {
     if (need_logging())
-        *s << smth;
+        data->s << smth;
 
     return (*this);
 }
 
 LogBlock& LogBlock::operator<<(wstring_view smth)
 {
     if (need_logging())
-        *s << convert(smth);
+        data->s << convert(smth);
 
     return (*this);
 }
 
+
+LogBlock::shared_data::shared_data():archive(s)
+{
+	
+}
+
 LogBlock::LogBlock(Log& output, log_level_internal level) : log(output)
 {
     log_level = level;
     current_level =log_level_internal::level_info;
     current_level_name = LogLevel<log_level_internal::level_info>::NAME;
-    s.reset(new std::ostringstream());
+
+    data = std::make_shared<shared_data>();
+  //  s.reset(new std::ostringstream());
     auto delta = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::high_resolution_clock::now() - start_time).count();
     //  auto now_c = std::chrono::system_clock::to_time_t(now);
-    *s << delta << ' ';
+   data->s << delta << ' ';
 }
 
 LogListener::~LogListener()
@@ -111,7 +122,8 @@ LogListener::LogListener()
 {
 //   Log::get().listeners.insert(this);
     active = true;
-    Log::get().on_log.register_handler(this, std::bind(&LogListener::on_log, this, std::placeholders::_1));
+    Log::get().on_log.register_handler(this, [this](const LogBlock& v) { on_log(v); } );
+
 }