diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-09-13 23:21:50 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-09-13 23:21:50 +0200 |
| commit | 85e49d0d143b83432d85b5f645fb667cd166a9fc (patch) | |
| tree | f0a1eec3942b2d64fb6be70a37e1bc8b3333f796 /src/server/shared/Logging/AppenderFile.h | |
| parent | 974bf5c427a5b134f09abf48d814f8c8f7e31e3c (diff) | |
| parent | f0cd684cd1f944622baac2164aa05e015e6d8060 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/worldserver/worldserver.conf.dist
Diffstat (limited to 'src/server/shared/Logging/AppenderFile.h')
| -rw-r--r-- | src/server/shared/Logging/AppenderFile.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/server/shared/Logging/AppenderFile.h b/src/server/shared/Logging/AppenderFile.h index c15974799e1..de94a46d692 100644 --- a/src/server/shared/Logging/AppenderFile.h +++ b/src/server/shared/Logging/AppenderFile.h @@ -19,6 +19,7 @@ #define APPENDERFILE_H #include "Appender.h" +#include "ace/Atomic_Op.h" class AppenderFile: public Appender { @@ -37,7 +38,7 @@ class AppenderFile: public Appender bool dynamicName; bool backup; uint64 maxFileSize; - uint64 fileSize; + ACE_Atomic_Op<ACE_Thread_Mutex, uint64> fileSize; }; #endif |