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

[10643] Update the ACE part we use to 5.8.2

Browse source 
Signed-off-by: Neo2003 <Neo.2003@Hotmail.fr>
This commit is contained in:
Neo2003 2010-10-25 20:36:51 +02:00
parent 8f71d95c0d
commit 23c920ca4b
739 changed files with 22031 additions and 40373 deletions
Download patch file Download diff file Expand all files Collapse all files

26
dep/ACE_wrappers/ace/Singleton.cpp
View file

@ -1,4 +1,4 @@
// $Id: Singleton.cpp 80826 2008-03-04 14:51:23Z wotte $
// $Id: Singleton.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $
#ifndef ACE_SINGLETON_CPP
#define ACE_SINGLETON_CPP
@ -17,11 +17,7 @@
#include "ace/Log_Msg.h"
#include "ace/Framework_Component.h"
#include "ace/Guard_T.h"
ACE_RCSID (ace,
Singleton,
"$Id: Singleton.cpp 80826 2008-03-04 14:51:23Z wotte $")
#include "ace/os_include/os_typeinfo.h"
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
@ -95,7 +91,7 @@ ACE_Singleton<TYPE, ACE_LOCK>::instance (void)
ACE_NEW_RETURN (singleton, (ACE_Singleton<TYPE, ACE_LOCK>), 0);
// Register for destruction with ACE_Object_Manager.
ACE_Object_Manager::at_exit (singleton);
ACE_Object_Manager::at_exit (singleton, 0, typeid (TYPE).name ());
#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
}
#endif /* ACE_MT_SAFE */
@ -108,10 +104,24 @@ ACE_Singleton<TYPE, ACE_LOCK>::instance (void)
template <class TYPE, class ACE_LOCK> void
ACE_Singleton<TYPE, ACE_LOCK>::cleanup (void *)
{
ACE_Object_Manager::remove_at_exit (this);
delete this;
ACE_Singleton<TYPE, ACE_LOCK>::instance_i () = 0;
}
template <class TYPE, class ACE_LOCK> void
ACE_Singleton<TYPE, ACE_LOCK>::close (void)
{
ACE_Singleton<TYPE, ACE_LOCK> *&singleton =
ACE_Singleton<TYPE, ACE_LOCK>::instance_i ();
if (singleton)
{
singleton->cleanup ();
ACE_Singleton<TYPE, ACE_LOCK>::instance_i () = 0;
}
}
#if !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES)
// Pointer to the Singleton instance.
template <class TYPE, class ACE_LOCK> ACE_Singleton<TYPE, ACE_LOCK> *
@ -282,7 +292,7 @@ ACE_TSS_Singleton<TYPE, ACE_LOCK>::instance (void)
0);
// Register for destruction with ACE_Object_Manager.
ACE_Object_Manager::at_exit (singleton);
ACE_Object_Manager::at_exit (singleton, 0, typeid (TYPE).name ());
#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
}
#endif /* ACE_MT_SAFE */