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

diff --git a/externals/ace/Dynamic_Service.inl b/externals/ace/Dynamic_Service.inl
new file mode 100644
index 00000000000..31324bf535b
--- /dev/null
+++ b/externals/ace/Dynamic_Service.inl
@@ -0,0 +1,39 @@
+// -*- C++ -*-
+//
+// $Id: Dynamic_Service.inl 81318 2008-04-10 10:12:05Z johnnyw $
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+#if defined (ACE_USES_WCHAR)
+
+template <class TYPE> ACE_INLINE TYPE *
+ACE_Dynamic_Service<TYPE>::instance (const ACE_ANTI_TCHAR *name)
+{
+  return instance (ACE_TEXT_CHAR_TO_TCHAR (name),false);
+}
+
+template <class TYPE> ACE_INLINE TYPE *
+ACE_Dynamic_Service<TYPE>::instance (const ACE_ANTI_TCHAR *name,
+                                     bool no_global)
+{
+  return instance (ACE_TEXT_CHAR_TO_TCHAR (name),no_global);
+}
+
+template <class TYPE> ACE_INLINE TYPE *
+ACE_Dynamic_Service<TYPE>::instance (const ACE_Service_Gestalt* repo,
+                                     const ACE_ANTI_TCHAR *name)
+{
+  return instance (repo, ACE_TEXT_CHAR_TO_TCHAR (name),false);
+}
+
+template <class TYPE> ACE_INLINE TYPE *
+ACE_Dynamic_Service<TYPE>::instance (const ACE_Service_Gestalt* repo,
+                                     const ACE_ANTI_TCHAR *name,
+                                     bool no_global)
+{
+  return instance (repo, ACE_TEXT_CHAR_TO_TCHAR (name),no_global);
+}
+
+#endif  // ACE_USES_WCHAR
+
+ACE_END_VERSIONED_NAMESPACE_DECL