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

diff --git a/dep/acelite/ace/TLI_Stream.cpp b/dep/acelite/ace/TLI_Stream.cpp
deleted file mode 100644
index d12fcbe6cba..00000000000
--- a/dep/acelite/ace/TLI_Stream.cpp
+++ /dev/null
@@ -1,229 +0,0 @@
-// $Id: TLI_Stream.cpp 91286 2010-08-05 09:04:31Z johnnyw $
-
-/* Defines the member functions for the base class of the ACE_TLI_Stream
-   abstraction. */
-
-#include "ace/TLI_Stream.h"
-#include "ace/ACE.h"
-#include "ace/OS_NS_unistd.h"
-
-
-
-#if defined (ACE_HAS_TLI)
-
-#if !defined (__ACE_INLINE__)
-#include "ace/TLI_Stream.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_ALLOC_HOOK_DEFINE(ACE_TLI_Stream)
-
-void
-ACE_TLI_Stream::dump (void) const
-{
-#if defined (ACE_HAS_DUMP)
-  ACE_TRACE ("ACE_TLI_Stream::dump");
-#endif /* ACE_HAS_DUMP */
-}
-
-ACE_TLI_Stream::ACE_TLI_Stream (void)
-  : rwflag_ (0)
-{
-  ACE_TRACE ("ACE_TLI_Stream::ACE_TLI_Stream");
-}
-
-int
-ACE_TLI_Stream::get_remote_addr (ACE_Addr &sa) const
-{
-  ACE_TRACE ("ACE_TLI_Stream::get_remote_addr");
-
-  struct netbuf name;
-  name.maxlen = sa.get_size ();
-  name.buf = (char *) sa.get_addr ();
-
-  if (ACE_OS::t_getname (this->get_handle (), &name, REMOTENAME) == -1)
-    return -1;
-  else
-    return 0;
-}
-
-// Send a release and then await the release from the other side.
-
-int
-ACE_TLI_Stream::active_close (void)
-{
-  ACE_TRACE ("ACE_TLI_Stream::active_close");
-  char buf;
-
-  if (this->sndrel () == -1)
-    return -1;
-  else if (this->recv (&buf, sizeof buf) == -1)
-    {
-      if (t_errno == TLOOK && this->look () == T_ORDREL)
-        {
-          if (this->rcvrel () == -1)
-            return -1;
-        }
-      else
-        return -1;
-    }
-
-  return this->close ();
-}
-
-// Acknowledge the release from the other side and then send the
-// release to the other side.
-
-int
-ACE_TLI_Stream::passive_close (void)
-{
-  ACE_TRACE ("ACE_TLI_Stream::passive_close");
-
-  if (this->rcvrel () == -1)
-    return -1;
-  else if (this->sndrel () == -1)
-    return -1;
-
-  return this->close ();
-}
-
-int
-ACE_TLI_Stream::close (void)
-{
-  ACE_TRACE ("ACE_TLI_Stream::close");
-
-  ACE_HANDLE fd = this->get_handle ();
-
-  this->set_handle (ACE_INVALID_HANDLE);
-
-#if !defined (ACE_WIN32)
-  if (this->rwflag_)
-    return ACE_OS::close (fd);
-  else
-#endif /* ACE_WIN32 */
-    return ACE_OS::t_close (fd);
-}
-
-ssize_t
-ACE_TLI_Stream::send (const void *buf,
-                      size_t n,
-                      const ACE_Time_Value *timeout) const
-{
-  ACE_TRACE ("ACE_TLI_Stream::send");
-  return ACE::send (this->get_handle (),
-                    buf,
-                    n,
-                    timeout);
-}
-
-ssize_t
-ACE_TLI_Stream::send (const void *buf,
-                      size_t n,
-                      int flags,
-                      const ACE_Time_Value *timeout) const
-{
-  ACE_TRACE ("ACE_TLI_Stream::send");
-  return ACE::t_snd (this->get_handle (),
-                     buf,
-                     n,
-                     flags,
-                     timeout);
-}
-
-ssize_t
-ACE_TLI_Stream::recv (void *buf,
-                      size_t n,
-                      const ACE_Time_Value *timeout) const
-{
-  ACE_TRACE ("ACE_TLI_Stream::recv");
-  return ACE::recv (this->get_handle (),
-                    buf,
-                    n,
-                    timeout);
-}
-
-ssize_t
-ACE_TLI_Stream::recv (void *buf,
-                      size_t n,
-                      int *flags,
-                      const ACE_Time_Value *timeout) const
-{
-  ACE_TRACE ("ACE_TLI_Stream::recv");
-  int f = 0;
-
-  if (flags == 0)
-    flags = &f;
-
-  return ACE::t_rcv (this->get_handle (),
-                     buf,
-                     n,
-                     flags,
-                     timeout);
-}
-
-ssize_t
-ACE_TLI_Stream::send_n (const void *buf,
-                        size_t n,
-                        const ACE_Time_Value *timeout,
-                        size_t *bytes_transferred) const
-{
-  ACE_TRACE ("ACE_TLI_Stream::send_n");
-  return ACE::send_n (this->get_handle (),
-                      buf,
-                      n,
-                      timeout,
-                      bytes_transferred);
-}
-
-ssize_t
-ACE_TLI_Stream::send_n (const void *buf,
-                        size_t n,
-                        int flags,
-                        const ACE_Time_Value *timeout,
-                        size_t *bytes_transferred) const
-{
-  ACE_TRACE ("ACE_TLI_Stream::send_n");
-
-  return ACE::t_snd_n (this->get_handle (),
-                       buf,
-                       n,
-                       flags,
-                       timeout,
-                       bytes_transferred);
-}
-
-ssize_t
-ACE_TLI_Stream::recv_n (void *buf,
-                        size_t n,
-                        const ACE_Time_Value *timeout,
-                        size_t *bytes_transferred) const
-{
-  ACE_TRACE ("ACE_TLI_Stream::recv_n");
-  return ACE::recv_n (this->get_handle (),
-                      buf,
-                      n,
-                      timeout,
-                      bytes_transferred);
-}
-
-ssize_t
-ACE_TLI_Stream::recv_n (void *buf,
-                        size_t n,
-                        int *flags,
-                        const ACE_Time_Value *timeout,
-                        size_t *bytes_transferred) const
-{
-  ACE_TRACE ("ACE_TLI_Stream::recv_n");
-
-  return ACE::t_rcv_n (this->get_handle (),
-                       buf,
-                       n,
-                       flags,
-                       timeout,
-                       bytes_transferred);
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* ACE_HAS_TLI */