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

diff --git a/externals/ace/UNIX_Addr.inl b/externals/ace/UNIX_Addr.inl
new file mode 100644
index 00000000000..5e801b56fea
--- /dev/null
+++ b/externals/ace/UNIX_Addr.inl
@@ -0,0 +1,57 @@
+// -*- C++ -*-
+//
+// $Id: UNIX_Addr.inl 80826 2008-03-04 14:51:23Z wotte $
+
+
+#include "ace/OS_NS_string.h"
+
+
+#if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+#if defined (ACE_HAS_WCHAR)
+/// Creates an ACE_UNIX_Addr from a string.
+ACE_INLINE
+ACE_UNIX_Addr::ACE_UNIX_Addr (const wchar_t rendezvous_point[])
+{
+  this->set (ACE_Wide_To_Ascii (rendezvous_point).char_rep ());
+}
+
+/// Creates an ACE_UNIX_Addr from a string.
+ACE_INLINE int
+ACE_UNIX_Addr::set (const wchar_t rendezvous_point[])
+{
+  return this->set (ACE_Wide_To_Ascii (rendezvous_point).char_rep ());
+}
+#endif /* ACE_HAS_WCHAR */
+
+// Compare two addresses for equality.
+
+ACE_INLINE bool
+ACE_UNIX_Addr::operator == (const ACE_UNIX_Addr &sap) const
+{
+  return ACE_OS::strncmp (this->unix_addr_.sun_path,
+                          sap.unix_addr_.sun_path,
+                          sizeof this->unix_addr_.sun_path) == 0;
+}
+
+// Compare two addresses for inequality.
+
+ACE_INLINE bool
+ACE_UNIX_Addr::operator != (const ACE_UNIX_Addr &sap) const
+{
+  return !((*this) == sap);     // This is lazy, of course... ;-)
+}
+
+// Return the path name used for the rendezvous point.
+
+ACE_INLINE const char *
+ACE_UNIX_Addr::get_path_name (void) const
+{
+  return this->unix_addr_.sun_path;
+}
+
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */