diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-09-17 23:49:13 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-09-17 23:49:13 +0100 |
| commit | 6568b0624dcd03243c70f9aa905b88422cb1e4c2 (patch) | |
| tree | 48ec6babfbfb2f9d255df568b659db9541d11054 /dep/acelite/ace/Service_Config.h | |
| parent | e3add09fb7f8f3c425f6cb0e7611e4e2381bf88d (diff) | |
| parent | 2e21fa6b925c4572d620248f1b149a5d652836b2 (diff) | |
Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Entities/Object/Updates/UpdateFields.h
src/server/game/Entities/Unit/Unit.cpp
src/server/scripts/Spells/spell_druid.cpp
Diffstat (limited to 'dep/acelite/ace/Service_Config.h')
| -rw-r--r-- | dep/acelite/ace/Service_Config.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/dep/acelite/ace/Service_Config.h b/dep/acelite/ace/Service_Config.h index 5269d8f367e..56be51fde10 100644 --- a/dep/acelite/ace/Service_Config.h +++ b/dep/acelite/ace/Service_Config.h @@ -4,7 +4,7 @@ /** * @file Service_Config.h * - * $Id: Service_Config.h 89501 2010-03-17 08:59:56Z vzykov $ + * $Id: Service_Config.h 94385 2011-08-10 12:19:36Z johnnyw $ * * @author Douglas C. Schmidt <schmidt@cs.wustl.edu> */ @@ -159,8 +159,8 @@ template<> class ACE_Export ACE_Threading_Helper<ACE_Thread_Mutex> { public: - ACE_Threading_Helper (); - ~ACE_Threading_Helper (); + ACE_Threading_Helper (void); + ~ACE_Threading_Helper (void); void set (void*); void* get (void); @@ -178,8 +178,8 @@ template<> class ACE_Export ACE_Threading_Helper<ACE_Null_Mutex> { public: - ACE_Threading_Helper (); - ~ACE_Threading_Helper (); + ACE_Threading_Helper (void); + ~ACE_Threading_Helper (void); void set (void*); void* get (void); |