Boost.MSMでメニュー部分を実装

[shooting3/shootinggame.git] / ShootingGame / SoundDriver.cpp

diff --git a/ShootingGame/SoundDriver.cpp b/ShootingGame/SoundDriver.cpp
index a31b028..12a23c6 100644 (file)
--- a/ShootingGame/SoundDriver.cpp
+++ b/ShootingGame/SoundDriver.cpp
@@ -10,7 +10,7 @@ using namespace Concurrency;
 using namespace Platform;
 #pragma comment(lib, "mmdevapi.lib")
 
-using namespace std::placeholders;
+namespace stps = std::placeholders;
 using namespace Microsoft::WRL;
 
 namespace {
@@ -107,7 +107,7 @@ namespace sf {
     //    : public RuntimeClass< RuntimeClassFlags< ClassicCom >, FtmBase, IActivateAudioInterfaceCompletionHandler > 
   {
 
-    impl() : bufferIndex_(0),eventHolder_(nullptr),processBuffer_(std::bind(&SoundDriver::impl::DefaultProcessBuffer,this,_1,_2)),isStart_(false)
+    impl() : bufferIndex_(0),eventHolder_(nullptr),processBuffer_(std::bind(&SoundDriver::impl::DefaultProcessBuffer,this,stps::_1,stps::_2)),isStart_(false)
     {
       //::AvMMAvSetMmThreadCharacteristics
       String^ deviceID = MediaDevice::GetDefaultAudioRenderId(AudioDeviceRole::Default);
@@ -265,7 +265,7 @@ namespace sf {
     void ResetProcessBufferFunc()
     {
       Stop();
-      processBuffer_ = std::move(std::bind(&SoundDriver::impl::DefaultProcessBuffer,this,_1,_2));
+      processBuffer_ = std::move(std::bind(&SoundDriver::impl::DefaultProcessBuffer,this,stps::_1,stps::_2));
       Start();
     }