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

diff --git a/dep/acelite/ace/Thread_Control.cpp b/dep/acelite/ace/Thread_Control.cpp
deleted file mode 100644
index 4046c07eef7..00000000000
--- a/dep/acelite/ace/Thread_Control.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-// $Id: Thread_Control.cpp 94054 2011-05-11 18:28:20Z johnnyw $
-
-#include "ace/Thread_Control.h"
-#include "ace/Thread_Manager.h"
-
-#if !defined (ACE_HAS_INLINED_OSCALLS)
-# include "ace/Thread_Control.inl"
-#endif /* ACE_HAS_INLINED_OSCALLS */
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-void
-ACE_Thread_Control::dump (void) const
-{
-#if defined (ACE_HAS_DUMP)
-  ACE_OS_TRACE ("ACE_Thread_Control::dump");
-#endif /* ACE_HAS_DUMP */
-}
-
-int
-ACE_Thread_Control::insert (ACE_Thread_Manager *tm, bool insert)
-{
-  ACE_OS_TRACE ("ACE_Thread_Control::insert");
-
-  ACE_hthread_t t_id;
-  ACE_OS::thr_self (t_id);
-  this->tm_ = tm;
-
-  if (insert)
-    return this->tm_->insert_thr (ACE_OS::thr_self (), t_id);
-  else
-    return 0;
-}
-
-// Initialize the thread controller.
-ACE_Thread_Control::ACE_Thread_Control (ACE_Thread_Manager *t,
-                                        int insert)
-  : tm_ (t),
-    status_ (0)
-{
-  ACE_OS_TRACE ("ACE_Thread_Control::ACE_Thread_Control");
-
-  if (this->tm_ != 0 && insert)
-    {
-      ACE_hthread_t t_id;
-      ACE_OS::thr_self (t_id);
-      this->tm_->insert_thr (ACE_OS::thr_self (), t_id);
-    }
-}
-
-// Automatically kill thread on exit.
-ACE_Thread_Control::~ACE_Thread_Control (void)
-{
-  ACE_OS_TRACE ("ACE_Thread_Control::~ACE_Thread_Control");
-
-#if defined (ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS) || defined (ACE_HAS_TSS_EMULATION) || defined (ACE_WIN32)
-  this->exit (this->status_, 0);
-#else
-  this->exit (this->status_, 1);
-#endif /* ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS */
-}
-
-// Exit from thread (but clean up first).
-ACE_THR_FUNC_RETURN
-ACE_Thread_Control::exit (ACE_THR_FUNC_RETURN exit_status, int do_thr_exit)
-{
-  ACE_OS_TRACE ("ACE_Thread_Control::exit");
-
-  if (this->tm_ != 0)
-    return this->tm_->exit (exit_status, do_thr_exit);
-  else
-    {
-#if !defined (ACE_HAS_TSS_EMULATION)
-      // With ACE_HAS_TSS_EMULATION, we let ACE_Thread_Adapter::invoke ()
-      // exit the thread after cleaning up TSS.
-      ACE_OS::thr_exit (exit_status);
-#endif /* ! ACE_HAS_TSS_EMULATION */
-      return 0;
-    }
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL