From ec1eec7bee837167b310bac226d50ea45598f4c5 Mon Sep 17 00:00:00 2001 From: Ian Heisters Date: Tue, 6 May 2014 10:09:28 -0700 Subject: [PATCH] Fix for VS 2013 --- src/Kinect.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Kinect.h b/src/Kinect.h index c3ac6cc..581dc36 100644 --- a/src/Kinect.h +++ b/src/Kinect.h @@ -190,7 +190,7 @@ class Kinect inline uint32_t addDepthCallback( T callback, Y *callbackObject ) { uint32_t id = mCallbacks.empty() ? 0 : mCallbacks.rbegin()->first + 1; - mCallbacks.insert( std::make_pair( id, CallbackRef( new Callback( mSignalDepth.connect( std::bind( callback, callbackObject, std::_1, std::_2 ) ) ) ) ) ); + mCallbacks.insert(std::make_pair(id, CallbackRef(new Callback(mSignalDepth.connect(std::bind(callback, callbackObject, std::placeholders::_1, std::placeholders::_2)))))); return id; } //! Adds skeleton tracking callback. @@ -198,7 +198,7 @@ class Kinect inline uint32_t addSkeletonTrackingCallback( T callback, Y *callbackObject ) { uint32_t id = mCallbacks.empty() ? 0 : mCallbacks.rbegin()->first + 1; - mCallbacks.insert( std::make_pair( id, CallbackRef( new Callback( mSignalSkeleton.connect( std::bind( callback, callbackObject, std::_1, std::_2 ) ) ) ) ) ); + mCallbacks.insert(std::make_pair(id, CallbackRef(new Callback(mSignalSkeleton.connect(std::bind(callback, callbackObject, std::placeholders::_1, std::placeholders::_2)))))); return id; } //! Adds video tracking callback. @@ -206,7 +206,7 @@ class Kinect inline uint32_t addColorCallback( T callback, Y *callbackObject ) { uint32_t id = mCallbacks.empty() ? 0 : mCallbacks.rbegin()->first + 1; - mCallbacks.insert( std::make_pair( id, CallbackRef( new Callback( mSignalColor.connect( std::bind( callback, callbackObject, std::_1, std::_2 ) ) ) ) ) ); + mCallbacks.insert(std::make_pair(id, CallbackRef(new Callback(mSignalColor.connect(std::bind(callback, callbackObject, std::placeholders::_1, std::placeholders::_2)))))); return id; } //! Removes callback.