Skip to content

Commit d322e53

Browse files
committed
Remove usage of std::bind
It is deprecated after C++11.
1 parent 1497106 commit d322e53

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

include/internal/libfreenect2/threading.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
#include <mutex>
3838
#include <condition_variable>
3939
#include <chrono>
40-
#include <functional>
4140

4241
#define WAIT_CONDITION(var, mutex, lock) var.wait(lock);
4342

src/frame_listener_impl.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ bool SyncMultiFrameListener::waitForNewFrame(FrameMap &frame, int milliseconds)
109109
#ifdef LIBFREENECT2_THREADING_STDLIB
110110
libfreenect2::unique_lock l(impl_->mutex_);
111111

112-
auto predicate = std::bind(&SyncMultiFrameListenerImpl::hasNewFrame, impl_);
112+
auto predicate = [this]{ return impl_->hasNewFrame(); };
113113

114114
if(impl_->condition_.wait_for(l, std::chrono::milliseconds(milliseconds), predicate))
115115
{

src/logging.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
#ifdef LIBFREENECT2_WITH_PROFILING
3636
#include <vector>
3737
#include <numeric>
38-
#include <functional>
3938
#include <cmath>
4039
#endif
4140

@@ -276,7 +275,10 @@ class WithPerfLoggingImpl: public Timer
276275
size_t n = v.size();
277276
double mean = sum / n;
278277
std::vector<double> diff(n);
279-
std::transform(v.begin(), v.end(), diff.begin(), std::bind2nd(std::minus<double>(), mean));
278+
for (size_t i = 0; i < n; ++i)
279+
{
280+
diff[i] = v[i] - mean;
281+
}
280282
double sqsum = std::inner_product(diff.begin(), diff.end(), diff.begin(), 0.0);
281283
double std = std::sqrt(sqsum / (n-1));
282284

0 commit comments

Comments
 (0)