Merge pull request #238 from lioncash/fix-deprecations

Replace use of the deprecated mem_fun function with mem_fn.
This commit is contained in:
Pierre Bourdon 2014-04-01 23:59:20 +02:00
commit 2aac3f14b5
10 changed files with 11 additions and 11 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -88,7 +88,7 @@ bool GeckoSockServer::GetAvailableSock(sf::SocketTCP &sock_to_fill)
recv_fifo = std::deque<u8>();
send_fifo = std::deque<u8>();
}
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;

View File

@ -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()

View File

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

View File

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

View File

@ -146,7 +146,7 @@ UDPWiimote::UDPWiimote(const std::string& _port, const std::string& name, int _i
initBroadcastIPv6();
std::lock_guard<std::mutex> lk(d->termLock);
d->thread = std::thread(std::mem_fun(&UDPWiimote::mainThread), this);
d->thread = std::thread(std::mem_fn(&UDPWiimote::mainThread), this);
return;
}