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

diff --git a/dep/src/ace/Countdown_Time.cpp b/dep/src/ace/Countdown_Time.cpp
deleted file mode 100644
index 3b3eede4364..00000000000
--- a/dep/src/ace/Countdown_Time.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-#include "ace/Countdown_Time.h"
-#include "ace/OS_NS_sys_time.h"
-
-ACE_RCSID (ace,
-           Countdown_Time,
-           "$Id: Countdown_Time.cpp 80826 2008-03-04 14:51:23Z wotte $")
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_Countdown_Time::ACE_Countdown_Time (ACE_Time_Value *max_wait_time)
-  : max_wait_time_ (max_wait_time),
-    stopped_ (false)
-{
-  this->start ();
-}
-
-ACE_Countdown_Time::~ACE_Countdown_Time (void)
-{
-  this->stop ();
-}
-
-void
-ACE_Countdown_Time::start (void)
-{
-  if (this->max_wait_time_ != 0)
-    {
-      this->start_time_ = ACE_OS::gettimeofday ();
-      this->stopped_ = false;
-    }
-}
-
-bool
-ACE_Countdown_Time::stopped (void) const
-{
-  return stopped_;
-}
-
-void
-ACE_Countdown_Time::stop (void)
-{
-  if (this->max_wait_time_ != 0 && this->stopped_ == false)
-    {
-      ACE_Time_Value elapsed_time = ACE_OS::gettimeofday () - this->start_time_;
-
-      if (*this->max_wait_time_ > elapsed_time)
-        {
-          *this->max_wait_time_ -= elapsed_time;
-        }
-      else
-        {
-          // Used all of timeout.
-          *this->max_wait_time_ = ACE_Time_Value::zero;
-          // errno = ETIME;
-        }
-      this->stopped_ = true;
-    }
-}
-
-void
-ACE_Countdown_Time::update (void)
-{
-  this->stop ();
-  this->start ();
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-