Remove usage of std::bind

It is deprecated after C++11.
o-kotb · Dec 12, 2017 · d322e53 · d322e53
1 parent 1497106
commit d322e53
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/include/internal/libfreenect2/threading.h b/include/internal/libfreenect2/threading.h
@@ -37,7 +37,6 @@
 #include <mutex>
 #include <condition_variable>
 #include <chrono>
-#include <functional>
 
 #define WAIT_CONDITION(var, mutex, lock) var.wait(lock);
 

diff --git a/src/frame_listener_impl.cpp b/src/frame_listener_impl.cpp
@@ -109,7 +109,7 @@ bool SyncMultiFrameListener::waitForNewFrame(FrameMap &frame, int milliseconds)
 #ifdef LIBFREENECT2_THREADING_STDLIB
   libfreenect2::unique_lock l(impl_->mutex_);
 
-  auto predicate = std::bind(&SyncMultiFrameListenerImpl::hasNewFrame, impl_);
+  auto predicate = [this]{ return impl_->hasNewFrame(); };
 
   if(impl_->condition_.wait_for(l, std::chrono::milliseconds(milliseconds), predicate))
   {

diff --git a/src/logging.cpp b/src/logging.cpp
@@ -35,7 +35,6 @@
 #ifdef LIBFREENECT2_WITH_PROFILING
 #include <vector>
 #include <numeric>
-#include <functional>
 #include <cmath>
 #endif
 
@@ -276,7 +275,10 @@ class WithPerfLoggingImpl: public Timer
     size_t n = v.size();
     double mean = sum / n;
     std::vector<double> diff(n);
-    std::transform(v.begin(), v.end(), diff.begin(), std::bind2nd(std::minus<double>(), mean));
+    for (size_t i = 0; i < n; ++i)
+    {
+      diff[i] = v[i] - mean;
+    }
     double sqsum = std::inner_product(diff.begin(), diff.end(), diff.begin(), 0.0);
     double std = std::sqrt(sqsum / (n-1));