update boost::bind usage

gtsam/geometry/tests/testCalibratedCamera.cpp

@@ -20,10 +20,12 @@
 #include <gtsam/base/Testable.h>
 #include <gtsam/base/numericalDerivative.h>
 
+#include <boost/bind/bind.hpp>
 #include <CppUnitLite/TestHarness.h>
 
 #include <iostream>
 
+using namespace boost::placeholders;
 using namespace std;
 using namespace gtsam;
 

gtsam/geometry/tests/testCameraSet.cpp

@@ -20,7 +20,6 @@
 #include <gtsam/geometry/Pose3.h>
 #include <gtsam/base/numericalDerivative.h>
 #include <CppUnitLite/TestHarness.h>
-#include <boost/bind.hpp>
 
 using namespace std;
 using namespace gtsam;

gtsam/geometry/tests/testEssentialMatrix.cpp

@@ -9,9 +9,12 @@
 #include <gtsam/geometry/CalibratedCamera.h>
 #include <gtsam/base/numericalDerivative.h>
 #include <gtsam/base/Testable.h>
+
+#include <boost/bind/bind.hpp>
 #include <CppUnitLite/TestHarness.h>
 #include <sstream>
 
+using namespace boost::placeholders;
 using namespace std;
 using namespace gtsam;
 

gtsam/geometry/tests/testOrientedPlane3.cpp

@@ -21,8 +21,10 @@
 #include <gtsam/base/numericalDerivative.h>
 #include <CppUnitLite/TestHarness.h>
 #include <boost/assign/std/vector.hpp>
+#include <boost/bind/bind.hpp>
 
 using namespace boost::assign;
+using namespace boost::placeholders;
 using namespace gtsam;
 using namespace std;
 using boost::none;

gtsam/geometry/tests/testPinholeCamera.cpp

@@ -22,11 +22,13 @@
 #include <gtsam/base/Testable.h>
 #include <gtsam/base/numericalDerivative.h>
 
+#include <boost/bind/bind.hpp>
 #include <CppUnitLite/TestHarness.h>
 
 #include <cmath>
 #include <iostream>
 
+using namespace boost::placeholders;
 using namespace std;
 using namespace gtsam;
 

gtsam/geometry/tests/testPinholeSet.cpp

@@ -20,7 +20,6 @@
 #include <gtsam/geometry/Pose3.h>
 #include <gtsam/base/numericalDerivative.h>
 #include <CppUnitLite/TestHarness.h>
-#include <boost/bind.hpp>
 
 using namespace std;
 using namespace gtsam;

gtsam/geometry/tests/testPoint3.cpp

@@ -17,8 +17,11 @@
 #include <gtsam/geometry/Point3.h>
 #include <gtsam/base/Testable.h>
 #include <gtsam/base/numericalDerivative.h>
+
+#include <boost/bind/bind.hpp>
 #include <CppUnitLite/TestHarness.h>
 
+using namespace boost::placeholders;
 using namespace gtsam;
 
 GTSAM_CONCEPT_TESTABLE_INST(Point3)

gtsam/geometry/tests/testPose3.cpp

@@ -22,6 +22,8 @@
 
 #include <boost/assign/std/vector.hpp> // for operator +=
 using namespace boost::assign;
+#include <boost/bind/bind.hpp>
+using namespace boost::placeholders;
 
 #include <CppUnitLite/TestHarness.h>
 #include <cmath>

gtsam/geometry/tests/testSO3.cpp

@@ -20,8 +20,10 @@
 #include <gtsam/base/Testable.h>
 #include <gtsam/base/testLie.h>
 
+#include <boost/bind/bind.hpp>
 #include <CppUnitLite/TestHarness.h>
 
+using namespace boost::placeholders;
 using namespace std;
 using namespace gtsam;
 

gtsam/geometry/tests/testSimilarity3.cpp

@@ -30,9 +30,10 @@
 
 #include <CppUnitLite/TestHarness.h>
 
+#include <boost/bind/bind.hpp>
 #include <boost/function.hpp>
-#include <boost/bind.hpp>
 
+using namespace boost::placeholders;
 using namespace gtsam;
 using namespace std;
 using symbol_shorthand::X;

gtsam/geometry/tests/testUnit3.cpp

@@ -31,13 +31,14 @@
 
 #include <CppUnitLite/TestHarness.h>
 
-#include <boost/bind.hpp>
 #include <boost/assign/std/vector.hpp>
+#include <boost/bind/bind.hpp>
 
 #include <cmath>
 #include <random>
 
 using namespace boost::assign;
+using namespace boost::placeholders;
 using namespace gtsam;
 using namespace std;
 using gtsam::symbol_shorthand::U;

gtsam/inference/EliminationTree-inst.h

@@ -18,7 +18,6 @@
 #pragma once
 
 #include <boost/make_shared.hpp>
-#include <boost/bind.hpp>
 #include <stack>
 
 #include <gtsam/base/timing.h>

gtsam/inference/FactorGraph-inst.h

@@ -23,8 +23,6 @@
 
 #include <gtsam/inference/FactorGraph.h>
 
-#include <boost/bind.hpp>
-
 #include <stdio.h>
 #include <algorithm>
 #include <iostream>  // for cout :-(

gtsam/inference/FactorGraph.h

@@ -29,7 +29,6 @@
 #include <Eigen/Core>  // for Eigen::aligned_allocator
 
 #include <boost/assign/list_inserter.hpp>
-#include <boost/bind.hpp>
 #include <boost/make_shared.hpp>
 #include <boost/serialization/nvp.hpp>
 #include <boost/serialization/vector.hpp>

gtsam/inference/LabeledSymbol.cpp

@@ -17,8 +17,8 @@
 
 #include <iostream>
 
+#include <boost/bind/bind.hpp>
 #include <boost/format.hpp>
-#include <boost/bind.hpp>
 
 #include <boost/lexical_cast.hpp>
 
