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, 60 deletions

diff --git a/dep/include/ace/Null_Barrier.h b/dep/include/ace/Null_Barrier.h
deleted file mode 100644
index 64e3516d2a6..00000000000
--- a/dep/include/ace/Null_Barrier.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// -*- C++ -*-
-
-//==========================================================================
-/**
- *  @file    Null_Barrier.h
- *
- *  $Id: Null_Barrier.h 80826 2008-03-04 14:51:23Z wotte $
- *
- *   Moved from Synch.h.
- *
- *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
- */
-//==========================================================================
-
-#ifndef ACE_NULL_BARRIER_H
-#define ACE_NULL_BARRIER_H
-#include /**/ "ace/pre.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-// All methods in this class are inline, so there is no
-// need to import or export on Windows. -- CAE 12/18/2003
-
-/**
- * @class ACE_Null_Barrier
- *
- * @brief Implements "NULL barrier synchronization".
- */
-class ACE_Null_Barrier
-{
-public:
-  /// Initialize the barrier to synchronize <count> threads.
-  ACE_Null_Barrier (unsigned int,
-                    const char * = 0,
-                    void * = 0) {};
-
-  /// Default dtor.
-  ~ACE_Null_Barrier (void) {};
-
-  /// Block the caller until all <count> threads have called <wait> and
-  /// then allow all the caller threads to continue in parallel.
-  int wait (void) { return 0; };
-
-  /// Dump the state of an object.
-  void dump (void) const {};
-
-  /// Declare the dynamic allocation hooks.
-  //ACE_ALLOC_HOOK_DECLARE;
-
-private:
-  // = Prevent assignment and initialization.
-  void operator= (const ACE_Null_Barrier &);
-  ACE_Null_Barrier (const ACE_Null_Barrier &);
-};
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#include /**/ "ace/post.h"
-#endif /* ACE_NULL_BARRIER_H */
-