OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-17 18:59:09 +00:00
Code Releases Activity

Fix some *nix compiler errors.

Browse Source
This commit is contained in:
Darryl Pogue
2013-07-20 00:02:07 -07:00
parent 509bf10a66
commit f1767ebabe
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Sources/Plasma/CoreLib/hsAlignedAllocator.hpp
View File

@ -44,6 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#define _HS_ALIGNED_ALLOCATOR_H #define _HS_ALIGNED_ALLOCATOR_H
#include "HeadSpin.h" #include "HeadSpin.h"
#include <stdexcept>
template<class T, size_t ALIGNMENT=16> template<class T, size_t ALIGNMENT=16>
@ -56,10 +57,10 @@ class hsAlignedAllocator
hsAlignedAllocator& operator=(const hsAlignedAllocator&) { } hsAlignedAllocator& operator=(const hsAlignedAllocator&) { }
public: public:
template <typename U, size_t ALIGNMENT=16> template <typename U, size_t ALIGN=16>
struct rebind struct rebind
{ {
typedef hsAlignedAllocator<U, ALIGNMENT> other; typedef hsAlignedAllocator<U, ALIGN> other;
}; };
typedef T* pointer; typedef T* pointer;

2
Sources/Plasma/PubUtilLib/plAudio/plWin32GroupedSound.cpp
View File

@ -212,7 +212,7 @@ bool plWin32GroupedSound::LoadSound( bool is3D )
if( !fDSoundBuffer->IsValid() ) if( !fDSoundBuffer->IsValid() )
{ {
char str[256]; 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 ); IPrintDbgMessage( str, true );
fFailed = true; fFailed = true;

2
Sources/Plasma/PubUtilLib/plAudio/plWin32StaticSound.cpp
View File

@ -153,7 +153,7 @@ bool plWin32StaticSound::LoadSound( bool is3D )
if( !fDSoundBuffer->IsValid() ) if( !fDSoundBuffer->IsValid() )
{ {
char str[256]; 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 ); IPrintDbgMessage( str, true );
fFailed = true; fFailed = true;