mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-12 10:37:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some missing from merge.

Browse source 
Signed-off-by: Salja <salja2012@hotmail.de>
This commit is contained in:
Salja 2012-08-05 14:54:07 +02:00 • committed by Antz
parent ec939a5bce
commit f4be15a7af
1895 changed files with 160408 additions and 53601 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dep/acelite/ace/Monitor_Base.cpp
View file

@ -1,8 +1,9 @@
// $Id: Monitor_Base.cpp 96985 2013-04-11 15:50:32Z huangh $
#include "ace/Monitor_Base.h"
#if defined (ACE_HAS_MONITOR_FRAMEWORK) && (ACE_HAS_MONITOR_FRAMEWORK == 1)
#include "ace/ACE.h"
#include "ace/Monitor_Admin_Manager.h"
#include "ace/Monitor_Control_Action.h"
#include "ace/Monitor_Point_Registry.h"
@ -36,11 +37,7 @@ namespace ACE
{
for (size_t i = 0UL; i < this->data_.index_; ++i)
{
#if defined (ACE_HAS_ALLOC_HOOKS)
ACE_Allocator::instance()->free(this->data_.list_[i]);
#else
delete [] this->data_.list_[i];
#endif /* ACE_HAS_ALLOC_HOOKS */
}
}
}
@ -402,3 +399,4 @@ namespace ACE
ACE_END_VERSIONED_NAMESPACE_DECL
#endif /* ACE_HAS_MONITOR_FRAMEWORK==1 */