From f510b529f871dc36b2fe3d9933c7da4d74555995 Mon Sep 17 00:00:00 2001 From: Michael Hansen Date: Tue, 1 Jan 2013 16:54:10 -0800 Subject: [PATCH] Remove unused headers from hsStlUtils.h (and push them downstream where needed) Also fix a couple of plString and header issues identified by Paradox on GCC/Clang --- Sources/Plasma/Apps/plClient/plClient.h | 3 ++- Sources/Plasma/CoreLib/hsStlUtils.cpp | 5 ++++- Sources/Plasma/CoreLib/hsStlUtils.h | 6 ------ Sources/Plasma/CoreLib/plString.cpp | 2 +- Sources/Plasma/CoreLib/plString.h | 2 +- Sources/Plasma/FeatureLib/pfCamera/plCameraBrain.cpp | 1 + Sources/Plasma/FeatureLib/pfCamera/plVirtualCamNeu.cpp | 2 ++ Sources/Plasma/FeatureLib/pfConsole/pfConsoleDirSrc.h | 3 ++- Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.h | 3 ++- .../FeatureLib/pfLocalizationMgr/pfLocalizationDataMgr.h | 2 +- .../FeatureLib/pfLocalizationMgr/pfLocalizedString.cpp | 1 - .../Plasma/FeatureLib/pfLocalizationMgr/pfLocalizedString.h | 3 ++- Sources/Plasma/FeatureLib/pfPython/cyAccountManagement.h | 1 + Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifier.h | 2 +- Sources/Plasma/FeatureLib/pfPython/pySDL.h | 3 ++- Sources/Plasma/NucleusLib/inc/plProfileManager.h | 3 ++- Sources/Plasma/NucleusLib/pnDispatch/plDispatch.h | 2 +- Sources/Plasma/NucleusLib/pnKeyedObject/plMsgForwarder.h | 2 +- Sources/Plasma/NucleusLib/pnNetCommon/pnNetCommon.cpp | 1 + Sources/Plasma/PubUtilLib/plAudio/plDSoundBuffer.h | 2 +- Sources/Plasma/PubUtilLib/plAudioCore/plWavFile.h | 2 +- Sources/Plasma/PubUtilLib/plAvatar/plAGAnim.h | 2 +- Sources/Plasma/PubUtilLib/plAvatar/plAGAnimInstance.h | 5 +++-- Sources/Plasma/PubUtilLib/plAvatar/plAnimStage.cpp | 1 + Sources/Plasma/PubUtilLib/plAvatar/plAnimStage.h | 2 +- Sources/Plasma/PubUtilLib/plAvatar/plAvBehaviors.cpp | 2 ++ Sources/Plasma/PubUtilLib/plAvatar/plAvBrainCritter.h | 1 + Sources/Plasma/PubUtilLib/plAvatar/plAvBrainHuman.cpp | 1 + Sources/Plasma/PubUtilLib/plAvatar/plAvBrainSwim.cpp | 2 ++ Sources/Plasma/PubUtilLib/plAvatar/plAvLadderModifier.cpp | 1 + Sources/Plasma/PubUtilLib/plAvatar/plAvTaskSeek.cpp | 2 ++ Sources/Plasma/PubUtilLib/plAvatar/plAvatarMgr.h | 4 +++- Sources/Plasma/PubUtilLib/plAvatar/plMatrixChannel.cpp | 4 +++- .../Plasma/PubUtilLib/plAvatar/plPhysicalControllerCore.cpp | 2 ++ Sources/Plasma/PubUtilLib/plAvatar/plSwimRegion.cpp | 2 ++ Sources/Plasma/PubUtilLib/plContainer/plKeysAndValues.h | 3 ++- Sources/Plasma/PubUtilLib/plDrawable/plDynaDecalMgr.h | 2 +- Sources/Plasma/PubUtilLib/plFile/plStreamSource.h | 1 + Sources/Plasma/PubUtilLib/plInterp/plAnimTimeConvert.h | 1 + Sources/Plasma/PubUtilLib/plMath/plAvg.h | 3 ++- Sources/Plasma/PubUtilLib/plModifier/plResponderModifier.h | 2 +- Sources/Plasma/PubUtilLib/plNetClient/plNetClientGroup.h | 2 +- Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.h | 2 +- .../Plasma/PubUtilLib/plNetClient/plNetClientMgrShow.cpp | 2 ++ .../Plasma/PubUtilLib/plNetClient/plNetClientMsgHandler.cpp | 4 ++-- Sources/Plasma/PubUtilLib/plNetCommon/plNetCommonHelpers.h | 3 ++- Sources/Plasma/PubUtilLib/plNetTransport/plNetTransport.h | 2 +- Sources/Plasma/PubUtilLib/plPhysX/plSimulationMgr.h | 2 +- .../Plasma/PubUtilLib/plPhysical/plCollisionDetector.cpp | 2 ++ Sources/Plasma/PubUtilLib/plPhysical/plPhysicsSoundMgr.h | 2 +- Sources/Plasma/PubUtilLib/plResMgr/plLocalization.h | 3 ++- Sources/Plasma/PubUtilLib/plSDL/plSDL.h | 4 ++-- .../Plasma/PubUtilLib/plStatGather/plProfileManagerFull.h | 4 ++-- Sources/Plasma/PubUtilLib/plStreamLogger/plStreamLogger.h | 2 +- Sources/Tools/MaxMain/plMtlCollector.h | 1 + 55 files changed, 83 insertions(+), 46 deletions(-) diff --git a/Sources/Plasma/Apps/plClient/plClient.h b/Sources/Plasma/Apps/plClient/plClient.h index 92cf6014..474e135d 100644 --- a/Sources/Plasma/Apps/plClient/plClient.h +++ b/Sources/Plasma/Apps/plClient/plClient.h @@ -48,10 +48,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com //#define NEW_CAMERA_CODE #include "HeadSpin.h" +#include + #include "hsBitVector.h" #include "hsTemplates.h" -#include "hsStlUtils.h" #include "pnKeyedObject/hsKeyedObject.h" #include "pnKeyedObject/plUoid.h" #include "plScene/plRenderRequest.h" diff --git a/Sources/Plasma/CoreLib/hsStlUtils.cpp b/Sources/Plasma/CoreLib/hsStlUtils.cpp index 1860d3ea..35c5f774 100644 --- a/Sources/Plasma/CoreLib/hsStlUtils.cpp +++ b/Sources/Plasma/CoreLib/hsStlUtils.cpp @@ -282,6 +282,7 @@ bool formatv(std::wstring & out, const wchar_t * fmt, va_list args) return success; } +/* typedef std::vector StringVector; typedef std::vector WStringVector; typedef std::list StringList; @@ -295,6 +296,7 @@ template bool GetStringGroup(const std::string& s, StringVector& g template bool GetStringGroup(const std::wstring& s, WStringVector& group, wchar_t sep); template bool GetStringGroup(const std::string& s, StringSet& group, char sep); template bool GetStringGroup(const std::wstring& s, WStringSet& group, wchar_t sep); +*/ template bool GetStringGroup(const std::string& s, T& group, char sep) { @@ -337,13 +339,14 @@ template bool GetStringGroup(const std::wstring& s, T& group, wchar return ret; } - +/* template bool GetStringGroupAsString(const StringList& group, std::string& s, char sep); template bool GetStringGroupAsString(const WStringList& group, std::wstring& s, wchar_t sep); template bool GetStringGroupAsString(const StringVector& group, std::string& s, char sep); template bool GetStringGroupAsString(const WStringVector& group, std::wstring& s, wchar_t sep); template bool GetStringGroupAsString(const StringSet& group, std::string& s, char sep); template bool GetStringGroupAsString(const WStringSet& group, std::wstring& s, wchar_t sep); +*/ template bool GetStringGroupAsString(const T& group, std::string& s, char sep) { diff --git a/Sources/Plasma/CoreLib/hsStlUtils.h b/Sources/Plasma/CoreLib/hsStlUtils.h index 9d16236a..9a4c8102 100644 --- a/Sources/Plasma/CoreLib/hsStlUtils.h +++ b/Sources/Plasma/CoreLib/hsStlUtils.h @@ -44,13 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "HeadSpin.h" -#include -#include #include -#include -#include -#include -#include /***************************************************************************** diff --git a/Sources/Plasma/CoreLib/plString.cpp b/Sources/Plasma/CoreLib/plString.cpp index 16d35306..953f6b30 100644 --- a/Sources/Plasma/CoreLib/plString.cpp +++ b/Sources/Plasma/CoreLib/plString.cpp @@ -367,7 +367,7 @@ plStringBuffer plString::ToWchar() const return *reinterpret_cast*>(&utf16); #else plUnicodeBuffer utf32 = GetUnicodeArray(); - return *reinterpret_cast*)(&utf32); + return *reinterpret_cast*>(&utf32); #endif } diff --git a/Sources/Plasma/CoreLib/plString.h b/Sources/Plasma/CoreLib/plString.h index 0553e8ca..b9967255 100644 --- a/Sources/Plasma/CoreLib/plString.h +++ b/Sources/Plasma/CoreLib/plString.h @@ -172,7 +172,7 @@ public: plString &operator=(const char *cstr) { IConvertFromUtf8(cstr, kSizeAuto); return *this; } plString &operator=(const plString ©) { fUtf8Buffer = copy.fUtf8Buffer; return *this; } plString &operator=(const plStringBuffer &init); - plString &operator=(const plUnicodeBuffer &init) { IConvertFromUtf32(init.GetData(), init.GetSize()); } + plString &operator=(const plUnicodeBuffer &init) { IConvertFromUtf32(init.GetData(), init.GetSize()); return *this; } plString &operator+=(const char *cstr) { return operator=(*this + cstr); } plString &operator+=(const plString &str) { return operator=(*this + str); } diff --git a/Sources/Plasma/FeatureLib/pfCamera/plCameraBrain.cpp b/Sources/Plasma/FeatureLib/pfCamera/plCameraBrain.cpp index 0727502a..e94c864c 100644 --- a/Sources/Plasma/FeatureLib/pfCamera/plCameraBrain.cpp +++ b/Sources/Plasma/FeatureLib/pfCamera/plCameraBrain.cpp @@ -40,6 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "HeadSpin.h" +#include #include "plCameraBrain.h" #include "hsTimer.h" diff --git a/Sources/Plasma/FeatureLib/pfCamera/plVirtualCamNeu.cpp b/Sources/Plasma/FeatureLib/pfCamera/plVirtualCamNeu.cpp index 9f85f786..e42d4a59 100644 --- a/Sources/Plasma/FeatureLib/pfCamera/plVirtualCamNeu.cpp +++ b/Sources/Plasma/FeatureLib/pfCamera/plVirtualCamNeu.cpp @@ -41,6 +41,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "HeadSpin.h" +#include + #include "plVirtualCamNeu.h" #include "plCameraModifier.h" #include "plCameraBrain.h" diff --git a/Sources/Plasma/FeatureLib/pfConsole/pfConsoleDirSrc.h b/Sources/Plasma/FeatureLib/pfConsole/pfConsoleDirSrc.h index 3d065e9a..b245f463 100644 --- a/Sources/Plasma/FeatureLib/pfConsole/pfConsoleDirSrc.h +++ b/Sources/Plasma/FeatureLib/pfConsole/pfConsoleDirSrc.h @@ -56,7 +56,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define _pfConsoleDirSrc_h #include "HeadSpin.h" -#include "hsStlUtils.h" +#include + #include "pfConsoleCore/pfConsoleEngine.h" //// pfConsoleDirSrc Class Definition //////////////////////////////////////// diff --git a/Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.h b/Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.h index c99f9a53..2ebbfa7d 100644 --- a/Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.h +++ b/Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.h @@ -165,7 +165,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com ////////////////////////////////////////////////////////////////////////////// #include "HeadSpin.h" -#include "hsStlUtils.h" +#include + #include "hsTemplates.h" #include "hsColorRGBA.h" diff --git a/Sources/Plasma/FeatureLib/pfLocalizationMgr/pfLocalizationDataMgr.h b/Sources/Plasma/FeatureLib/pfLocalizationMgr/pfLocalizationDataMgr.h index 51a73210..fbbc7832 100644 --- a/Sources/Plasma/FeatureLib/pfLocalizationMgr/pfLocalizationDataMgr.h +++ b/Sources/Plasma/FeatureLib/pfLocalizationMgr/pfLocalizationDataMgr.h @@ -50,7 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define _pfLocalizationDataMgr_h #include "HeadSpin.h" -#include "hsStlUtils.h" +#include #include "pfLocalizedString.h" diff --git a/Sources/Plasma/FeatureLib/pfLocalizationMgr/pfLocalizedString.cpp b/Sources/Plasma/FeatureLib/pfLocalizationMgr/pfLocalizedString.cpp index ccf6ece6..704215f7 100644 --- a/Sources/Plasma/FeatureLib/pfLocalizationMgr/pfLocalizedString.cpp +++ b/Sources/Plasma/FeatureLib/pfLocalizationMgr/pfLocalizedString.cpp @@ -49,7 +49,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "HeadSpin.h" - #include "pfLocalizedString.h" // MinGW sucks diff --git a/Sources/Plasma/FeatureLib/pfLocalizationMgr/pfLocalizedString.h b/Sources/Plasma/FeatureLib/pfLocalizationMgr/pfLocalizedString.h index 5448d3d0..fc5f4f3f 100644 --- a/Sources/Plasma/FeatureLib/pfLocalizationMgr/pfLocalizedString.h +++ b/Sources/Plasma/FeatureLib/pfLocalizationMgr/pfLocalizedString.h @@ -51,7 +51,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define _pfLocalizedString_h #include "HeadSpin.h" -#include "hsStlUtils.h" +#include +#include //// pfLocalizedString Class Definition ////////////////////////////// diff --git a/Sources/Plasma/FeatureLib/pfPython/cyAccountManagement.h b/Sources/Plasma/FeatureLib/pfPython/cyAccountManagement.h index 4d41ae55..4c8ccf8c 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyAccountManagement.h +++ b/Sources/Plasma/FeatureLib/pfPython/cyAccountManagement.h @@ -50,6 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // #include +#include typedef struct _object PyObject; typedef struct PyMethodDef PyMethodDef; diff --git a/Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifier.h b/Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifier.h index f5f1150a..2632ae62 100644 --- a/Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifier.h +++ b/Sources/Plasma/FeatureLib/pfPython/plPythonSDLModifier.h @@ -46,7 +46,7 @@ class plPythonFileMod; class plStateDataRecord; class plSimpleStateVariable; -#include "hsStlUtils.h" +#include #include "plModifier/plSDLModifier.h" #include "pyGlueHelpers.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pySDL.h b/Sources/Plasma/FeatureLib/pfPython/pySDL.h index a49ad65a..cd253d22 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pySDL.h +++ b/Sources/Plasma/FeatureLib/pfPython/pySDL.h @@ -49,7 +49,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com ////////////////////////////////////////////////////////////////////// #include "HeadSpin.h" -#include "hsStlUtils.h" +#include + #include "pyGlueHelpers.h" class plStateDataRecord; diff --git a/Sources/Plasma/NucleusLib/inc/plProfileManager.h b/Sources/Plasma/NucleusLib/inc/plProfileManager.h index e36df329..cef7a60d 100644 --- a/Sources/Plasma/NucleusLib/inc/plProfileManager.h +++ b/Sources/Plasma/NucleusLib/inc/plProfileManager.h @@ -43,7 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plProfileManager_h_inc #include "HeadSpin.h" -#include "hsStlUtils.h" +#include + #include "plProfile.h" class plProfileManager diff --git a/Sources/Plasma/NucleusLib/pnDispatch/plDispatch.h b/Sources/Plasma/NucleusLib/pnDispatch/plDispatch.h index 7bfb1e31..9554673c 100644 --- a/Sources/Plasma/NucleusLib/pnDispatch/plDispatch.h +++ b/Sources/Plasma/NucleusLib/pnDispatch/plDispatch.h @@ -42,8 +42,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plDispatch_inc #define plDispatch_inc +#include #include "hsTemplates.h" -#include "hsStlUtils.h" #include "plgDispatch.h" #include "hsThread.h" #include "pnKeyedObject/hsKeyedObject.h" diff --git a/Sources/Plasma/NucleusLib/pnKeyedObject/plMsgForwarder.h b/Sources/Plasma/NucleusLib/pnKeyedObject/plMsgForwarder.h index e367da82..22e87e01 100644 --- a/Sources/Plasma/NucleusLib/pnKeyedObject/plMsgForwarder.h +++ b/Sources/Plasma/NucleusLib/pnKeyedObject/plMsgForwarder.h @@ -42,9 +42,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plMsgForwarder_h_inc #define plMsgForwarder_h_inc +#include #include "hsKeyedObject.h" #include "hsTemplates.h" -#include "hsStlUtils.h" class plMessageWithCallbacks; diff --git a/Sources/Plasma/NucleusLib/pnNetCommon/pnNetCommon.cpp b/Sources/Plasma/NucleusLib/pnNetCommon/pnNetCommon.cpp index 342875ea..3554ebfb 100644 --- a/Sources/Plasma/NucleusLib/pnNetCommon/pnNetCommon.cpp +++ b/Sources/Plasma/NucleusLib/pnNetCommon/pnNetCommon.cpp @@ -39,6 +39,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ +#include #include "pnNetCommon.h" #include "hsWindows.h" diff --git a/Sources/Plasma/PubUtilLib/plAudio/plDSoundBuffer.h b/Sources/Plasma/PubUtilLib/plAudio/plDSoundBuffer.h index 438c6f4c..ac161a5a 100644 --- a/Sources/Plasma/PubUtilLib/plAudio/plDSoundBuffer.h +++ b/Sources/Plasma/PubUtilLib/plAudio/plDSoundBuffer.h @@ -50,7 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef _plDSoundBuffer_h #define _plDSoundBuffer_h -#include "hsStlUtils.h" +#include #include "hsTemplates.h" #include "plEAXEffects.h" #define STREAMING_BUFFERS 16 diff --git a/Sources/Plasma/PubUtilLib/plAudioCore/plWavFile.h b/Sources/Plasma/PubUtilLib/plAudioCore/plWavFile.h index 459fc3c0..16b4fee9 100644 --- a/Sources/Plasma/PubUtilLib/plAudioCore/plWavFile.h +++ b/Sources/Plasma/PubUtilLib/plAudioCore/plWavFile.h @@ -48,7 +48,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "HeadSpin.h" -#include "hsStlUtils.h" +#include #include "hsWindows.h" // FIXME #include #include "plAudioFileReader.h" diff --git a/Sources/Plasma/PubUtilLib/plAvatar/plAGAnim.h b/Sources/Plasma/PubUtilLib/plAvatar/plAGAnim.h index b9826a27..2aeab635 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAGAnim.h +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAGAnim.h @@ -50,8 +50,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com */ #pragma warning(disable: 4786) // don't care if mangled names are longer than 255 characters +#include #include "pnNetCommon/plSynchedObject.h" -#include "hsStlUtils.h" #include "hsStlSortUtils.h" class plTMController; diff --git a/Sources/Plasma/PubUtilLib/plAvatar/plAGAnimInstance.h b/Sources/Plasma/PubUtilLib/plAvatar/plAGAnimInstance.h index edd259f7..9a99382a 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAGAnimInstance.h +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAGAnimInstance.h @@ -53,8 +53,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // disable warning C4786: symbol greater than 255 characters, #pragma warning(disable: 4503 4786) -// templates -#include "hsStlUtils.h" +#include "HeadSpin.h" +#include + #include "hsStlSortUtils.h" // local diff --git a/Sources/Plasma/PubUtilLib/plAvatar/plAnimStage.cpp b/Sources/Plasma/PubUtilLib/plAvatar/plAnimStage.cpp index f5dc5ac5..12065848 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAnimStage.cpp +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAnimStage.cpp @@ -59,6 +59,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTimer.h" #include +#include // other #include "pnSceneObject/plSceneObject.h" diff --git a/Sources/Plasma/PubUtilLib/plAvatar/plAnimStage.h b/Sources/Plasma/PubUtilLib/plAvatar/plAnimStage.h index 4166e330..22a44bc2 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAnimStage.h +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAnimStage.h @@ -47,8 +47,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef PL_ANIM_STAGE_INC #define PL_ANIM_STAGE_INC +#include #include "hsMatrix44.h" -#include "hsStlUtils.h" #include "pnFactory/plCreatable.h" class plMessage; diff --git a/Sources/Plasma/PubUtilLib/plAvatar/plAvBehaviors.cpp b/Sources/Plasma/PubUtilLib/plAvatar/plAvBehaviors.cpp index 1268a5d5..a3d0986a 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAvBehaviors.cpp +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAvBehaviors.cpp @@ -39,6 +39,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ +#include + #include "plAvBehaviors.h" #include "plAvBrainHuman.h" #include "plArmatureMod.h" diff --git a/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainCritter.h b/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainCritter.h index 561797be..0e72f24a 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainCritter.h +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainCritter.h @@ -42,6 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef PL_AV_BRAIN_CRITTER_H #define PL_AV_BRAIN_CRITTER_H +#include #include "plAvBrain.h" #include "hsTemplates.h" #include "pnKeyedObject/plKey.h" diff --git a/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainHuman.cpp b/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainHuman.cpp index 05422c7b..98c6ffad 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainHuman.cpp +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainHuman.cpp @@ -41,6 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "HeadSpin.h" +#include #include "plPhysicalControllerCore.h" #include "plAvBrainHuman.h" diff --git a/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainSwim.cpp b/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainSwim.cpp index 5a990f09..2805de77 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainSwim.cpp +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAvBrainSwim.cpp @@ -46,6 +46,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ///////////////////////////////////////////////////////////////////////////////////////// +#include + // singular #include "plAvBrainSwim.h" diff --git a/Sources/Plasma/PubUtilLib/plAvatar/plAvLadderModifier.cpp b/Sources/Plasma/PubUtilLib/plAvatar/plAvLadderModifier.cpp index a1fdf22d..b1fc2478 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAvLadderModifier.cpp +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAvLadderModifier.cpp @@ -42,6 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plPhysicalControllerCore.h" #include "HeadSpin.h" +#include // singular #include "plAvLadderModifier.h" diff --git a/Sources/Plasma/PubUtilLib/plAvatar/plAvTaskSeek.cpp b/Sources/Plasma/PubUtilLib/plAvatar/plAvTaskSeek.cpp index 60f2322e..f834ddb1 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAvTaskSeek.cpp +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAvTaskSeek.cpp @@ -46,6 +46,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // ///////////////////////////////////////////////////////////////////////////////////////// +#include + // singular #include "plAvTaskSeek.h" diff --git a/Sources/Plasma/PubUtilLib/plAvatar/plAvatarMgr.h b/Sources/Plasma/PubUtilLib/plAvatar/plAvatarMgr.h index e8c57f70..bfec6393 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plAvatarMgr.h +++ b/Sources/Plasma/PubUtilLib/plAvatar/plAvatarMgr.h @@ -45,7 +45,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef PLAVATARMGR_INC #define PLAVATARMGR_INC -#include "hsStlUtils.h" +#include "HeadSpin.h" +#include + #include "hsStlSortUtils.h" #include "hsGeometry3.h" diff --git a/Sources/Plasma/PubUtilLib/plAvatar/plMatrixChannel.cpp b/Sources/Plasma/PubUtilLib/plAvatar/plMatrixChannel.cpp index 64e9d275..65d9ce67 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plMatrixChannel.cpp +++ b/Sources/Plasma/PubUtilLib/plAvatar/plMatrixChannel.cpp @@ -50,6 +50,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com //#include //#include +#include + // singular #include "plMatrixChannel.h" @@ -1015,4 +1017,4 @@ void plIK2Applicator::IApply(const plAGModifier *mod, double time) void plIK2Applicator::ISolve() { -} \ No newline at end of file +} diff --git a/Sources/Plasma/PubUtilLib/plAvatar/plPhysicalControllerCore.cpp b/Sources/Plasma/PubUtilLib/plAvatar/plPhysicalControllerCore.cpp index 6fa701fc..fba853f5 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plPhysicalControllerCore.cpp +++ b/Sources/Plasma/PubUtilLib/plAvatar/plPhysicalControllerCore.cpp @@ -39,6 +39,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ +#include + #include "plPhysicalControllerCore.h" #include "plArmatureMod.h" diff --git a/Sources/Plasma/PubUtilLib/plAvatar/plSwimRegion.cpp b/Sources/Plasma/PubUtilLib/plAvatar/plSwimRegion.cpp index 1ba908a5..e3adae43 100644 --- a/Sources/Plasma/PubUtilLib/plAvatar/plSwimRegion.cpp +++ b/Sources/Plasma/PubUtilLib/plAvatar/plSwimRegion.cpp @@ -39,6 +39,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ +#include + #include "hsGeometry3.h" #include "hsResMgr.h" diff --git a/Sources/Plasma/PubUtilLib/plContainer/plKeysAndValues.h b/Sources/Plasma/PubUtilLib/plContainer/plKeysAndValues.h index 3d0082f5..c951df5b 100644 --- a/Sources/Plasma/PubUtilLib/plContainer/plKeysAndValues.h +++ b/Sources/Plasma/PubUtilLib/plContainer/plKeysAndValues.h @@ -43,8 +43,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plKeysAndValues_h_inc #include "HeadSpin.h" +#include +#include -#include "hsStlUtils.h" #include "hsStream.h" #pragma warning(disable:4284) diff --git a/Sources/Plasma/PubUtilLib/plDrawable/plDynaDecalMgr.h b/Sources/Plasma/PubUtilLib/plDrawable/plDynaDecalMgr.h index c23c9515..dc979b48 100644 --- a/Sources/Plasma/PubUtilLib/plDrawable/plDynaDecalMgr.h +++ b/Sources/Plasma/PubUtilLib/plDrawable/plDynaDecalMgr.h @@ -43,11 +43,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plDynaDecalMgr_inc #define plDynaDecalMgr_inc +#include #include "pnNetCommon/plSynchedObject.h" #include "hsTemplates.h" #include "hsGeometry3.h" #include "hsMatrix44.h" -#include "hsStlUtils.h" class plParticleSystem; diff --git a/Sources/Plasma/PubUtilLib/plFile/plStreamSource.h b/Sources/Plasma/PubUtilLib/plFile/plStreamSource.h index fb11bb08..4f010042 100644 --- a/Sources/Plasma/PubUtilLib/plFile/plStreamSource.h +++ b/Sources/Plasma/PubUtilLib/plFile/plStreamSource.h @@ -42,6 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plStreamSource_h_inc #define plStreamSource_h_inc +#include #include "hsStream.h" #include "hsStlUtils.h" diff --git a/Sources/Plasma/PubUtilLib/plInterp/plAnimTimeConvert.h b/Sources/Plasma/PubUtilLib/plInterp/plAnimTimeConvert.h index 57752d2f..7e192fe0 100644 --- a/Sources/Plasma/PubUtilLib/plInterp/plAnimTimeConvert.h +++ b/Sources/Plasma/PubUtilLib/plInterp/plAnimTimeConvert.h @@ -42,6 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plAnimTimeConvert_inc #define plAnimTimeConvert_inc +#include #include "pnFactory/plCreatable.h" #include "hsTemplates.h" #include "pnNetCommon/plSynchedValue.h" diff --git a/Sources/Plasma/PubUtilLib/plMath/plAvg.h b/Sources/Plasma/PubUtilLib/plMath/plAvg.h index 69494c50..80721d3d 100644 --- a/Sources/Plasma/PubUtilLib/plMath/plAvg.h +++ b/Sources/Plasma/PubUtilLib/plMath/plAvg.h @@ -43,8 +43,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define PL_AVG_H #include "HeadSpin.h" +#include + #include "hsThread.h" -#include "hsStlUtils.h" // A Time based Value Averaging class diff --git a/Sources/Plasma/PubUtilLib/plModifier/plResponderModifier.h b/Sources/Plasma/PubUtilLib/plModifier/plResponderModifier.h index 38ee3d04..5734ea85 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plResponderModifier.h +++ b/Sources/Plasma/PubUtilLib/plModifier/plResponderModifier.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plResponderModifier_inc #define plResponderModifier_inc -#include "hsStlUtils.h" +#include #include "pnModifier/plSingleModifier.h" #include "pnMessage/plMessage.h" diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientGroup.h b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientGroup.h index 324d172b..b5703568 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientGroup.h +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientGroup.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plNetClientGroup_h #define plNetClientGroup_h -#include "hsStlUtils.h" +#include #include "pnNetCommon/plNetGroup.h" // diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.h b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.h index 8453cd7d..589b8799 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.h +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define PL_NET_CLIENT_inc #include "HeadSpin.h" -#include "hsStlUtils.h" +#include #include "plNetClientGroup.h" #include "plNetVoiceList.h" diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrShow.cpp b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrShow.cpp index 8c4bd094..42279dfa 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrShow.cpp +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrShow.cpp @@ -39,6 +39,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com Mead, WA 99021 *==LICENSE==*/ +#include + #include "plNetClientMgr.h" #include "plNetLinkingMgr.h" diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMsgHandler.cpp b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMsgHandler.cpp index a028ff83..ffb3dfb3 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMsgHandler.cpp +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMsgHandler.cpp @@ -252,10 +252,10 @@ MSG_HANDLER_DEFN(plNetClientMsgHandler,plNetMsgSDLState) { std::string err; if (!sdRec) - err = xtl::format( "SDL descriptor %s missing, v=%d", descName, ver); + err = xtl::format( "SDL descriptor %s missing, v=%d", descName.c_str(), ver); else err = xtl::format( "SDL descriptor %s, version mismatch, server v=%d, client v=%d", - descName, ver, sdRec->GetDescriptor()->GetVersion()); + descName.c_str(), ver, sdRec->GetDescriptor()->GetVersion()); hsAssert(false, err.c_str()); nc->ErrorMsg(const_cast(err.c_str())); diff --git a/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommonHelpers.h b/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommonHelpers.h index 55d0f866..86935e10 100644 --- a/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommonHelpers.h +++ b/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommonHelpers.h @@ -43,7 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plNetCommonHelpers_h_inc #include "HeadSpin.h" -#include "hsStlUtils.h" +#include + #include "hsTimer.h" #include "pnNetCommon/pnNetCommon.h" #include "pnNetCommon/plNetApp.h" diff --git a/Sources/Plasma/PubUtilLib/plNetTransport/plNetTransport.h b/Sources/Plasma/PubUtilLib/plNetTransport/plNetTransport.h index aa719320..ec863a85 100644 --- a/Sources/Plasma/PubUtilLib/plNetTransport/plNetTransport.h +++ b/Sources/Plasma/PubUtilLib/plNetTransport/plNetTransport.h @@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define plNetTransport_h #include "HeadSpin.h" -#include "hsStlUtils.h" +#include // // The transport class handles the details of sending net msgs to diff --git a/Sources/Plasma/PubUtilLib/plPhysX/plSimulationMgr.h b/Sources/Plasma/PubUtilLib/plPhysX/plSimulationMgr.h index d8a38b50..170ed011 100644 --- a/Sources/Plasma/PubUtilLib/plPhysX/plSimulationMgr.h +++ b/Sources/Plasma/PubUtilLib/plPhysX/plSimulationMgr.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plSimulationMgr_H #define plSimulationMgr_H -#include "hsStlUtils.h" +#include #include "pnKeyedObject/hsKeyedObject.h" #include "hsTemplates.h" diff --git a/Sources/Plasma/PubUtilLib/plPhysical/plCollisionDetector.cpp b/Sources/Plasma/PubUtilLib/plPhysical/plCollisionDetector.cpp index ca14aa0b..147c7790 100644 --- a/Sources/Plasma/PubUtilLib/plPhysical/plCollisionDetector.cpp +++ b/Sources/Plasma/PubUtilLib/plPhysical/plCollisionDetector.cpp @@ -41,6 +41,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "HeadSpin.h" +#include + #include "plCollisionDetector.h" #include "plMessage/plCollideMsg.h" #include "plgDispatch.h" diff --git a/Sources/Plasma/PubUtilLib/plPhysical/plPhysicsSoundMgr.h b/Sources/Plasma/PubUtilLib/plPhysical/plPhysicsSoundMgr.h index 7ee2c8b7..49d48f10 100644 --- a/Sources/Plasma/PubUtilLib/plPhysical/plPhysicsSoundMgr.h +++ b/Sources/Plasma/PubUtilLib/plPhysical/plPhysicsSoundMgr.h @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plPhysicsSoundMgr_h_inc #define plPhysicsSoundMgr_h_inc -#include "hsStlUtils.h" +#include #include "plPhysical.h" #include "hsGeometry3.h" diff --git a/Sources/Plasma/PubUtilLib/plResMgr/plLocalization.h b/Sources/Plasma/PubUtilLib/plResMgr/plLocalization.h index d3b4cde1..a73011c5 100644 --- a/Sources/Plasma/PubUtilLib/plResMgr/plLocalization.h +++ b/Sources/Plasma/PubUtilLib/plResMgr/plLocalization.h @@ -42,7 +42,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plLocalization_h_inc #define plLocalization_h_inc -#include "hsStlUtils.h" +#include +#include class plLocalization { diff --git a/Sources/Plasma/PubUtilLib/plSDL/plSDL.h b/Sources/Plasma/PubUtilLib/plSDL/plSDL.h index c4de5a1a..207cb3f2 100644 --- a/Sources/Plasma/PubUtilLib/plSDL/plSDL.h +++ b/Sources/Plasma/PubUtilLib/plSDL/plSDL.h @@ -46,9 +46,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // Code for the State Description Language (SDL) // -#include "plSDLDescriptor.h" +#include -#include "hsStlUtils.h" +#include "plSDLDescriptor.h" #include "pnFactory/plCreatable.h" #include "pnKeyedObject/plKey.h" diff --git a/Sources/Plasma/PubUtilLib/plStatGather/plProfileManagerFull.h b/Sources/Plasma/PubUtilLib/plStatGather/plProfileManagerFull.h index fa10c997..900ba531 100644 --- a/Sources/Plasma/PubUtilLib/plStatGather/plProfileManagerFull.h +++ b/Sources/Plasma/PubUtilLib/plStatGather/plProfileManagerFull.h @@ -42,9 +42,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plProfileManagerFull_h_inc #define plProfileManagerFull_h_inc -#include "plProfileManager.h" +#include -#include "hsStlUtils.h" +#include "plProfileManager.h" #include "hsStlSortUtils.h" diff --git a/Sources/Plasma/PubUtilLib/plStreamLogger/plStreamLogger.h b/Sources/Plasma/PubUtilLib/plStreamLogger/plStreamLogger.h index 73d9746e..15a2f894 100644 --- a/Sources/Plasma/PubUtilLib/plStreamLogger/plStreamLogger.h +++ b/Sources/Plasma/PubUtilLib/plStreamLogger/plStreamLogger.h @@ -42,8 +42,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef PL_STREAM_LOGGER #define PL_STREAM_LOGGER +#include #include "hsStream.h" -#include "hsStlUtils.h" #include "pnNetCommon/plGenericVar.h" class plStreamLogger diff --git a/Sources/Tools/MaxMain/plMtlCollector.h b/Sources/Tools/MaxMain/plMtlCollector.h index 840a2c5e..29d9d632 100644 --- a/Sources/Tools/MaxMain/plMtlCollector.h +++ b/Sources/Tools/MaxMain/plMtlCollector.h @@ -42,6 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plMtlCollector_h_inc #define plMtlCollector_h_inc +#include #include "hsStlSortUtils.h" class PBBitmap;