Merge pull request #724 from lioncash/mem_fn

AudioCommon: Get rid of some unnecessary mem_fn calls
dolphin-emu · Aug 4, 2014 · 87e7c1e · 87e7c1e
2 parents 15920d0 + 17e79a9
commit 87e7c1e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/Source/Core/AudioCommon/DSoundStream.cpp b/Source/Core/AudioCommon/DSoundStream.cpp
@@ -3,9 +3,7 @@
 // Refer to the license.txt file included.
 
 #include <cmath>
-#include <functional>
-
-#include <windows.h>
+#include <Windows.h>
 
 #include "AudioCommon/AudioCommon.h"
 #include "AudioCommon/DSoundStream.h"
@@ -123,7 +121,7 @@ bool DSound::Start()
 	dsBuffer->Lock(0, bufferSize, (void* *)&p1, &num1, 0, 0, DSBLOCK_ENTIREBUFFER);
 	memset(p1, 0, num1);
 	dsBuffer->Unlock(p1, num1, 0, 0);
-	thread = std::thread(std::mem_fn(&DSound::SoundLoop), this);
+	thread = std::thread(&DSound::SoundLoop, this);
 	return true;
 }
 

diff --git a/Source/Core/AudioCommon/OpenALStream.cpp b/Source/Core/AudioCommon/OpenALStream.cpp
@@ -38,7 +38,7 @@ bool OpenALStream::Start()
 				//period_size_in_millisec = 1000 / refresh;
 
 				alcMakeContextCurrent(pContext);
-				thread = std::thread(std::mem_fn(&OpenALStream::SoundLoop), this);
+				thread = std::thread(&OpenALStream::SoundLoop, this);
 				bReturn = true;
 			}
 			else