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

diff --git a/dep/acelite/ace/Dump.cpp b/dep/acelite/ace/Dump.cpp
deleted file mode 100644
index 09ae92600b7..00000000000
--- a/dep/acelite/ace/Dump.cpp
+++ /dev/null
@@ -1,141 +0,0 @@
-// $Id: Dump.cpp 91286 2010-08-05 09:04:31Z johnnyw $
-
-#include "ace/Dump.h"
-#include "ace/Guard_T.h"
-#include "ace/Thread_Mutex.h"
-#include "ace/Object_Manager.h"
-#include "ace/Log_Msg.h"
-
-
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-// Implementations (very simple for now...)
-
-ACE_Dumpable::~ACE_Dumpable (void)
-{
-  ACE_TRACE ("ACE_Dumpable::~ACE_Dumpable");
-}
-
-ACE_Dumpable::ACE_Dumpable (const void *this_ptr)
-  : this_ (this_ptr)
-{
-  ACE_TRACE ("ACE_Dumpable::ACE_Dumpable");
-}
-
-ACE_Dumpable_Ptr::ACE_Dumpable_Ptr (const ACE_Dumpable *dumper)
-  : dumper_ (dumper)
-{
-  ACE_TRACE ("ACE_Dumpable_Ptr::ACE_Dumpable_Ptr");
-}
-
-const ACE_Dumpable *
-ACE_Dumpable_Ptr::operator->() const
-{
-  ACE_TRACE ("ACE_Dumpable_Ptr::operator->");
-  return this->dumper_;
-}
-
-void
-ACE_Dumpable_Ptr::operator= (const ACE_Dumpable *dumper) const
-{
-  ACE_TRACE ("ACE_Dumpable_Ptr::operator=");
-  if (this->dumper_ != dumper)
-    {
-      delete const_cast <ACE_Dumpable *> (this->dumper_);
-      (const_cast<ACE_Dumpable_Ptr *> (this))->dumper_ = dumper;
-    }
-}
-
-ACE_ODB::ACE_ODB (void)
-  // Let the Tuple default constructor initialize object_table_
-  : current_size_ (0)
-{
-  ACE_TRACE ("ACE_ODB::ACE_ODB");
-}
-
-ACE_ODB *
-ACE_ODB::instance (void)
-{
-  ACE_TRACE ("ACE_ODB::instance");
-
-  if (ACE_ODB::instance_ == 0)
-    {
-      ACE_MT (ACE_Thread_Mutex *lock =
-        ACE_Managed_Object<ACE_Thread_Mutex>::get_preallocated_object
-          (ACE_Object_Manager::ACE_DUMP_LOCK);
-        ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, *lock, 0));
-
-      if (ACE_ODB::instance_ == 0)
-        ACE_NEW_RETURN (ACE_ODB::instance_,
-                        ACE_ODB,
-                        0);
-    }
-
-  return ACE_ODB::instance_;
-}
-
-void
-ACE_ODB::dump_objects (void)
-{
-  ACE_TRACE ("ACE_ODB::dump_objects");
-  for (int i = 0; i < this->current_size_; i++)
-    {
-      if (this->object_table_[i].this_ != 0)
-        // Dump the state of the object.
-        this->object_table_[i].dumper_->dump ();
-    }
-}
-
-// This method registers a new <dumper>.  It detects
-// duplicates and simply overwrites them.
-
-void
-ACE_ODB::register_object (const ACE_Dumpable *dumper)
-{
-  ACE_TRACE ("ACE_ODB::register_object");
-  int i;
-  int slot = 0;
-
-  for (i = 0; i < this->current_size_; i++)
-    {
-      if (this->object_table_[i].this_ == 0)
-        slot = i;
-      else if (this->object_table_[i].this_ == dumper->this_)
-        {
-          slot = i;
-          break;
-        }
-    }
-
-  if (i == this->current_size_)
-    {
-      slot = this->current_size_++;
-      ACE_ASSERT (this->current_size_ < ACE_ODB::MAX_TABLE_SIZE);
-    }
-  this->object_table_[slot].this_ = dumper->this_;
-  this->object_table_[slot].dumper_ = dumper;
-}
-
-void
-ACE_ODB::remove_object (const void *this_ptr)
-{
-  ACE_TRACE ("ACE_ODB::remove_object");
-  int i;
-
-  for (i = 0; i < this->current_size_; i++)
-    {
-      if (this->object_table_[i].this_ == this_ptr)
-        break;
-    }
-
-  if (i < this->current_size_)
-    {
-      this->object_table_[i].this_ = 0;
-      this->object_table_[i].dumper_ = 0;
-    }
-}
-
-ACE_ODB *ACE_ODB::instance_ = 0;
-
-ACE_END_VERSIONED_NAMESPACE_DECL