From e79895e372c00b1464fb3a28ec0a0b337b660d6f Mon Sep 17 00:00:00 2001 From: lioncash Date: Tue, 1 Apr 2014 12:09:22 -0400 Subject: [PATCH] Replace use of the deprecated mem_fun function with mem_fn. --- Source/Core/AudioCommon/AOSoundStream.cpp | 2 +- Source/Core/AudioCommon/AlsaSoundStream.cpp | 2 +- Source/Core/AudioCommon/DSoundStream.cpp | 2 +- Source/Core/AudioCommon/OpenALStream.cpp | 2 +- Source/Core/AudioCommon/PulseAudioStream.cpp | 2 +- Source/Core/Core/HW/EXI_DeviceGecko.cpp | 2 +- Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp | 4 ++-- Source/Core/Core/NetPlayClient.cpp | 2 +- Source/Core/Core/NetPlayServer.cpp | 2 +- Source/Core/InputCommon/UDPWiimote.cpp | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Source/Core/AudioCommon/AOSoundStream.cpp b/Source/Core/AudioCommon/AOSoundStream.cpp index 20ec4261c2..f2d7622d1d 100644 --- a/Source/Core/AudioCommon/AOSoundStream.cpp +++ b/Source/Core/AudioCommon/AOSoundStream.cpp @@ -50,7 +50,7 @@ bool AOSound::Start() { memset(realtimeBuffer, 0, sizeof(realtimeBuffer)); - thread = std::thread(std::mem_fun(&AOSound::SoundLoop), this); + thread = std::thread(std::mem_fn(&AOSound::SoundLoop), this); return true; } diff --git a/Source/Core/AudioCommon/AlsaSoundStream.cpp b/Source/Core/AudioCommon/AlsaSoundStream.cpp index ba4855400f..6eb8d68369 100644 --- a/Source/Core/AudioCommon/AlsaSoundStream.cpp +++ b/Source/Core/AudioCommon/AlsaSoundStream.cpp @@ -24,7 +24,7 @@ AlsaSound::~AlsaSound() bool AlsaSound::Start() { - thread = std::thread(std::mem_fun(&AlsaSound::SoundLoop), this); + thread = std::thread(std::mem_fn(&AlsaSound::SoundLoop), this); thread_data = 0; return true; } diff --git a/Source/Core/AudioCommon/DSoundStream.cpp b/Source/Core/AudioCommon/DSoundStream.cpp index 742019a1b4..2ffbe9794b 100644 --- a/Source/Core/AudioCommon/DSoundStream.cpp +++ b/Source/Core/AudioCommon/DSoundStream.cpp @@ -121,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_fun(&DSound::SoundLoop), this); + thread = std::thread(std::mem_fn(&DSound::SoundLoop), this); return true; } diff --git a/Source/Core/AudioCommon/OpenALStream.cpp b/Source/Core/AudioCommon/OpenALStream.cpp index fb4d778b12..b2f820c453 100644 --- a/Source/Core/AudioCommon/OpenALStream.cpp +++ b/Source/Core/AudioCommon/OpenALStream.cpp @@ -36,7 +36,7 @@ bool OpenALStream::Start() //period_size_in_millisec = 1000 / refresh; alcMakeContextCurrent(pContext); - thread = std::thread(std::mem_fun(&OpenALStream::SoundLoop), this); + thread = std::thread(std::mem_fn(&OpenALStream::SoundLoop), this); bReturn = true; } else diff --git a/Source/Core/AudioCommon/PulseAudioStream.cpp b/Source/Core/AudioCommon/PulseAudioStream.cpp index b4d2772709..53bb36a58c 100644 --- a/Source/Core/AudioCommon/PulseAudioStream.cpp +++ b/Source/Core/AudioCommon/PulseAudioStream.cpp @@ -24,7 +24,7 @@ PulseAudio::PulseAudio(CMixer *mixer) bool PulseAudio::Start() { m_run_thread = true; - m_thread = std::thread(std::mem_fun(&PulseAudio::SoundLoop), this); + m_thread = std::thread(std::mem_fn(&PulseAudio::SoundLoop), this); return true; } diff --git a/Source/Core/Core/HW/EXI_DeviceGecko.cpp b/Source/Core/Core/HW/EXI_DeviceGecko.cpp index 2938d85cd4..f9ec47dff4 100644 --- a/Source/Core/Core/HW/EXI_DeviceGecko.cpp +++ b/Source/Core/Core/HW/EXI_DeviceGecko.cpp @@ -88,7 +88,7 @@ bool GeckoSockServer::GetAvailableSock(sf::SocketTCP &sock_to_fill) recv_fifo = std::deque(); send_fifo = std::deque(); } - clientThread = std::thread(std::mem_fun(&GeckoSockServer::ClientThread), this); + clientThread = std::thread(std::mem_fn(&GeckoSockServer::ClientThread), this); client_count++; waiting_socks.pop(); sock_filled = true; diff --git a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp index 675cd0b20e..f2736e0105 100644 --- a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp +++ b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp @@ -418,7 +418,7 @@ void WiimoteScanner::StartScanning() if (!m_run_thread) { m_run_thread = true; - m_scan_thread = std::thread(std::mem_fun(&WiimoteScanner::ThreadFunc), this); + m_scan_thread = std::thread(std::mem_fn(&WiimoteScanner::ThreadFunc), this); } } @@ -491,7 +491,7 @@ bool Wiimote::Connect() void Wiimote::StartThread() { m_run_thread = true; - m_wiimote_thread = std::thread(std::mem_fun(&Wiimote::ThreadFunc), this); + m_wiimote_thread = std::thread(std::mem_fn(&Wiimote::ThreadFunc), this); } void Wiimote::StopThread() diff --git a/Source/Core/Core/NetPlayClient.cpp b/Source/Core/Core/NetPlayClient.cpp index 2da0dce142..8e9742e65a 100644 --- a/Source/Core/Core/NetPlayClient.cpp +++ b/Source/Core/Core/NetPlayClient.cpp @@ -117,7 +117,7 @@ NetPlayClient::NetPlayClient(const std::string& address, const u16 port, NetPlay is_connected = true; m_selector.Add(m_socket); - m_thread = std::thread(std::mem_fun(&NetPlayClient::ThreadFunc), this); + m_thread = std::thread(std::mem_fn(&NetPlayClient::ThreadFunc), this); } } else diff --git a/Source/Core/Core/NetPlayServer.cpp b/Source/Core/Core/NetPlayServer.cpp index c8e4438ef6..731f3b1093 100644 --- a/Source/Core/Core/NetPlayServer.cpp +++ b/Source/Core/Core/NetPlayServer.cpp @@ -31,7 +31,7 @@ NetPlayServer::NetPlayServer(const u16 port) : is_connected(false), m_is_running is_connected = true; m_do_loop = true; m_selector.Add(m_socket); - m_thread = std::thread(std::mem_fun(&NetPlayServer::ThreadFunc), this); + m_thread = std::thread(std::mem_fn(&NetPlayServer::ThreadFunc), this); m_target_buffer_size = 20; } } diff --git a/Source/Core/InputCommon/UDPWiimote.cpp b/Source/Core/InputCommon/UDPWiimote.cpp index 00023d66c3..e929e62461 100644 --- a/Source/Core/InputCommon/UDPWiimote.cpp +++ b/Source/Core/InputCommon/UDPWiimote.cpp @@ -146,7 +146,7 @@ UDPWiimote::UDPWiimote(const std::string& _port, const std::string& name, int _i initBroadcastIPv6(); std::lock_guard lk(d->termLock); - d->thread = std::thread(std::mem_fun(&UDPWiimote::mainThread), this); + d->thread = std::thread(std::mem_fn(&UDPWiimote::mainThread), this); return; }