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

diff --git a/dep/acelite/ace/Codeset_Registry.cpp b/dep/acelite/ace/Codeset_Registry.cpp
deleted file mode 100644
index 6c132a88081..00000000000
--- a/dep/acelite/ace/Codeset_Registry.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-//=============================================================================
-/**
- *  @file   Codeset_Registry.cpp
- *
- *  $Id: Codeset_Registry.cpp 91286 2010-08-05 09:04:31Z johnnyw $
- *
- *  emulated codset regstry functions
- *
- *
- *  @author Phil Mesnier <mesnier_p@ociweb.com>
- */
-//=============================================================================
-
-#include "ace/Codeset_Registry.h"
-#include "ace/OS_Memory.h"
-#include "ace/OS_NS_string.h"
-
-// $Id: Codeset_Registry.cpp 91286 2010-08-05 09:04:31Z johnnyw $
-
-#if !defined (__ACE_INLINE__)
-#include "ace/Codeset_Registry.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-int
-ACE_Codeset_Registry::locale_to_registry_i (const ACE_CString &locale,
-                                            ACE_CDR::ULong &codeset_id,
-                                            ACE_CDR::UShort *num_sets,
-                                            ACE_CDR::UShort **char_sets)
-{
-  registry_entry const *element = 0;
-  for (size_t i = 0; element == 0 && i < num_registry_entries_; i++)
-    if (ACE_OS::strcmp (registry_db_[i].loc_name_, locale.c_str ()) == 0)
-      element = &registry_db_[i];
-  if (element == 0)
-    return 0;
-  codeset_id = element->codeset_id_;
-  if (num_sets != 0)
-    *num_sets = element->num_sets_;
-  if (char_sets != 0)
-    {
-      ACE_NEW_RETURN (*char_sets,ACE_CDR::UShort[element->num_sets_],0);
-      ACE_OS::memcpy (*char_sets, element->char_sets_,
-                      element->num_sets_ * sizeof (ACE_CDR::UShort));
-    }
-  return 1;
-}
-
-int
-ACE_Codeset_Registry::registry_to_locale_i (ACE_CDR::ULong codeset_id,
-                                            ACE_CString &locale,
-                                            ACE_CDR::UShort *num_sets,
-                                            ACE_CDR::UShort **char_sets)
-{
-  registry_entry const *element = 0;
-  for (size_t i = 0; element == 0 && i < num_registry_entries_; i++)
-    if (codeset_id == registry_db_[i].codeset_id_)
-      element = &registry_db_[i];
-  if (element == 0)
-    return 0;
-  locale.set (element->loc_name_);
-  if (num_sets != 0)
-    *num_sets = element->num_sets_;
-  if (char_sets != 0)
-    {
-      ACE_NEW_RETURN (*char_sets,ACE_CDR::UShort[element->num_sets_],0);
-      ACE_OS::memcpy (*char_sets, element->char_sets_,
-                      element->num_sets_ * sizeof (ACE_CDR::UShort));
-    }
-  return 1;
-}
-
-int
-ACE_Codeset_Registry::is_compatible_i (ACE_CDR::ULong codeset_id,
-                                       ACE_CDR::ULong other)
-{
-  registry_entry const *lhs = 0;
-  registry_entry const *rhs = 0;
-  for (size_t i = 0; (lhs == 0 || rhs == 0) && i < num_registry_entries_; i++)
-    {
-      if (codeset_id == registry_db_[i].codeset_id_)
-        lhs = &registry_db_[i];
-      if (other == registry_db_[i].codeset_id_)
-        rhs = &registry_db_[i];
-    }
-
-  if (lhs == 0 || rhs == 0)
-    return 0;
-
-  for (ACE_CDR::UShort l = 0; l < lhs->num_sets_; l++)
-    for (ACE_CDR::UShort r = 0; r < rhs->num_sets_; r++)
-      if (rhs->char_sets_[r] == lhs->char_sets_[l])
-        return 1;
-  return 0;
-}
-
-ACE_CDR::Short
-ACE_Codeset_Registry::get_max_bytes_i (ACE_CDR::ULong codeset_id)
-{
-  for (size_t i = 0; i < num_registry_entries_; i++)
-    if (codeset_id == registry_db_[i].codeset_id_)
-      return registry_db_[i].max_bytes_;
-  return 0;
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL