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

diff --git a/dep/acelite/ace/IO_SAP.cpp b/dep/acelite/ace/IO_SAP.cpp
deleted file mode 100644
index d4bca8c88a1..00000000000
--- a/dep/acelite/ace/IO_SAP.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-// $Id: IO_SAP.cpp 93736 2011-04-05 12:38:35Z johnnyw $
-
-#include "ace/IO_SAP.h"
-
-#include "ace/Log_Msg.h"
-#include "ace/OS_NS_unistd.h"
-#include "ace/OS_NS_errno.h"
-#include "ace/OS_NS_fcntl.h"
-#include "ace/os_include/os_signal.h"
-
-#if !defined (__ACE_INLINE__)
-#include "ace/IO_SAP.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_ALLOC_HOOK_DEFINE(ACE_IO_SAP)
-
-// This is the do-nothing constructor.  It does not perform a
-// ACE_OS::open system call.
-
-ACE_IO_SAP::ACE_IO_SAP (void)
-  : handle_ (ACE_INVALID_HANDLE)
-{
-  ACE_TRACE ("ACE_IO_SAP::ACE_IO_SAP");
-}
-
-void
-ACE_IO_SAP::dump (void) const
-{
-#if defined (ACE_HAS_DUMP)
-  ACE_TRACE ("ACE_IO_SAP::dump");
-
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("handle_ = %d"), this->handle_));
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\npid_ = %d"), this->pid_));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
-#endif /* ACE_HAS_DUMP */
-}
-
-// Cache for the process ID.
-pid_t ACE_IO_SAP::pid_ = 0;
-
-int
-ACE_IO_SAP::enable (int value) const
-{
-  ACE_TRACE ("ACE_IO_SAP::enable");
-  /* First-time in initialization. */
-  if (ACE_IO_SAP::pid_ == 0)
-    ACE_IO_SAP::pid_ = ACE_OS::getpid ();
-
-  switch (value)
-    {
-#if defined (SIGURG)
-    case SIGURG:
-    case ACE_SIGURG:
-#if defined (F_SETOWN)
-      return ACE_OS::fcntl (this->handle_,
-                            F_SETOWN,
-                            ACE_IO_SAP::pid_);
-#else
-      ACE_NOTSUP_RETURN (-1);
-#endif /* F_SETOWN */
-#endif /* SIGURG */
-#if defined (SIGIO)
-    case SIGIO:
-    case ACE_SIGIO:
-#if defined (F_SETOWN) && defined (FASYNC)
-      if (ACE_OS::fcntl (this->handle_,
-                         F_SETOWN,
-                         ACE_IO_SAP::pid_) == -1
-          || ACE::set_flags (this->handle_,
-                             FASYNC) == -1)
-        return -1;
-      break;
-#else
-      ACE_NOTSUP_RETURN (-1);
-#endif /* F_SETOWN && FASYNC */
-#else  // <==
-      ACE_NOTSUP_RETURN (-1);
-#endif /* SIGIO <== */
-    case ACE_NONBLOCK:
-      if (ACE::set_flags (this->handle_,
-                          ACE_NONBLOCK) == -1)
-        return -1;
-      break;
-    default:
-      return -1;
-    }
-
-  return 0;
-}
-
-int
-ACE_IO_SAP::disable (int value) const
-{
-  ACE_TRACE ("ACE_IO_SAP::disable");
-
-  switch (value)
-    {
-#if defined (SIGURG)
-    case SIGURG:
-    case ACE_SIGURG:
-#if defined (F_SETOWN)
-      if (ACE_OS::fcntl (this->handle_,
-                         F_SETOWN, 0) == -1)
-        return -1;
-      break;
-#else
-      ACE_NOTSUP_RETURN (-1);
-#endif /* F_SETOWN */
-#endif /* SIGURG */
-#if defined (SIGIO)
-    case SIGIO:
-    case ACE_SIGIO:
-#if defined (F_SETOWN) && defined (FASYNC)
-      if (ACE_OS::fcntl (this->handle_,
-                         F_SETOWN,
-                         0) == -1
-          || ACE::clr_flags (this->handle_, FASYNC) == -1)
-        return -1;
-      break;
-#else
-      ACE_NOTSUP_RETURN (-1);
-#endif /* F_SETOWN && FASYNC */
-#else  // <==
-      ACE_NOTSUP_RETURN (-1);
-#endif /* SIGIO <== */
-    case ACE_NONBLOCK:
-      if (ACE::clr_flags (this->handle_,
-                                     ACE_NONBLOCK) == -1)
-        return -1;
-      break;
-    default:
-      return -1;
-    }
-  return 0;
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL