From aeb43bc8fcf3ac107a6896ae4545dcb070340bb2 Mon Sep 17 00:00:00 2001
From: Frank Dellaert <dellaert@gmail.com>
Date: Sun, 16 Sep 2012 18:07:50 +0000
Subject: [PATCH] Used technique described in
 http://gcc.gnu.org/onlinedocs/gcc/Diagnostic-Pragmas.html to turn off
 excessive warnings generated by boost lambda headers

---
 gtsam/base/numericalDerivative.h     | 3 +++
 gtsam/inference/IndexConditional.cpp | 3 +++
 gtsam/linear/GaussianConditional.cpp | 2 +-
 gtsam/linear/HessianFactor.cpp       | 3 +++
 gtsam/linear/JacobianFactor.cpp      | 5 +++--
 gtsam/nonlinear/Symbol.cpp           | 5 ++++-
 gtsam/nonlinear/Values.cpp           | 3 +++
 gtsam/nonlinear/Values.h             | 3 +++
 tests/testDoglegOptimizer.cpp        | 3 +++
 wrap/Module.cpp                      | 3 +++
 10 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/gtsam/base/numericalDerivative.h b/gtsam/base/numericalDerivative.h
index d18db38be..86abf6067 100644
--- a/gtsam/base/numericalDerivative.h
+++ b/gtsam/base/numericalDerivative.h
@@ -20,7 +20,10 @@
 #pragma once
 
 #include <boost/function.hpp>
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-variable"
 #include <boost/bind.hpp>
+#pragma GCC diagnostic pop
 
 #include <gtsam/base/LieVector.h>
 #include <gtsam/base/Matrix.h>
diff --git a/gtsam/inference/IndexConditional.cpp b/gtsam/inference/IndexConditional.cpp
index 9830782f3..0c0c6c938 100644
--- a/gtsam/inference/IndexConditional.cpp
+++ b/gtsam/inference/IndexConditional.cpp
@@ -17,7 +17,10 @@
 
 #include <gtsam/base/FastSet.h>
 #include <gtsam/inference/IndexConditional.h>
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-variable"
 #include <boost/lambda/lambda.hpp>
+#pragma GCC diagnostic pop
 
 namespace gtsam {
 
diff --git a/gtsam/linear/GaussianConditional.cpp b/gtsam/linear/GaussianConditional.cpp
index ba9628862..8557e3a6c 100644
--- a/gtsam/linear/GaussianConditional.cpp
+++ b/gtsam/linear/GaussianConditional.cpp
@@ -20,8 +20,8 @@
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-variable"
 #include <boost/lambda/lambda.hpp>
-#pragma GCC diagnostic pop
 #include <boost/lambda/bind.hpp>
+#pragma GCC diagnostic pop
 
 #include <gtsam/linear/linearExceptions.h>
 #include <gtsam/linear/GaussianConditional.h>
diff --git a/gtsam/linear/HessianFactor.cpp b/gtsam/linear/HessianFactor.cpp
index e152738fb..183f5fa54 100644
--- a/gtsam/linear/HessianFactor.cpp
+++ b/gtsam/linear/HessianFactor.cpp
@@ -21,7 +21,10 @@
 #include <boost/format.hpp>
 #include <boost/make_shared.hpp>
 #include <boost/tuple/tuple.hpp>
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-variable"
 #include <boost/bind.hpp>
+#pragma GCC diagnostic pop
 
 #include <gtsam/base/debug.h>
 #include <gtsam/base/timing.h>
diff --git a/gtsam/linear/JacobianFactor.cpp b/gtsam/linear/JacobianFactor.cpp
index 759be4948..02da6b079 100644
--- a/gtsam/linear/JacobianFactor.cpp
+++ b/gtsam/linear/JacobianFactor.cpp
@@ -30,9 +30,10 @@
 #include <boost/foreach.hpp>
 #include <boost/format.hpp>
 #include <boost/make_shared.hpp>
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-variable"
 #include <boost/bind.hpp>
-//#include <boost/lambda/bind.hpp>
-//#include <boost/lambda/lambda.hpp>
+#pragma GCC diagnostic pop
 
 #include <cmath>
 #include <sstream>
diff --git a/gtsam/nonlinear/Symbol.cpp b/gtsam/nonlinear/Symbol.cpp
index 19cf78eb5..41fafd3eb 100644
--- a/gtsam/nonlinear/Symbol.cpp
+++ b/gtsam/nonlinear/Symbol.cpp
@@ -21,9 +21,12 @@
 #include <boost/mpl/char.hpp>
 #include <boost/format.hpp>
 #include <boost/function.hpp>
-#include <boost/lambda/bind.hpp>
 #include <boost/lambda/construct.hpp>
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-variable"
+#include <boost/lambda/bind.hpp>
 #include <boost/lambda/lambda.hpp>
+#pragma GCC diagnostic pop
 
 #include <limits.h>
 #include <list>
diff --git a/gtsam/nonlinear/Values.cpp b/gtsam/nonlinear/Values.cpp
index eab37ff17..4e22a4662 100644
--- a/gtsam/nonlinear/Values.cpp
+++ b/gtsam/nonlinear/Values.cpp
@@ -27,7 +27,10 @@
 #include <list>
 
 #include <boost/foreach.hpp>
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-variable"
 #include <boost/bind.hpp>
+#pragma GCC diagnostic pop
 #include <boost/iterator/transform_iterator.hpp>
 
 using namespace std;
diff --git a/gtsam/nonlinear/Values.h b/gtsam/nonlinear/Values.h
index 25bd3dc2e..82e5d8c2d 100644
--- a/gtsam/nonlinear/Values.h
+++ b/gtsam/nonlinear/Values.h
@@ -35,7 +35,10 @@
 #include <boost/iterator/transform_iterator.hpp>
 #include <boost/iterator/filter_iterator.hpp>
 #include <boost/function.hpp>
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-variable"
 #include <boost/bind.hpp>
+#pragma GCC diagnostic pop
 #include <boost/ptr_container/serialize_ptr_map.hpp>
 #include <boost/iterator_adaptors.hpp>
 
diff --git a/tests/testDoglegOptimizer.cpp b/tests/testDoglegOptimizer.cpp
index 6b03b572b..e87835b67 100644
--- a/tests/testDoglegOptimizer.cpp
+++ b/tests/testDoglegOptimizer.cpp
@@ -26,7 +26,10 @@
 
 #include <CppUnitLite/TestHarness.h>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-variable"
 #include <boost/bind.hpp>
+#pragma GCC diagnostic pop
 #include <boost/assign/list_of.hpp> // for 'list_of()'
 #include <functional>
 
diff --git a/wrap/Module.cpp b/wrap/Module.cpp
index aad533a9a..60147e23d 100644
--- a/wrap/Module.cpp
+++ b/wrap/Module.cpp
@@ -27,8 +27,11 @@
 #include <boost/spirit/include/classic_confix.hpp> 
 #include <boost/spirit/include/classic_clear_actor.hpp> 
 #include <boost/spirit/include/classic_insert_at_actor.hpp> 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-variable"
 #include <boost/lambda/bind.hpp> 
 #include <boost/lambda/lambda.hpp> 
+#pragma GCC diagnostic pop
 #include <boost/lambda/construct.hpp> 
 #include <boost/foreach.hpp> 
 #include <boost/filesystem.hpp>