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, 46 insertions, 0 deletions

diff --git a/externals/ace/Thread_Control.inl b/externals/ace/Thread_Control.inl
new file mode 100644
index 00000000000..6ebd3ac2c56
--- /dev/null
+++ b/externals/ace/Thread_Control.inl
@@ -0,0 +1,46 @@
+// -*- C++ -*-
+//
+// $Id: Thread_Control.inl 80826 2008-03-04 14:51:23Z wotte $
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+// Set the exit status.
+
+ACE_INLINE ACE_THR_FUNC_RETURN
+ACE_Thread_Control::status (ACE_THR_FUNC_RETURN s)
+{
+  ACE_OS_TRACE ("ACE_Thread_Control::status");
+  return this->status_ = s;
+}
+
+// Get the exit status.
+
+ACE_INLINE ACE_THR_FUNC_RETURN
+ACE_Thread_Control::status (void)
+{
+  ACE_OS_TRACE ("ACE_Thread_Control::status");
+  return this->status_;
+}
+
+// Returns the current <Thread_Manager>.
+
+ACE_INLINE ACE_Thread_Manager *
+ACE_Thread_Control::thr_mgr (void)
+{
+  ACE_OS_TRACE ("ACE_Thread_Control::thr_mgr");
+  return this->tm_;
+}
+
+// Atomically set a new <Thread_Manager> and return the old
+// <Thread_Manager>.
+
+ACE_INLINE ACE_Thread_Manager *
+ACE_Thread_Control::thr_mgr (ACE_Thread_Manager *tm)
+{
+  ACE_OS_TRACE ("ACE_Thread_Control::thr_mgr");
+  ACE_Thread_Manager *o_tm = this->tm_;
+  this->tm_ = tm;
+  return o_tm;
+}
+
+ACE_END_VERSIONED_NAMESPACE_DECL