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

diff --git a/dep/src/ace/MEM_Stream.cpp b/dep/src/ace/MEM_Stream.cpp
deleted file mode 100644
index 3ad616314ad..00000000000
--- a/dep/src/ace/MEM_Stream.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-// $Id: MEM_Stream.cpp 80826 2008-03-04 14:51:23Z wotte $
-
-#include "ace/MEM_Stream.h"
-
-#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
-
-#if !defined (__ACE_INLINE__)
-#include "ace/MEM_Stream.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(ace, MEM_Stream, "$Id: MEM_Stream.cpp 80826 2008-03-04 14:51:23Z wotte $")
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_ALLOC_HOOK_DEFINE(ACE_MEM_Stream)
-
-void
-ACE_MEM_Stream::dump (void) const
-{
-#if defined (ACE_HAS_DUMP)
-  ACE_TRACE ("ACE_MEM_Stream::dump");
-#endif /* ACE_HAS_DUMP */
-}
-
-int
-ACE_MEM_Stream::close (void)
-{
-  this->send ((char *)0, 0);
-
-  this->fini ();
-
-#if defined (ACE_WIN32)
-  // We need the following call to make things work correctly on
-  // Win32, which requires use to do a <close_writer> before doing the
-  // close in order to avoid losing data.  Note that we don't need to
-  // do this on UNIX since it doesn't have this "feature".  Moreover,
-  // this will cause subtle problems on UNIX due to the way that
-  // fork() works.
-  this->close_writer ();
-#endif /* ACE_WIN32 */
-  // Close down the socket.
-  return ACE_SOCK::close ();
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */
-