Merge. Revision history for source files should be all back now.

--HG--
branch : trunk
rename : sql/CMakeLists.txt => sql/tools/CMakeLists.txt
rename : src/server/game/Pools/PoolHandler.cpp => src/server/game/Pools/PoolMgr.cpp
rename : src/server/game/Pools/PoolHandler.h => src/server/game/Pools/PoolMgr.h
rename : src/server/game/PrecompiledHeaders/NixCorePCH.cpp => src/server/game/PrecompiledHeaders/gamePCH.cpp
rename : src/server/game/PrecompiledHeaders/NixCorePCH.h => src/server/game/PrecompiledHeaders/gamePCH.h

1 files changed, 51 insertions, 0 deletions

diff --git a/externals/ace/Object_Manager.inl b/externals/ace/Object_Manager.inl
new file mode 100644
index 00000000000..30dca17ac4c
--- /dev/null
+++ b/externals/ace/Object_Manager.inl
@@ -0,0 +1,51 @@
+// -*- C++ -*-
+//
+// $Id: Object_Manager.inl 84163 2009-01-15 07:57:27Z johnnyw $
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+ACE_INLINE
+int
+ACE_Object_Manager::at_exit (ACE_Cleanup *object,
+                             void *param,
+                             const char* name)
+{
+  return ACE_Object_Manager::instance ()->at_exit_i (
+    object,
+    (ACE_CLEANUP_FUNC) ACE_CLEANUP_DESTROYER_NAME,
+    param,
+    name);
+}
+
+ACE_INLINE
+int
+ACE_Object_Manager::at_exit (void *object,
+                             ACE_CLEANUP_FUNC cleanup_hook,
+                             void *param,
+                             const char* name)
+{
+  return ACE_Object_Manager::instance ()->at_exit_i (
+    object,
+    cleanup_hook,
+    param,
+    name);
+}
+
+ACE_INLINE
+int
+ACE_Object_Manager::remove_at_exit (void *object)
+{
+  return ACE_Object_Manager::instance ()->remove_at_exit_i (object);
+}
+
+ACE_INLINE
+ACE_Sig_Set &
+ACE_Object_Manager::default_mask (void)
+{
+  // A safe cast, but this static method shouldn't be used anyways.
+  // Use ACE_Object_Manager::default_mask () instead.
+  return
+    *reinterpret_cast<ACE_Sig_Set *> (ACE_OS_Object_Manager::default_mask ());
+}
+
+ACE_END_VERSIONED_NAMESPACE_DECL