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

diff --git a/dep/acelite/ace/File_Lock.h b/dep/acelite/ace/File_Lock.h
deleted file mode 100644
index 4cd58fcd184..00000000000
--- a/dep/acelite/ace/File_Lock.h
+++ /dev/null
@@ -1,170 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    File_Lock.h
- *
- *  $Id: File_Lock.h 91064 2010-07-12 10:11:24Z johnnyw $
- *
- *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef ACE_FILE_LOCK_H
-#define ACE_FILE_LOCK_H
-#include /**/ "ace/pre.h"
-
-#include /**/ "ace/ACE_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/OS_NS_stdio.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-/**
- * @class ACE_File_Lock
- *
- * @brief A wrapper around the UNIX file locking mechanism.
- *
- * Allows us to "adapt" the UNIX file locking mechanisms to work
- * with all of our Guard stuff...
- */
-class ACE_Export ACE_File_Lock
-{
-public:
-  /**
-   * Set the <handle_> of the File_Lock to @a handle.  Note that this
-   * constructor assumes ownership of the @a handle and will close it
-   * down in <remove>.  If you want the @a handle to stay open when
-   * <remove> is called make sure to call <dup> on the @a handle.
-   * If you don't want the file unlinked in the destructor pass a
-   * zero value for <unlink_in_destructor>.
-   */
-  ACE_File_Lock (ACE_HANDLE handle = ACE_INVALID_HANDLE,
-                 bool unlink_in_destructor = true);
-
-  /// Open the @a filename with @a flags and @a mode and set the result
-  /// to <handle_>.  If you don't want the file unlinked in the
-  /// destructor pass a false value for @a unlink_in_destructor.
-  ACE_File_Lock (const ACE_TCHAR *filename,
-                 int flags,
-                 mode_t mode = 0,
-                 bool unlink_in_destructor = true);
-
-  /// Open the @a filename with @a flags and @a mode and set the result to
-  /// <handle_>.
-  int open (const ACE_TCHAR *filename,
-            int flags,
-            mode_t mode = 0);
-
-  /// Remove a File lock by releasing it and closing down the <handle_>.
-  ~ACE_File_Lock (void);
-
-  /// Remove a File lock by releasing it and closing down the
-  /// <handle_>.  If @a unlink_file is true then we unlink the file.
-  int remove (bool unlink_file = true);
-
-  /**
-   * Note, for interface uniformity with other synchronization
-   * wrappers we include the acquire() method. This is implemented as
-   * a write-lock to be on the safe-side...
-   */
-  int acquire (short whence = 0, ACE_OFF_T start = 0, ACE_OFF_T len = 1);
-
-  /**
-   * Note, for interface uniformity with other synchronization
-   * wrappers we include the <tryacquire> method.  This is implemented
-   * as a write-lock to be on the safe-side...  Returns -1 on failure.
-   * If we "failed" because someone else already had the lock, @c errno
-   * is set to @c EBUSY.
-   */
-  int tryacquire (short whence = 0, ACE_OFF_T start = 0, ACE_OFF_T len = 1);
-
-  /// Unlock a readers/writer lock.
-  int release (short whence = 0, ACE_OFF_T start = 0, ACE_OFF_T len = 1);
-
-  /// Acquire a write lock, but block if any readers or a
-  /// writer hold the lock.
-  int acquire_write (short whence = 0, ACE_OFF_T start = 0, ACE_OFF_T len = 1);
-
-  /**
-   * Conditionally acquire a write lock (i.e., won't block).  Returns
-   * -1 on failure.  If we "failed" because someone else already had
-   * the lock, @c errno is set to @c EBUSY.
-   */
-  int tryacquire_write (short whence = 0, ACE_OFF_T start = 0, ACE_OFF_T len = 1);
-
-  /**
-   * Conditionally upgrade to a write lock (i.e., won't block).  Returns
-   * -1 on failure.  If we "failed" because someone else already had
-   * the lock, @c errno is set to @c EBUSY.
-   */
-  int tryacquire_write_upgrade (short whence = 0,
-                                ACE_OFF_T start = 0,
-                                ACE_OFF_T len = 1);
-
-  /**
-   * Acquire a read lock, but block if a writer hold the lock.
-   * Returns -1 on failure.  If we "failed" because someone else
-   * already had the lock, @c errno is set to @c EBUSY.
-   */
-  int acquire_read (short whence = 0, ACE_OFF_T start = 0, ACE_OFF_T len = 1);
-
-  /**
-   * Conditionally acquire a read lock (i.e., won't block).  Returns
-   * -1 on failure.  If we "failed" because someone else already had
-   * the lock, @c errno is set to @c EBUSY.
-   */
-  int tryacquire_read (short whence = 0, ACE_OFF_T start = 0, ACE_OFF_T len = 1);
-
-  /// Get underlying ACE_HANDLE for the file.
-  ACE_HANDLE get_handle (void) const;
-
-  /**
-   * Set underlying ACE_HANDLE.  Note that this method assumes
-   * ownership of the @a handle and will close it down in <remove>.  If
-   * you want the @a handle to stay open when <remove> is called make
-   * sure to call <dup> on the @a handle before closing it. You are
-   * responsible for the closing the existing @a handle before
-   * overwriting it.
-   */
-  void set_handle (ACE_HANDLE);
-
-  /// Dump state of the object.
-  void dump (void) const;
-
-  /// Declare the dynamic allocation hooks.
-  ACE_ALLOC_HOOK_DECLARE;
-
-protected:
-  /// Locking structure for OS record locks.
-  ACE_OS::ace_flock_t lock_;
-
-  /// Keeps track of whether <remove> has been called yet to avoid
-  /// multiple <remove> calls, e.g., explicitly and implicitly in the
-  /// destructor.  This flag isn't protected by a lock, so make sure
-  /// that you don't have multiple threads simultaneously calling
-  /// <remove> on the same object, which is a bad idea anyway...
-  bool removed_;
-
-  /// Keeps track of whether to unlink the underlying file in the
-  /// destructor.
-  bool const unlink_in_destructor_;
-
-private:
-  // = Prevent assignment and initialization.
-  void operator= (const ACE_File_Lock &);
-  ACE_File_Lock (const ACE_File_Lock &);
-};
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#if defined (__ACE_INLINE__)
-#include "ace/File_Lock.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* ACE_FILE_LOCK_H */