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

diff --git a/dep/acelite/ace/Thread.cpp b/dep/acelite/ace/Thread.cpp
deleted file mode 100644
index 952a51b6e69..00000000000
--- a/dep/acelite/ace/Thread.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-// $Id: Thread.cpp 91286 2010-08-05 09:04:31Z johnnyw $
-
-#include "ace/Thread.h"
-
-#if !defined (__ACE_INLINE__)
-#include "ace/Thread.inl"
-#endif /* !defined (__ACE_INLINE__) */
-
-#if defined (ACE_HAS_THREADS)
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-size_t
-ACE_Thread::spawn_n (size_t n,
-                     ACE_THR_FUNC func,
-                     void *arg,
-                     long flags,
-                     long priority,
-                     void *stack[],
-                     size_t stack_size[],
-                     ACE_Thread_Adapter *thread_adapter,
-                     const char* thr_name[])
-{
-  ACE_TRACE ("ACE_Thread::spawn_n");
-  size_t i;
-
-  for (i = 0; i < n; i++)
-   {
-      ACE_thread_t t_id;
-      // Bail out if error occurs.
-      if (ACE_OS::thr_create (func,
-                              arg,
-                              flags,
-                              &t_id,
-                              0,
-                              priority,
-                              stack == 0 ? 0 : stack[i],
-                              stack_size == 0 ? ACE_DEFAULT_THREAD_STACKSIZE : stack_size[i],
-                              thread_adapter,
-                              thr_name == 0 ? 0 : &thr_name[i]) != 0)
-        break;
-   }
-
-  return i;
-}
-
-size_t
-ACE_Thread::spawn_n (ACE_thread_t thread_ids[],
-                     size_t n,
-                     ACE_THR_FUNC func,
-                     void *arg,
-                     long flags,
-                     long priority,
-                     void *stack[],
-                     size_t stack_size[],
-                     ACE_hthread_t thread_handles[],
-                     ACE_Thread_Adapter *thread_adapter,
-                     const char* thr_name[])
-{
-  ACE_TRACE ("ACE_Thread::spawn_n");
-  size_t i = 0;
-
-  for (i = 0; i < n; i++)
-    {
-      ACE_thread_t t_id;
-      ACE_hthread_t t_handle;
-
-      int const result =
-        ACE_OS::thr_create (func,
-                            arg,
-                            flags,
-                            &t_id,
-                            &t_handle,
-                            priority,
-                            stack == 0 ? 0 : stack[i],
-                            stack_size == 0 ? ACE_DEFAULT_THREAD_STACKSIZE : stack_size[i],
-                            thread_adapter,
-                            thr_name == 0 ? 0 : &thr_name[i]);
-
-      if (result == 0)
-        {
-          if (thread_ids != 0)
-            thread_ids[i] = t_id;
-          if (thread_handles != 0)
-            thread_handles[i] = t_handle;
-        }
-      else
-        // Bail out if error occurs.
-        break;
-    }
-
-  return i;
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* ACE_HAS_THREADS */