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

diff --git a/externals/ace/Functor_String.inl b/externals/ace/Functor_String.inl
new file mode 100644
index 00000000000..bdac96386f8
--- /dev/null
+++ b/externals/ace/Functor_String.inl
@@ -0,0 +1,56 @@
+// -*- C++ -*-
+//
+// $Id: Functor_String.inl 80826 2008-03-04 14:51:23Z wotte $
+
+#include "ace/ACE.h"
+#include "ace/String_Base.h"
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+ACE_INLINE unsigned long
+ACE_Hash<ACE_CString>::operator () (const ACE_CString &t) const
+{
+  return t.hash ();
+}
+
+
+ACE_INLINE int
+ACE_Equal_To<ACE_CString>::operator () (const ACE_CString &lhs,
+                                        const ACE_CString &rhs) const
+{
+  return lhs == rhs;
+}
+
+ACE_INLINE int
+ACE_Less_Than<ACE_CString>::operator () (const ACE_CString &lhs,
+                                         const ACE_CString &rhs) const
+{
+  return (lhs < rhs);
+}
+
+
+#if defined (ACE_USES_WCHAR)
+ACE_INLINE unsigned long
+ACE_Hash<ACE_WString>::operator () (const ACE_WString &t) const
+{
+  return t.hash ();
+}
+
+
+ACE_INLINE int
+ACE_Equal_To<ACE_WString>::operator () (const ACE_WString &lhs,
+                                        const ACE_WString &rhs) const
+{
+  return lhs == rhs;
+}
+
+ACE_INLINE int
+ACE_Less_Than<ACE_WString>::operator () (const ACE_WString &lhs,
+                                         const ACE_WString &rhs) const
+{
+  return (lhs < rhs);
+}
+
+#endif /*ACE_USES_WCHAR*/
+
+ACE_END_VERSIONED_NAMESPACE_DECL