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

diff --git a/externals/ace/LSOCK_Connector.cpp b/externals/ace/LSOCK_Connector.cpp
new file mode 100644
index 00000000000..c1e21b9d542
--- /dev/null
+++ b/externals/ace/LSOCK_Connector.cpp
@@ -0,0 +1,59 @@
+// $Id: LSOCK_Connector.cpp 80826 2008-03-04 14:51:23Z wotte $
+
+#include "ace/LSOCK_Connector.h"
+#if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
+
+#include "ace/Log_Msg.h"
+
+ACE_RCSID(ace, LSOCK_Connector, "$Id: LSOCK_Connector.cpp 80826 2008-03-04 14:51:23Z wotte $")
+
+#if !defined (__ACE_INLINE__)
+#include "ace/LSOCK_Connector.inl"
+#endif /* __ACE_INLINE__ */
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+ACE_ALLOC_HOOK_DEFINE(ACE_LSOCK_Connector)
+
+void
+ACE_LSOCK_Connector::dump (void) const
+{
+#if defined (ACE_HAS_DUMP)
+  ACE_TRACE ("ACE_LSOCK_Connector::dump");
+
+  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("\n")));
+  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
+}
+
+ACE_LSOCK_Connector::ACE_LSOCK_Connector (void)
+{
+  ACE_TRACE ("ACE_LSOCK_Connector::ACE_LSOCK_Connector");
+}
+
+// Establish a connection.
+ACE_LSOCK_Connector::ACE_LSOCK_Connector (ACE_LSOCK_Stream &new_stream,
+                                          const ACE_UNIX_Addr &remote_sap,
+                                          ACE_Time_Value *timeout,
+                                          const ACE_Addr &local_sap,
+                                          int reuse_addr,
+                                          int flags,
+                                          int perms)
+  : ACE_SOCK_Connector (new_stream,
+                        remote_sap,
+                        timeout,
+                        local_sap,
+                        reuse_addr,
+                        flags,
+                        perms)
+{
+  ACE_TRACE ("ACE_LSOCK_Connector::ACE_LSOCK_Connector");
+  // This is necessary due to the weird inheritance relationships of
+  // ACE_LSOCK_Stream.
+  new_stream.set_handle (new_stream.get_handle ());
+}
+
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */