Skip to content

Fix for VS 2013 #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
heisters wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix for VS 2013 #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/Kinect.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,23 +190,23 @@ 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.
template<typename T, typename Y>
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.
template<typename T, typename Y>
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.
Expand Down