Merge remote-tracking branch 'origin/master' into 4.3.4

Conflicts:
	src/server/authserver/Main.cpp
	src/server/authserver/Realms/RealmList.cpp
	src/server/authserver/Realms/RealmList.h
	src/server/authserver/Server/AuthSession.cpp
	src/server/authserver/Server/AuthSocket.h
	src/server/authserver/Server/RealmAcceptor.h
	src/server/game/Accounts/AccountMgr.h
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Achievements/AchievementMgr.h
	src/server/game/Battlegrounds/ArenaTeamMgr.cpp
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/DungeonFinding/LFGMgr.h
	src/server/game/Entities/Object/Object.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Movement/Spline/MoveSplineFlag.h
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Quests/QuestDef.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Server/WorldSocket.h
	src/server/game/Spells/Spell.cpp
	src/server/scripts/Commands/cs_debug.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/Spells/spell_mage.cpp
	src/server/scripts/Spells/spell_rogue.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/scripts/Spells/spell_warrior.cpp
	src/server/shared/Cryptography/BigNumber.h
	src/server/worldserver/RemoteAccess/RASocket.cpp
	src/server/worldserver/worldserver.conf.dist

1 files changed, 0 insertions, 92 deletions

diff --git a/dep/acelite/ace/Throughput_Stats.cpp b/dep/acelite/ace/Throughput_Stats.cpp
deleted file mode 100644
index f8e27fba837..00000000000
--- a/dep/acelite/ace/Throughput_Stats.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-// $Id: Throughput_Stats.cpp 95761 2012-05-15 18:23:04Z johnnyw $
-
-#include "ace/Throughput_Stats.h"
-
-#include "ace/OS_NS_stdio.h"
-#include "ace/OS_NS_string.h"
-#include "ace/High_Res_Timer.h"
-#include "ace/Log_Msg.h"
-
-
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_Throughput_Stats::ACE_Throughput_Stats (void)
-  : ACE_Basic_Stats ()
-  , throughput_last_ (0)
-{
-}
-
-void
-ACE_Throughput_Stats::sample (ACE_UINT64 throughput,
-                              ACE_UINT64 latency)
-{
-  this->ACE_Basic_Stats::sample (latency);
-
-  if (this->samples_count () == 1u)
-    {
-      this->throughput_last_ = throughput;
-    }
-}
-
-void
-ACE_Throughput_Stats::accumulate (const ACE_Throughput_Stats &rhs)
-{
-  if (rhs.samples_count () == 0u)
-    return;
-
-  this->ACE_Basic_Stats::accumulate (rhs);
-
-  if (this->samples_count () == 0u)
-    {
-      this->throughput_last_   = rhs.throughput_last_;
-      return;
-    }
-
-  if (this->throughput_last_ < rhs.throughput_last_)
-    this->throughput_last_ = rhs.throughput_last_;
-}
-
-void
-ACE_Throughput_Stats::dump_results (const ACE_TCHAR* msg,
-                                    ACE_Basic_Stats::scale_factor_type sf)
-{
-  if (this->samples_count () == 0u)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("%s : no data collected\n"), msg));
-      return;
-    }
-
-  this->ACE_Basic_Stats::dump_results (msg, sf);
-
-  ACE_Throughput_Stats::dump_throughput (msg, sf,
-                                         this->throughput_last_,
-                                         this->samples_count ());
-}
-
-void
-ACE_Throughput_Stats::dump_throughput (const ACE_TCHAR *msg,
-                                       ACE_Basic_Stats::scale_factor_type sf,
-                                       ACE_UINT64 elapsed_time,
-                                       ACE_UINT32 samples_count)
-{
-#ifndef ACE_NLOGGING
-  double seconds =
-    static_cast<double> (ACE_UINT64_DBLCAST_ADAPTER (elapsed_time / sf));
-  seconds /= ACE_HR_SCALE_CONVERSION;
-
-  const double t_avg = samples_count / seconds;
-
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("%s throughput: %.2f (events/second)\n"),
-              msg, t_avg));
-#else
-  ACE_UNUSED_ARG (msg);
-  ACE_UNUSED_ARG (sf);
-  ACE_UNUSED_ARG (elapsed_time);
-  ACE_UNUSED_ARG (samples_count);
-#endif /* ACE_NLOGGING */
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL