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

[10874] Update ACE to v5.8.3

Browse source 
(based on zergtmn's repo commit 3a8c259)
(based on zergtmn's repo commit 946c1a8)

Signed-off-by: VladimirMangos <vladimir@getmangos.com>
This commit is contained in:
zerg 2010-12-14 17:14:34 +03:00 • committed by VladimirMangos
parent c38c876b1d
commit b8d773091a
343 changed files with 3060 additions and 7431 deletions
Download patch file Download diff file Expand all files Collapse all files

13
dep/ACE_wrappers/ace/Framework_Component.cpp
View file

@ -1,5 +1,4 @@
// Framework_Component.cpp
// $Id: Framework_Component.cpp 91286 2010-08-05 09:04:31Z johnnyw $
// $Id: Framework_Component.cpp 92208 2010-10-13 06:20:39Z johnnyw $
#include "ace/Framework_Component.h"
@ -13,8 +12,6 @@
#include "ace/Recursive_Thread_Mutex.h"
#include "ace/OS_NS_string.h"
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_Framework_Component::~ACE_Framework_Component (void)
@ -60,7 +57,7 @@ int
ACE_Framework_Repository::close (void)
{
ACE_TRACE ("ACE_Framework_Repository::close");
ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1));
ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1);
this->shutting_down_ = 1;
@ -128,7 +125,7 @@ int
ACE_Framework_Repository::register_component (ACE_Framework_Component *fc)
{
ACE_TRACE ("ACE_Framework_Repository::register_component");
ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1));
ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1);
int i;
// Check to see if it's already registered
@ -155,7 +152,7 @@ int
ACE_Framework_Repository::remove_component (const ACE_TCHAR *name)
{
ACE_TRACE ("ACE_Framework_Repository::remove_component");
ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1));
ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1);
int i;
for (i = 0; i < this->current_size_; i++)
@ -178,7 +175,7 @@ ACE_Framework_Repository::remove_dll_components (const ACE_TCHAR *dll_name)
if (this->shutting_down_)
return this->remove_dll_components_i (dll_name);
ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1));
ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1);
return this->remove_dll_components_i (dll_name);
}