mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-12 19: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

12
dep/acelite/ace/Framework_Component.cpp
View file

@ -1,3 +1,5 @@
// $Id: Framework_Component.cpp 96985 2013-04-11 15:50:32Z huangh $
#include "ace/Framework_Component.h"
#if !defined (__ACE_INLINE__)
@ -42,15 +44,9 @@ ACE_Framework_Repository::open (int size)
ACE_Framework_Component **temp = 0;
#if defined (ACE_HAS_ALLOC_HOOKS)
ACE_ALLOCATOR_RETURN (temp,
static_cast<ACE_Framework_Component**> (ACE_Allocator::instance()->malloc(sizeof(ACE_Framework_Component*) * size)),
-1);
#else
ACE_NEW_RETURN (temp,
ACE_Framework_Component *[size],
-1);
#endif /* ACE_HAS_ALLOC_HOOKS */
this->component_vector_ = temp;
this->total_size_ = size;
@ -79,11 +75,7 @@ ACE_Framework_Repository::close (void)
delete s;
}
#if defined (ACE_HAS_ALLOC_HOOKS)
ACE_Allocator::instance()->free(this->component_vector_);
#else
delete [] this->component_vector_;
#endif /* ACE_HAS_ALLOC_HOOKS */
this->component_vector_ = 0;
this->current_size_ = 0;
}