mem_fun -> mem_fn.

mem_fun is deprecated in C++11. Also it does everything mem_fun can do, but more conveniently.
This commit is contained in:
Lioncash
2013-01-23 23:29:50 -05:00
parent cff8fe8f77
commit b7d32b0a3d
8 changed files with 11 additions and 9 deletions

View File

@ -63,7 +63,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

@ -135,7 +135,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

@ -15,6 +15,8 @@
// Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/
#include <functional>
#include "aldlist.h"
#include "OpenALStream.h"
#include "DPL2Decoder.h"
@ -52,7 +54,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
@ -72,7 +74,7 @@ bool OpenALStream::Start()
PanicAlertT("OpenAL: can't find sound devices");
}
// Initialise DPL2 parameters
// Initialize DPL2 parameters
dpl2reset();
soundTouch.clear();