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

diff --git a/dep/acelite/ace/Malloc.cpp b/dep/acelite/ace/Malloc.cpp
deleted file mode 100644
index c332dde808f..00000000000
--- a/dep/acelite/ace/Malloc.cpp
+++ /dev/null
@@ -1,181 +0,0 @@
-// $Id: Malloc.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $
-
-#include "ace/Malloc.h"
-
-#if !defined (__ACE_INLINE__)
-#include "ace/Malloc.inl"
-#endif /* __ACE_INLINE__ */
-
-#include "ace/Object_Manager.h"
-#include "ace/Malloc_Base.h"
-#include "ace/OS_NS_string.h"
-
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-// Process-wide ACE_Allocator.
-ACE_Allocator *ACE_Allocator::allocator_ = 0;
-
-// Controls whether the Allocator is deleted when we shut down (we can
-// only delete it safely if we created it!)  This is no longer used;
-// see ACE_Allocator::instance (void).
-int ACE_Allocator::delete_allocator_ = 0;
-
-void
-ACE_Control_Block::ACE_Malloc_Header::dump (void) const
-{
-#if defined (ACE_HAS_DUMP)
-  ACE_TRACE ("ACE_Control_Block::ACE_Malloc_Header::dump");
-
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nnext_block = %@"), (ACE_Malloc_Header *) this->next_block_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nsize = %d\n"), this->size_));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
-#endif /* ACE_HAS_DUMP */
-}
-
-void
-ACE_Control_Block::print_alignment_info (void)
-{
-#if defined (ACE_HAS_DUMP)
-  ACE_TRACE ("ACE_Control_Block::print_alignment_info");
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Start ---> ACE_Control_Block::print_alignment_info:\n")));
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("Sizeof ptr: %d\n")
-              ACE_TEXT ("Sizeof size_t: %d\n")
-              ACE_TEXT ("Sizeof long: %d\n")
-              ACE_TEXT ("Sizeof double: %d\n")
-              ACE_TEXT ("Sizeof ACE_MALLOC_ALIGN: %d\n")
-              ACE_TEXT ("Sizeof ACE_MALLOC_PADDING: %d\n")
-              ACE_TEXT ("Sizeof ACE_MALLOC_HEADER_SIZE: %d\n")
-              ACE_TEXT ("Sizeof ACE_MALLOC_PADDING_SIZE: %d\n")
-              ACE_TEXT ("Sizeof ACE_CONTROL_BLOCK_SIZE: %d\n")
-              ACE_TEXT ("Sizeof ACE_CONTROL_BLOCK_ALIGN_BYTES: %d\n")
-              ACE_TEXT ("Sizeof (MALLOC_HEADER): %d\n")
-              ACE_TEXT ("Sizeof (CONTROL_BLOCK): %d\n"),
-              sizeof (char *),
-              sizeof (size_t),
-              sizeof (long),
-              sizeof (double),
-              ACE_MALLOC_ALIGN,
-              ACE_MALLOC_PADDING,
-              ACE_MALLOC_HEADER_SIZE,
-              ACE_MALLOC_PADDING_SIZE,
-              ACE_CONTROL_BLOCK_SIZE,
-              ACE_CONTROL_BLOCK_ALIGN_BYTES,
-              sizeof (ACE_Malloc_Header),
-              sizeof (ACE_Control_Block)
-              ));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("End <--- ACE_Control_Block::print_alignment_info:\n")));
-#endif /* ACE_HAS_DUMP */
-}
-
-void
-ACE_Control_Block::dump (void) const
-{
-#if defined (ACE_HAS_DUMP)
-  ACE_TRACE ("ACE_Control_Block::dump");
-
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Name Node:\n")));
-  for (ACE_Name_Node *nextn = this->name_head_;
-       nextn != 0;
-       nextn = nextn->next_)
-    nextn->dump ();
-
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("freep_ = %@"), (ACE_Malloc_Header *) this->freep_));
-  this->base_.dump ();
-
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nMalloc Header:\n")));
-  for (ACE_Malloc_Header *nexth = ((ACE_Malloc_Header *)this->freep_)->next_block_;
-       nexth != 0 && nexth != &this->base_;
-       nexth = nexth->next_block_)
-    nexth->dump ();
-
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n")));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
-#endif /* ACE_HAS_DUMP */
-}
-
-ACE_Control_Block::ACE_Name_Node::ACE_Name_Node (void)
-{
-  ACE_TRACE ("ACE_Control_Block::ACE_Name_Node::ACE_Name_Node");
-}
-
-ACE_Control_Block::ACE_Name_Node::ACE_Name_Node (const char *name,
-                                                 char *name_ptr,
-                                                 char *pointer,
-                                                 ACE_Name_Node *next)
-  : name_ (name_ptr),
-    pointer_ (pointer),
-    next_ (next),
-    prev_ (0)
-{
-  ACE_TRACE ("ACE_Control_Block::ACE_Name_Node::ACE_Name_Node");
-  char *n = this->name_;
-  ACE_OS::strcpy (n, name);
-  if (next != 0)
-    next->prev_ = this;
-}
-
-const char *
-ACE_Control_Block::ACE_Name_Node::name (void) const
-{
-  return this->name_;
-}
-
-ACE_Control_Block::ACE_Malloc_Header::ACE_Malloc_Header (void)
-  : next_block_ (0),
-    size_ (0)
-{
-}
-
-void
-ACE_Control_Block::ACE_Name_Node::dump (void) const
-{
-#if defined (ACE_HAS_DUMP)
-  ACE_TRACE ("ACE_Control_Block::ACE_Name_Node::dump");
-
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("pointer = %@"), (const char *) this->pointer_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nnext_ = %@"), (ACE_Name_Node *) this->next_));
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("\nname_ = (%@, %C)\n"),
-              (const char *) this->name_,
-              (const char *) this->name_));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
-#endif /* ACE_HAS_DUMP */
-}
-
-
-#if defined (ACE_HAS_MALLOC_STATS)
-ACE_Malloc_Stats::ACE_Malloc_Stats (void)
-  : nchunks_ (0),
-    nblocks_ (0),
-    ninuse_ (0)
-{
-  ACE_TRACE ("ACE_Malloc_Stats::ACE_Malloc_Stats");
-}
-
-void
-ACE_Malloc_Stats::dump (void) const
-{
-#if defined (ACE_HAS_DUMP)
-  ACE_TRACE ("ACE_Malloc_Stats::dump");
-
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  int const nblocks = this->nblocks_.value ();
-  int const ninuse  = this->ninuse_.value ();
-  int const nchunks = this->nchunks_.value ();
-
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT("nblocks = %d"), nblocks));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\nninuse = %d"), ninuse));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\nnchunks = %d"), nchunks));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\n")));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
-#endif /* ACE_HAS_DUMP */
-}
-
-#endif /*ACE_HAS_MALLOC_STATS*/
-
-ACE_END_VERSIONED_NAMESPACE_DECL