From 682329851633b6cb956ca01514a4b0cf26c9844b Mon Sep 17 00:00:00 2001
From: "Alexander \"Ace\" Olofsson" <ace@haxalot.com>
Date: Mon, 30 Nov 2015 17:42:25 +0100
Subject: [PATCH] Different way to solve the type deduction issue

---
 apps/openmw/mwsound/soundmanagerimp.cpp | 7 ++++---
 apps/openmw/mwsound/soundmanagerimp.hpp | 3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwsound/soundmanagerimp.cpp b/apps/openmw/mwsound/soundmanagerimp.cpp
index 0f5cee737..ceff1a619 100644
--- a/apps/openmw/mwsound/soundmanagerimp.cpp
+++ b/apps/openmw/mwsound/soundmanagerimp.cpp
@@ -40,6 +40,7 @@ namespace MWSound
         , mMusicVolume(1.0f)
         , mVoiceVolume(1.0f)
         , mFootstepsVolume(1.0f)
+        , mSoundBuffers(new SoundBufferList::element_type())
         , mBufferCacheSize(0)
         , mListenerUnderwater(false)
         , mListenerPos(0,0,0)
@@ -101,8 +102,8 @@ namespace MWSound
         clear();
         if(mOutput->isInitialized())
         {
-            SoundBufferList::iterator sfxiter = mSoundBuffers.begin();
-            for(;sfxiter != mSoundBuffers.end();++sfxiter)
+            SoundBufferList::element_type::iterator sfxiter = mSoundBuffers->begin();
+            for(;sfxiter != mSoundBuffers->end();++sfxiter)
             {
                 if(sfxiter->mHandle)
                     mOutput->unloadSound(sfxiter->mHandle);
@@ -145,7 +146,7 @@ namespace MWSound
         min = std::max(min, 1.0f);
         max = std::max(min, max);
 
-        Sound_Buffer *sfx = &*mSoundBuffers.insert(mSoundBuffers.end(),
+        Sound_Buffer *sfx = &*mSoundBuffers->insert(mSoundBuffers->end(),
             Sound_Buffer("Sound/"+sound->mSound, volume, min, max)
         );
         mVFS->normalizeFilename(sfx->mResourceName);
diff --git a/apps/openmw/mwsound/soundmanagerimp.hpp b/apps/openmw/mwsound/soundmanagerimp.hpp
index 8e2df9f1a..424fa712c 100644
--- a/apps/openmw/mwsound/soundmanagerimp.hpp
+++ b/apps/openmw/mwsound/soundmanagerimp.hpp
@@ -1,6 +1,7 @@
 #ifndef GAME_SOUND_SOUNDMANAGER_H
 #define GAME_SOUND_SOUNDMANAGER_H
 
+#include <memory>
 #include <string>
 #include <utility>
 #include <deque>
@@ -56,7 +57,7 @@ namespace MWSound
         float mVoiceVolume;
         float mFootstepsVolume;
 
-        typedef std::deque<Sound_Buffer> SoundBufferList;
+        typedef std::auto_ptr<std::deque<Sound_Buffer>> SoundBufferList;
         // List of sound buffers, grown as needed. New enties are added to the
         // back, allowing existing Sound_Buffer references/pointers to remain
         // valid.