diff options
author | leak <leak@bitmx.net> | 2014-07-01 00:54:09 +0200 |
---|---|---|
committer | leak <leak@bitmx.net> | 2014-07-01 00:54:09 +0200 |
commit | 029bad6698df6ac9556fe308342e616f4a7a8cc7 (patch) | |
tree | 01142dad7e748aba7799b9c296ccc4cf11db886f /src/server/shared/Logging | |
parent | d39a013b6b979a5158bf86c37a197cb902b2c2f9 (diff) |
Replaced all remaining ACE based Singletons
Replaced ACE base AutoPtr class with shared_ptr
Note: worldserver currently broken due to MapUpdater threading failure (ACE ofc, what else could it be)
Diffstat (limited to 'src/server/shared/Logging')
-rw-r--r-- | src/server/shared/Logging/Appender.h | 4 | ||||
-rw-r--r-- | src/server/shared/Logging/AppenderConsole.h | 2 | ||||
-rw-r--r-- | src/server/shared/Logging/AppenderFile.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/server/shared/Logging/Appender.h b/src/server/shared/Logging/Appender.h index 84d0dc14eca..67213d0ddd0 100644 --- a/src/server/shared/Logging/Appender.h +++ b/src/server/shared/Logging/Appender.h @@ -18,10 +18,10 @@ #ifndef APPENDER_H #define APPENDER_H -#include "Define.h" -#include <time.h> #include <unordered_map> #include <string> +#include <time.h> +#include "Define.h" // Values assigned have their equivalent in enum ACE_Log_Priority enum LogLevel diff --git a/src/server/shared/Logging/AppenderConsole.h b/src/server/shared/Logging/AppenderConsole.h index 1aaa74e96ec..b8f15b4fa0f 100644 --- a/src/server/shared/Logging/AppenderConsole.h +++ b/src/server/shared/Logging/AppenderConsole.h @@ -18,8 +18,8 @@ #ifndef APPENDERCONSOLE_H #define APPENDERCONSOLE_H -#include "Appender.h" #include <string> +#include "Appender.h" enum ColorTypes { diff --git a/src/server/shared/Logging/AppenderFile.h b/src/server/shared/Logging/AppenderFile.h index 592742c2184..a600c92d152 100644 --- a/src/server/shared/Logging/AppenderFile.h +++ b/src/server/shared/Logging/AppenderFile.h @@ -18,8 +18,8 @@ #ifndef APPENDERFILE_H #define APPENDERFILE_H -#include "Appender.h" #include <atomic> +#include "Appender.h" class AppenderFile: public Appender { |