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

diff --git a/externals/ace/DEV_Connector.inl b/externals/ace/DEV_Connector.inl
new file mode 100644
index 00000000000..a57a38b71f4
--- /dev/null
+++ b/externals/ace/DEV_Connector.inl
@@ -0,0 +1,33 @@
+// -*- C++ -*-
+//
+// $Id: DEV_Connector.inl 82723 2008-09-16 09:35:44Z johnnyw $
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+// Creates a Local ACE_DEV.
+
+ACE_INLINE
+ACE_DEV_Connector::ACE_DEV_Connector (ACE_DEV_IO &new_io,
+                                      const ACE_DEV_Addr &remote_sap,
+                                      ACE_Time_Value *timeout,
+                                      const ACE_Addr &local_sap,
+                                      int reuse_addr,
+                                      int flags,
+                                      int perms)
+{
+  ACE_TRACE ("ACE_DEV_Connector::ACE_DEV_Connector");
+  if (this->connect (new_io, remote_sap, timeout, local_sap,
+                     reuse_addr, flags, perms) == ACE_IO_SAP::INVALID_HANDLE
+      && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME))
+    ACE_ERROR ((LM_ERROR, ACE_TEXT ("address %s, %p\n"),
+                    remote_sap.get_path_name (), ACE_TEXT ("ACE_DEV_IO")));
+}
+
+ACE_INLINE bool
+ACE_DEV_Connector::reset_new_handle (ACE_HANDLE)
+{
+  // Nothing to do here since the handle is not a socket
+  return false;
+}
+
+ACE_END_VERSIONED_NAMESPACE_DECL