diff options
| author | Shauren <shauren.trinity@gmail.com> | 2014-07-19 03:38:57 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2014-07-19 03:51:11 +0200 |
| commit | 909acdbac3223d8c788b1b5dc42b6dfab8b604ab (patch) | |
| tree | 2a0ade312aad77ca032015c6957a4a9005aa0b94 /dep/acelite/ace/SStringfwd.h | |
| parent | 5daf3d360686ea8ff2d97a48fca24f0bf42ef098 (diff) | |
| parent | 1866d8cc06e2b8c2722ccf69ee3f52ceda93bc27 (diff) | |
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
Diffstat (limited to 'dep/acelite/ace/SStringfwd.h')
| -rw-r--r-- | dep/acelite/ace/SStringfwd.h | 55 |
1 files changed, 0 insertions, 55 deletions
diff --git a/dep/acelite/ace/SStringfwd.h b/dep/acelite/ace/SStringfwd.h deleted file mode 100644 index 50f30f69c03..00000000000 --- a/dep/acelite/ace/SStringfwd.h +++ /dev/null @@ -1,55 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file SStringfwd.h - * - * $Id: SStringfwd.h 88793 2010-02-01 17:50:34Z cleeland $ - * - * Forward declarations and typedefs of ACE string types. - * - * @author Douglas C. Schmidt <schmidt@cs.wustl.edu> - * @author Nanbor Wang <nanbor@cs.wustl.edu> - * @author Ossama Othman <ossama@uci.edu> - */ -//============================================================================= - -#ifndef ACE_SSTRINGFWD_H -#define ACE_SSTRINGFWD_H - -#include /**/ "ace/pre.h" - -#include "ace/Basic_Types.h" /* ACE_WCHAR_T definition */ - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if (defined (__HP_aCC) && (36300 <= __HP_aCC) && (__HP_aCC <= 37300)) -// Due to a bug in the aCC 3.xx compiler need to define the ACE_String_Base -// template before we can typedef ACE_CString -# include "ace/String_Base.h" -#endif /* __HP_aCC */ - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - -template <class ACE_CHAR_T> class ACE_String_Base; // Forward declaration. - -typedef ACE_WCHAR_T ACE_WSTRING_TYPE; - -typedef ACE_String_Base<char> ACE_CString; -typedef ACE_String_Base<ACE_WSTRING_TYPE> ACE_WString; - -// This allows one to use W or C String based on the Unicode -// setting -#if defined (ACE_USES_WCHAR) -typedef ACE_WString ACE_TString; -#else /* ACE_USES_WCHAR */ -typedef ACE_CString ACE_TString; -#endif /* ACE_USES_WCHAR */ - -ACE_END_VERSIONED_NAMESPACE_DECL - -#include /**/ "ace/post.h" - -#endif /* ACE_SSTRINGFWD_H */ |