Browse Source

Fix some *nix compiler errors.

Darryl Pogue 11 years ago
parent
commit
f1767ebabe
  1. 5
      Sources/Plasma/CoreLib/hsAlignedAllocator.hpp
  2. 2
      Sources/Plasma/PubUtilLib/plAudio/plWin32GroupedSound.cpp
  3. 2
      Sources/Plasma/PubUtilLib/plAudio/plWin32StaticSound.cpp

5
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 <stdexcept>
template<class T, size_t ALIGNMENT=16>
@ -56,10 +57,10 @@ class hsAlignedAllocator
hsAlignedAllocator& operator=(const hsAlignedAllocator&) { }
public:
template <typename U, size_t ALIGNMENT=16>
template <typename U, size_t ALIGN=16>
struct rebind
{
typedef hsAlignedAllocator<U, ALIGNMENT> other;
typedef hsAlignedAllocator<U, ALIGN> other;
};
typedef T* pointer;

2
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;

2
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;

Loading…
Cancel
Save