From f1767ebabe9f472391198b0389758ed972f82e2c Mon Sep 17 00:00:00 2001
From: Darryl Pogue <dvpdiner2@gmail.com>
Date: Sat, 20 Jul 2013 00:02:07 -0700
Subject: [PATCH] Fix some *nix compiler errors.

---
 Sources/Plasma/CoreLib/hsAlignedAllocator.hpp             | 5 +++--
 Sources/Plasma/PubUtilLib/plAudio/plWin32GroupedSound.cpp | 2 +-
 Sources/Plasma/PubUtilLib/plAudio/plWin32StaticSound.cpp  | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

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