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

diff --git a/dep/src/ace/Basic_Stats.cpp b/dep/src/ace/Basic_Stats.cpp
deleted file mode 100644
index 760afa35e6d..00000000000
--- a/dep/src/ace/Basic_Stats.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-// $Id: Basic_Stats.cpp 80826 2008-03-04 14:51:23Z wotte $
-
-#include "ace/Basic_Stats.h"
-#include "ace/Log_Msg.h"
-
-#if !defined (__ACE_INLINE__)
-#include "ace/Basic_Stats.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(ace,
-          Basic_Stats,
-          "$Id: Basic_Stats.cpp 80826 2008-03-04 14:51:23Z wotte $")
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-void
-ACE_Basic_Stats::accumulate (const ACE_Basic_Stats &rhs)
-{
-  if (rhs.samples_count_ == 0)
-    return;
-
-  if (this->samples_count_ == 0)
-    {
-      this->min_ = rhs.min_;
-      this->min_at_ = rhs.min_at_;
-
-      this->max_ = rhs.max_;
-      this->max_at_ = rhs.max_at_;
-    }
-  else
-    {
-      if (this->min_ > rhs.min_)
-        {
-          this->min_ = rhs.min_;
-          this->min_at_ = rhs.min_at_;
-        }
-      if (this->max_ < rhs.max_)
-        {
-          this->max_ = rhs.max_;
-          this->max_at_ = rhs.max_at_;
-        }
-    }
-
-  this->samples_count_ += rhs.samples_count_;
-  this->sum_ += rhs.sum_;
-}
-
-void
-ACE_Basic_Stats::dump_results (const ACE_TCHAR *msg, ACE_UINT32 sf) const
-{
-#ifndef ACE_NLOGGING
-  if (this->samples_count () == 0u)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("%s : no data collected\n"), msg));
-      return;
-    }
-
-  ACE_UINT64 avg = this->sum_ / this->samples_count_;
-
-  ACE_UINT64 l_min = this->min_ / sf;
-  ACE_UINT64 l_max = this->max_ / sf;
-  ACE_UINT64 l_avg = avg / sf;
-
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("%s latency   : %Q[%d]/%Q/%Q[%d] (min/avg/max)\n"),
-              msg,
-              l_min, this->min_at_,
-              l_avg,
-              l_max, this->max_at_));
-
-#else
-  ACE_UNUSED_ARG (msg);
-  ACE_UNUSED_ARG (sf);
-#endif /* ACE_NLOGGING */
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-