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/Svc_Handler.cpp | |
| 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/Svc_Handler.cpp')
| -rw-r--r-- | dep/acelite/ace/Svc_Handler.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/dep/acelite/ace/Svc_Handler.cpp b/dep/acelite/ace/Svc_Handler.cpp index a4f22c98ce4..565d96c5c34 100644 --- a/dep/acelite/ace/Svc_Handler.cpp +++ b/dep/acelite/ace/Svc_Handler.cpp @@ -1,4 +1,4 @@ -// $Id: Svc_Handler.cpp 89432 2010-03-10 10:34:51Z vzykov $ +// $Id: Svc_Handler.cpp 94310 2011-07-09 19:10:06Z schmidt $ #ifndef ACE_SVC_HANDLER_CPP #define ACE_SVC_HANDLER_CPP @@ -95,8 +95,7 @@ template <PR_ST_1, ACE_SYNCH_DECL> void ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::operator delete (void *p, const ACE_nothrow_t&) throw() { - ACE_TRACE - ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::operator delete(nothrow)"); + ACE_TRACE("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::operator delete(nothrow)"); ::delete [] static_cast <char *> (p); } #endif /* ACE_LACKS_PLACEMENT_OPERATOR_DELETE */ |