@@ -110,16 +110,16 @@ bool LabeledSymbol::operator!=(gtsam::Key comp) const {
 static LabeledSymbol make(gtsam::Key key) { return LabeledSymbol(key);}
 
 boost::function<bool(gtsam::Key)> LabeledSymbol::TypeTest(unsigned char c) {
-  return boost::bind(&LabeledSymbol::chr, boost::bind(make, _1)) == c;
+  return boost::bind(&LabeledSymbol::chr, boost::bind(make, boost::placeholders::_1)) == c;
 }
 
 boost::function<bool(gtsam::Key)> LabeledSymbol::LabelTest(unsigned char label) {
-  return boost::bind(&LabeledSymbol::label, boost::bind(make, _1)) == label;
+  return boost::bind(&LabeledSymbol::label, boost::bind(make, boost::placeholders::_1)) == label;
 }
 
 boost::function<bool(gtsam::Key)> LabeledSymbol::TypeLabelTest(unsigned char c, unsigned char label) {
-  return boost::bind(&LabeledSymbol::chr,   boost::bind(make, _1)) == c &&
-      boost::bind(&LabeledSymbol::label, boost::bind(make, _1)) == label;
+  return boost::bind(&LabeledSymbol::chr,   boost::bind(make, boost::placeholders::_1)) == c &&
+      boost::bind(&LabeledSymbol::label, boost::bind(make, boost::placeholders::_1)) == label;
 }
 
 /* ************************************************************************* */

gtsam/inference/Symbol.cpp

@@ -18,8 +18,8 @@
 
 #include <gtsam/inference/Symbol.h>
 
+#include <boost/bind/bind.hpp>
 #include <boost/format.hpp>
-#include <boost/bind.hpp>
 
 #include <limits.h>
 #include <list>
@@ -63,7 +63,7 @@ Symbol::operator std::string() const {
 static Symbol make(gtsam::Key key) { return Symbol(key);}
 
 boost::function<bool(Key)> Symbol::ChrTest(unsigned char c) {
-  return bind(&Symbol::chr, bind(make, _1)) == c;
+  return boost::bind(&Symbol::chr, boost::bind(make, boost::placeholders::_1)) == c;
 }
 
 GTSAM_EXPORT std::ostream &operator<<(std::ostream &os, const Symbol &symbol) {

gtsam/inference/inference-inst.h

@@ -20,7 +20,6 @@
 #pragma once
 
 #include <boost/shared_ptr.hpp>
-#include <boost/bind.hpp>
 #include <utility>
 
 #include <gtsam/base/treeTraversal-inst.h>

gtsam/linear/HessianFactor.cpp

@@ -32,14 +32,6 @@
 #include <boost/format.hpp>
 #include <boost/make_shared.hpp>
 #include <boost/tuple/tuple.hpp>
-#ifdef __GNUC__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wunused-variable"
-#endif
-#include <boost/bind.hpp>
-#ifdef __GNUC__
-#pragma GCC diagnostic pop
-#endif
 #include <boost/assign/list_of.hpp>
 #include <boost/range/adaptor/transformed.hpp>
 #include <boost/range/adaptor/map.hpp>

gtsam/linear/JacobianFactor.cpp

@@ -35,14 +35,6 @@
 #include <boost/format.hpp>
 #include <boost/make_shared.hpp>
 #include <boost/array.hpp>
-#ifdef __GNUC__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wunused-variable"
-#endif
-#include <boost/bind.hpp>
-#ifdef __GNUC__
-#pragma GCC diagnostic pop
-#endif
 #include <boost/range/algorithm/copy.hpp>
 #include <boost/range/adaptor/indirected.hpp>
 #include <boost/range/adaptor/map.hpp>

gtsam/linear/VectorValues.cpp

@@ -18,7 +18,7 @@
 
 #include <gtsam/linear/VectorValues.h>
 
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/range/combine.hpp>
 #include <boost/range/numeric.hpp>
 #include <boost/range/adaptor/transformed.hpp>
@@ -38,7 +38,8 @@ namespace gtsam {
   {
     // Merge using predicate for comparing first of pair
     merge(first.begin(), first.end(), second.begin(), second.end(), inserter(values_, values_.end()),
-      boost::bind(&less<Key>::operator(), less<Key>(), boost::bind(&KeyValuePair::first, _1), boost::bind(&KeyValuePair::first, _2)));
+      boost::bind(&less<Key>::operator(), less<Key>(), boost::bind(&KeyValuePair::first, boost::placeholders::_1),
+          boost::bind(&KeyValuePair::first, boost::placeholders::_2)));
     if(size() != first.size() + second.size())
       throw invalid_argument("Requested to merge two VectorValues that have one or more variables in common.");
   }

gtsam/linear/tests/testGaussianBayesNet.cpp

@@ -26,6 +26,8 @@
 #include <boost/assign/list_of.hpp>
 #include <boost/assign/std/list.hpp> // for operator +=
 using namespace boost::assign;
+#include <boost/bind/bind.hpp>
+using namespace boost::placeholders;
 
 // STL/C++
 #include <iostream>

gtsam/linear/tests/testGaussianBayesTree.cpp

@@ -22,6 +22,8 @@
 #include <boost/assign/std/list.hpp> // for operator +=
 #include <boost/assign/std/set.hpp> // for operator +=
 using namespace boost::assign;
+#include <boost/bind/bind.hpp>
+using namespace boost::placeholders;
 
 #include <gtsam/base/debug.h>
 #include <gtsam/base/numericalDerivative.h>

gtsam/navigation/tests/testAHRSFactor.cpp

@@ -25,9 +25,10 @@
 #include <gtsam/base/debug.h>
 #include <CppUnitLite/TestHarness.h>
 
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <list>
 
+using namespace boost::placeholders;
 using namespace std;
 using namespace gtsam;
 

gtsam/navigation/tests/testAttitudeFactor.cpp

@@ -21,8 +21,11 @@
 #include <gtsam/base/numericalDerivative.h>
 #include <gtsam/base/serialization.h>
 #include <gtsam/base/serializationTestHelpers.h>
+
+#include <boost/bind/bind.hpp>
 #include <CppUnitLite/TestHarness.h>
 
+using namespace boost::placeholders;
 using namespace std;
 using namespace gtsam;
 

gtsam/navigation/tests/testCombinedImuFactor.cpp

@@ -29,7 +29,6 @@
 
 #include <CppUnitLite/TestHarness.h>
 
-#include <boost/bind.hpp>
 #include <list>
 
 #include "imuFactorTesting.h"

gtsam/navigation/tests/testGPSFactor.cpp

@@ -20,11 +20,14 @@
 #include <gtsam/base/Testable.h>
 #include <gtsam/base/numericalDerivative.h>
 
+#include <boost/bind/bind.hpp>
+
 #include <CppUnitLite/TestHarness.h>
 
 #include <GeographicLib/Config.h>
 #include <GeographicLib/LocalCartesian.hpp>
 
+using namespace boost::placeholders;
 using namespace std;
 using namespace gtsam;
 using namespace GeographicLib;

gtsam/navigation/tests/testImuBias.cpp

@@ -19,8 +19,9 @@
 #include <gtsam/base/numericalDerivative.h>
 
 #include <CppUnitLite/TestHarness.h>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
+using namespace boost::placeholders;
 using namespace std;
 using namespace gtsam;