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

diff --git a/dep/acelite/ace/UNIX_Addr.cpp b/dep/acelite/ace/UNIX_Addr.cpp
deleted file mode 100644
index fa889d84eaa..00000000000
--- a/dep/acelite/ace/UNIX_Addr.cpp
+++ /dev/null
@@ -1,151 +0,0 @@
-// $Id: UNIX_Addr.cpp 91286 2010-08-05 09:04:31Z johnnyw $
-
-#include "ace/UNIX_Addr.h"
-
-
-
-#if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
-
-#if !defined (__ACE_INLINE__)
-#include "ace/UNIX_Addr.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_ALLOC_HOOK_DEFINE(ACE_UNIX_Addr)
-
-// Set a pointer to the address.
-void
-ACE_UNIX_Addr::set_addr (void *addr, int len)
-{
-  ACE_TRACE ("ACE_UNIX_Addr::set_addr");
-
-  this->ACE_Addr::base_set (AF_UNIX, len);
-  ACE_OS::memcpy ((void *) &this->unix_addr_,
-                  (void *) addr,
-                  len);
-}
-
-// Return a pointer to the underlying address.
-
-void *
-ACE_UNIX_Addr::get_addr (void) const
-{
-  return (void *) &this->unix_addr_;
-}
-
-// Transform the string into the current addressing format.
-
-int
-ACE_UNIX_Addr::string_to_addr (const char addr[])
-{
-  ACE_OS::strsncpy (this->unix_addr_.sun_path, addr,
-                    sizeof this->unix_addr_.sun_path);
-  return 0;
-}
-
-// Transform the current address into string format.
-
-int
-ACE_UNIX_Addr::addr_to_string (ACE_TCHAR s[], size_t len) const
-{
-  ACE_OS::strsncpy (s,
-                    ACE_TEXT_CHAR_TO_TCHAR (this->unix_addr_.sun_path),
-                    len);
-  return 0;
-}
-
-u_long
-ACE_UNIX_Addr::hash (void) const
-{
-  return ACE::hash_pjw (this->unix_addr_.sun_path);
-}
-
-void
-ACE_UNIX_Addr::dump (void) const
-{
-#if defined (ACE_HAS_DUMP)
-#endif /* ACE_HAS_DUMP */
-}
-
-// Do nothing constructor.
-
-ACE_UNIX_Addr::ACE_UNIX_Addr (void)
-  : ACE_Addr (AF_UNIX, sizeof this->unix_addr_)
-{
-  (void) ACE_OS::memset ((void *) &this->unix_addr_,
-                         0,
-                         sizeof this->unix_addr_);
-
-  this->unix_addr_.sun_family = AF_UNIX;
-}
-
-int
-ACE_UNIX_Addr::set (const ACE_UNIX_Addr &sa)
-{
-  if (sa.get_type () == AF_ANY)
-    (void) ACE_OS::memset ((void *) &this->unix_addr_,
-                           0,
-                           sizeof this->unix_addr_);
-  else
-    ACE_OS::strcpy (this->unix_addr_.sun_path,
-                    sa.unix_addr_.sun_path);
-
-  this->unix_addr_.sun_family = AF_UNIX;
-  this->base_set (sa.get_type (), sa.get_size ());
-
-  return 0;
-}
-
-// Copy constructor.
-
-ACE_UNIX_Addr::ACE_UNIX_Addr (const ACE_UNIX_Addr &sa)
-  : ACE_Addr (AF_UNIX, sa.get_size ())
-{
-  this->set (sa);
-}
-
-int
-ACE_UNIX_Addr::set (const sockaddr_un *un, int len)
-{
-  (void) ACE_OS::memset ((void *) &this->unix_addr_, 0,
-                   sizeof this->unix_addr_);
-  this->unix_addr_.sun_family = AF_UNIX;
-  ACE_OS::strcpy (this->unix_addr_.sun_path, un->sun_path);
-  this->base_set (AF_UNIX, len);
-  return 0;
-}
-
-ACE_UNIX_Addr::ACE_UNIX_Addr (const sockaddr_un *un, int len)
-{
-  this->set (un, len);
-}
-
-int
-ACE_UNIX_Addr::set (const char rendezvous_point[])
-{
-  (void) ACE_OS::memset ((void *) &this->unix_addr_,
-                         0,
-                         sizeof this->unix_addr_);
-  this->unix_addr_.sun_family = AF_UNIX;
-  (void) ACE_OS::strsncpy (this->unix_addr_.sun_path,
-                           rendezvous_point,
-                           sizeof this->unix_addr_.sun_path);
-
-  this->ACE_Addr::base_set (AF_UNIX,
-                            sizeof this->unix_addr_ -
-                            sizeof (this->unix_addr_.sun_path) +
-                            ACE_OS::strlen (this->unix_addr_.sun_path));
-  return 0;
-}
-
-// Create a ACE_Addr from a UNIX pathname.
-
-ACE_UNIX_Addr::ACE_UNIX_Addr (const char rendezvous_point[])
-{
-  this->set (rendezvous_point);
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */