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

diff --git a/dep/acelite/ace/Mutex.cpp b/dep/acelite/ace/Mutex.cpp
deleted file mode 100644
index 5106f027274..00000000000
--- a/dep/acelite/ace/Mutex.cpp
+++ /dev/null
@@ -1,122 +0,0 @@
-// $Id: Mutex.cpp 91286 2010-08-05 09:04:31Z johnnyw $
-
-#include "ace/Mutex.h"
-
-#if !defined (__ACE_INLINE__)
-#include "ace/Mutex.inl"
-#endif /* __ACE_INLINE__ */
-
-#include "ace/Log_Msg.h"
-#include "ace/OS_NS_string.h"
-#include "ace/os_include/sys/os_mman.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_ALLOC_HOOK_DEFINE(ACE_Mutex)
-
-void
-ACE_Mutex::dump (void) const
-{
-#if defined (ACE_HAS_DUMP)
-// ACE_TRACE ("ACE_Mutex::dump");
-
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-#if defined (ACE_HAS_PTHREADS) || defined(ACE_HAS_STHREADS)
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("lockname_ = %s\n"), this->lockname_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("process_lock_ = %x\n"), this->process_lock_));
-#endif /* ACE_HAS_PTHREADS || ACE_HAS_STHREADS */
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n")));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
-#endif /* ACE_HAS_DUMP */
-}
-
-ACE_Mutex::ACE_Mutex (int type, const ACE_TCHAR *name,
-                      ACE_mutexattr_t *arg, mode_t mode)
-  :
-#if defined (ACE_HAS_PTHREADS) || defined(ACE_HAS_STHREADS)
-    process_lock_ (0),
-    lockname_ (0),
-#endif /* ACE_HAS_PTHREADS || ACE_HAS_STHREADS */
-    removed_ (false)
-{
-  // ACE_TRACE ("ACE_Mutex::ACE_Mutex");
-
-  // These platforms need process-wide mutex to be in shared memory.
-#if defined(ACE_HAS_PTHREADS) || defined (ACE_HAS_STHREADS)
-  if (type == USYNC_PROCESS)
-    {
-      // Let's see if the shared memory entity already exists.
-      ACE_HANDLE fd = ACE_OS::shm_open (name, O_RDWR | O_CREAT | O_EXCL, mode);
-      if (fd == ACE_INVALID_HANDLE)
-        {
-          if (errno == EEXIST)
-            fd = ACE_OS::shm_open (name, O_RDWR | O_CREAT, mode);
-          else
-            return;
-        }
-      else
-        {
-          // We own this shared memory object!  Let's set its size.
-          if (ACE_OS::ftruncate (fd,
-                                 sizeof (ACE_mutex_t)) == -1)
-            {
-              ACE_OS::close (fd);
-              return;
-            }
-          this->lockname_ = ACE_OS::strdup (name);
-          if (this->lockname_ == 0)
-            {
-              ACE_OS::close (fd);
-              return;
-            }
-        }
-
-      this->process_lock_ =
-        (ACE_mutex_t *) ACE_OS::mmap (0,
-                                      sizeof (ACE_mutex_t),
-                                      PROT_RDWR,
-                                      MAP_SHARED,
-                                      fd,
-                                      0);
-      ACE_OS::close (fd);
-      if (this->process_lock_ == MAP_FAILED)
-        return;
-
-      if (this->lockname_
-          && ACE_OS::mutex_init (this->process_lock_,
-                                 type,
-                                 name,
-                                 arg) != 0)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("%p\n"),
-                      ACE_TEXT ("ACE_Mutex::ACE_Mutex")));
-          return;
-        }
-    }
-  else
-    {
-      // local mutex init if USYNC_PROCESS flag is not enabled.
-#else
-      ACE_UNUSED_ARG (mode);
-#endif /* ACE_HAS_PTHREADS || ACE_HAS_STHREADS */
-
-      if (ACE_OS::mutex_init (&this->lock_,
-                              type,
-                              name,
-                              arg) != 0)
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("%p\n"),
-                    ACE_TEXT ("ACE_Mutex::ACE_Mutex")));
-#if defined(ACE_HAS_PTHREADS) || defined (ACE_HAS_STHREADS)
-    }
-#endif /* ACE_HAS_PTHREADS || ACE_HAS_STHREADS */
-}
-
-ACE_Mutex::~ACE_Mutex (void)
-{
-// ACE_TRACE ("ACE_Mutex::~ACE_Mutex");
-  this->remove ();
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL