Skip to content

Commit

Permalink
Revert "mem_fun -> mem_fn."
Browse files Browse the repository at this point in the history
This reverts commit b7d32b0.

OSX C++ std library in charge of holding back progress (as usual).
  • Loading branch information
lioncash committed Jan 24, 2013
1 parent b7d32b0 commit fe7e691
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 11 deletions.
2 changes: 1 addition & 1 deletion Source/Core/AudioCommon/Src/AOSoundStream.cpp
Expand Up @@ -63,7 +63,7 @@ bool AOSound::Start()
{ {
memset(realtimeBuffer, 0, sizeof(realtimeBuffer)); memset(realtimeBuffer, 0, sizeof(realtimeBuffer));


thread = std::thread(std::mem_fn(&AOSound::SoundLoop), this); thread = std::thread(std::mem_fun(&AOSound::SoundLoop), this);
return true; return true;
} }


Expand Down
2 changes: 1 addition & 1 deletion Source/Core/AudioCommon/Src/DSoundStream.cpp
Expand Up @@ -135,7 +135,7 @@ bool DSound::Start()
dsBuffer->Lock(0, bufferSize, (void* *)&p1, &num1, 0, 0, DSBLOCK_ENTIREBUFFER); dsBuffer->Lock(0, bufferSize, (void* *)&p1, &num1, 0, 0, DSBLOCK_ENTIREBUFFER);
memset(p1, 0, num1); memset(p1, 0, num1);
dsBuffer->Unlock(p1, num1, 0, 0); dsBuffer->Unlock(p1, num1, 0, 0);
thread = std::thread(std::mem_fn(&DSound::SoundLoop), this); thread = std::thread(std::mem_fun(&DSound::SoundLoop), this);
return true; return true;
} }


Expand Down
6 changes: 2 additions & 4 deletions Source/Core/AudioCommon/Src/OpenALStream.cpp
Expand Up @@ -15,8 +15,6 @@
// Official SVN repository and contact information can be found at // Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/ // http://code.google.com/p/dolphin-emu/


#include <functional>

#include "aldlist.h" #include "aldlist.h"
#include "OpenALStream.h" #include "OpenALStream.h"
#include "DPL2Decoder.h" #include "DPL2Decoder.h"
Expand Down Expand Up @@ -54,7 +52,7 @@ bool OpenALStream::Start()
//period_size_in_millisec = 1000 / refresh; //period_size_in_millisec = 1000 / refresh;


alcMakeContextCurrent(pContext); alcMakeContextCurrent(pContext);
thread = std::thread(std::mem_fn(&OpenALStream::SoundLoop), this); thread = std::thread(std::mem_fun(&OpenALStream::SoundLoop), this);
bReturn = true; bReturn = true;
} }
else else
Expand All @@ -74,7 +72,7 @@ bool OpenALStream::Start()
PanicAlertT("OpenAL: can't find sound devices"); PanicAlertT("OpenAL: can't find sound devices");
} }


// Initialize DPL2 parameters // Initialise DPL2 parameters
dpl2reset(); dpl2reset();


soundTouch.clear(); soundTouch.clear();
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/Core/Src/HW/EXI_DeviceGecko.cpp
Expand Up @@ -101,7 +101,7 @@ bool GeckoSockServer::GetAvailableSock(sf::SocketTCP &sock_to_fill)
recv_fifo = std::queue<u8>(); recv_fifo = std::queue<u8>();
send_fifo = std::queue<u8>(); send_fifo = std::queue<u8>();
} }
clientThread = std::thread(std::mem_fn(&GeckoSockServer::ClientThread), this); clientThread = std::thread(std::mem_fun(&GeckoSockServer::ClientThread), this);
client_count++; client_count++;
waiting_socks.pop(); waiting_socks.pop();
sock_filled = true; sock_filled = true;
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp
Expand Up @@ -264,7 +264,7 @@ bool Wiimote::Connect()
// Set LEDs // Set LEDs
SetLEDs(WIIMOTE_LED_1 << index); SetLEDs(WIIMOTE_LED_1 << index);


m_wiimote_thread = std::thread(std::mem_fn(&Wiimote::ThreadFunc), this); m_wiimote_thread = std::thread(std::mem_fun(&Wiimote::ThreadFunc), this);


// This isn't as drastic as it sounds, since the process in which the threads // This isn't as drastic as it sounds, since the process in which the threads
// reside is normal priority. Needed for keeping audio reports at a decent rate // reside is normal priority. Needed for keeping audio reports at a decent rate
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/Core/Src/NetPlayClient.cpp
Expand Up @@ -70,7 +70,7 @@ NetPlayClient::NetPlayClient(const std::string& address, const u16 port, NetPlay
is_connected = true; is_connected = true;


m_selector.Add(m_socket); m_selector.Add(m_socket);
m_thread = std::thread(std::mem_fn(&NetPlayClient::ThreadFunc), this); m_thread = std::thread(std::mem_fun(&NetPlayClient::ThreadFunc), this);
} }
} }
else else
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/Core/Src/NetPlayServer.cpp
Expand Up @@ -38,7 +38,7 @@ NetPlayServer::NetPlayServer(const u16 port, const std::string& name, NetPlayUI*
is_connected = true; is_connected = true;


m_selector.Add(m_socket); m_selector.Add(m_socket);
m_thread = std::thread(std::mem_fn(&NetPlayServer::ThreadFunc), this); m_thread = std::thread(std::mem_fun(&NetPlayServer::ThreadFunc), this);
} }
else else
is_connected = false; is_connected = false;
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/InputCommon/Src/UDPWiimote.cpp
Expand Up @@ -134,7 +134,7 @@ UDPWiimote::UDPWiimote(const char *_port, const char * name, int _index) :
initBroadcastIPv6(); initBroadcastIPv6();


std::lock_guard<std::mutex> lk(d->termLock); std::lock_guard<std::mutex> lk(d->termLock);
d->thread = std::thread(std::mem_fn(&UDPWiimote::mainThread), this); d->thread = std::thread(std::mem_fun(&UDPWiimote::mainThread), this);


return; return;
} }
Expand Down

0 comments on commit fe7e691

Please sign in to comment.