diff --git a/Sources/Plasma/CoreLib/hsAlignedAllocator.hpp b/Sources/Plasma/CoreLib/hsAlignedAllocator.hpp index b3c2fcea..a592d45c 100644 --- a/Sources/Plasma/CoreLib/hsAlignedAllocator.hpp +++ b/Sources/Plasma/CoreLib/hsAlignedAllocator.hpp @@ -44,6 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define _HS_ALIGNED_ALLOCATOR_H #include "HeadSpin.h" +#include template @@ -56,10 +57,10 @@ class hsAlignedAllocator hsAlignedAllocator& operator=(const hsAlignedAllocator&) { } public: - template + template struct rebind { - typedef hsAlignedAllocator other; + typedef hsAlignedAllocator other; }; typedef T* pointer; diff --git a/Sources/Plasma/PubUtilLib/plAudio/plWin32GroupedSound.cpp b/Sources/Plasma/PubUtilLib/plAudio/plWin32GroupedSound.cpp index fdb29fd6..49495816 100644 --- a/Sources/Plasma/PubUtilLib/plAudio/plWin32GroupedSound.cpp +++ b/Sources/Plasma/PubUtilLib/plAudio/plWin32GroupedSound.cpp @@ -212,7 +212,7 @@ bool plWin32GroupedSound::LoadSound( bool is3D ) if( !fDSoundBuffer->IsValid() ) { char str[256]; - sprintf(str, "Can't create sound buffer for %s.wav. This could happen if the wav file is a stereo file. Stereo files are not supported on 3D sounds. If the file is not stereo then please report this error.", GetFileName()); + sprintf(str, "Can't create sound buffer for %s.wav. This could happen if the wav file is a stereo file. Stereo files are not supported on 3D sounds. If the file is not stereo then please report this error.", GetFileName().AsString().c_str()); IPrintDbgMessage( str, true ); fFailed = true; diff --git a/Sources/Plasma/PubUtilLib/plAudio/plWin32StaticSound.cpp b/Sources/Plasma/PubUtilLib/plAudio/plWin32StaticSound.cpp index fbbe49b5..be84394b 100644 --- a/Sources/Plasma/PubUtilLib/plAudio/plWin32StaticSound.cpp +++ b/Sources/Plasma/PubUtilLib/plAudio/plWin32StaticSound.cpp @@ -153,7 +153,7 @@ bool plWin32StaticSound::LoadSound( bool is3D ) if( !fDSoundBuffer->IsValid() ) { char str[256]; - sprintf(str, "Can't create sound buffer for %s.wav. This could happen if the wav file is a stereo file. Stereo files are not supported on 3D sounds. If the file is not stereo then please report this error.", GetFileName()); + sprintf(str, "Can't create sound buffer for %s.wav. This could happen if the wav file is a stereo file. Stereo files are not supported on 3D sounds. If the file is not stereo then please report this error.", GetFileName().AsString().c_str()); IPrintDbgMessage( str, true ); fFailed = true;