Merge pull request #1037 from lioncash/mem_fn

AudioCommon: Remove unnecessary usages of mem_fn

3 files changed, 4 insertions, 9 deletions

diff --git a/Source/Core/AudioCommon/AOSoundStream.cpp b/Source/Core/AudioCommon/AOSoundStream.cpp
index f2d7622d1d..7def6331a3 100644
--- a/Source/Core/AudioCommon/AOSoundStream.cpp
+++ b/Source/Core/AudioCommon/AOSoundStream.cpp
@@ -2,8 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include <functional>
-#include <string.h>
+#include <cstring>
 
 #include "AudioCommon/AOSoundStream.h"
 #include "AudioCommon/Mixer.h"
@@ -50,7 +49,7 @@ bool AOSound::Start()
 {
 	memset(realtimeBuffer, 0, sizeof(realtimeBuffer));
 
-	thread = std::thread(std::mem_fn(&AOSound::SoundLoop), this);
+	thread = std::thread(&AOSound::SoundLoop, this);
 	return true;
 }
 
diff --git a/Source/Core/AudioCommon/AlsaSoundStream.cpp b/Source/Core/AudioCommon/AlsaSoundStream.cpp
index 6eb8d68369..de6877c278 100644
--- a/Source/Core/AudioCommon/AlsaSoundStream.cpp
+++ b/Source/Core/AudioCommon/AlsaSoundStream.cpp
@@ -2,8 +2,6 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include <functional>
-
 #include "AudioCommon/AlsaSoundStream.h"
 #include "Common/Common.h"
 #include "Common/Thread.h"
@@ -24,7 +22,7 @@ AlsaSound::~AlsaSound()
 
 bool AlsaSound::Start()
 {
-	thread = std::thread(std::mem_fn(&AlsaSound::SoundLoop), this);
+	thread = std::thread(&AlsaSound::SoundLoop, this);
 	thread_data = 0;
 	return true;
 }
diff --git a/Source/Core/AudioCommon/PulseAudioStream.cpp b/Source/Core/AudioCommon/PulseAudioStream.cpp
index 03aefe30f0..22559feb41 100644
--- a/Source/Core/AudioCommon/PulseAudioStream.cpp
+++ b/Source/Core/AudioCommon/PulseAudioStream.cpp
@@ -2,8 +2,6 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include <functional>
-
 #include "AudioCommon/PulseAudioStream.h"
 #include "Common/Common.h"
 #include "Common/Thread.h"
@@ -25,7 +23,7 @@ PulseAudio::PulseAudio(CMixer *mixer)
 bool PulseAudio::Start()
 {
 	m_run_thread = true;
-	m_thread = std::thread(std::mem_fn(&PulseAudio::SoundLoop), this);
+	m_thread = std::thread(&PulseAudio::SoundLoop, this);
 	return true;
 }