Work around deprecation warning coming from boost/bind.hpp

alicevision · Aug 27, 2022 · e3cf526 · e3cf526
1 parent f85b946
commit e3cf526
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 0 deletions.
diff --git a/src/aliceVision/localization/LocalizationResult.cpp b/src/aliceVision/localization/LocalizationResult.cpp
@@ -8,6 +8,10 @@
 #include <aliceVision/sfmDataIO/jsonIO.hpp>
 
 #include <boost/property_tree/ptree.hpp>
+
+// Avoids deprecation warning caused by internals of json_parser. This is properly fixed in
+// Boost 1.76.0: https://github.com/boostorg/property_tree/commit/d1c8825a45a0717e1ad79583d3283b0e5e32831e
+#define BOOST_BIND_GLOBAL_PLACEHOLDERS 1
 #include <boost/property_tree/json_parser.hpp>
 
 #include <limits>

diff --git a/src/aliceVision/sfm/pipeline/sequential/ReconstructionEngine_sequentialSfM.cpp b/src/aliceVision/sfm/pipeline/sequential/ReconstructionEngine_sequentialSfM.cpp
@@ -35,6 +35,10 @@
 #include <boost/progress.hpp>
 #include <boost/format.hpp>
 #include <boost/functional/hash.hpp>
+
+// Avoids deprecation warning caused by internals of json_parser. This is properly fixed in
+// Boost 1.76.0: https://github.com/boostorg/property_tree/commit/d1c8825a45a0717e1ad79583d3283b0e5e32831e
+#define BOOST_BIND_GLOBAL_PLACEHOLDERS 1
 #include <boost/property_tree/json_parser.hpp>
 
 #include <tuple>

diff --git a/src/aliceVision/sfmDataIO/jsonIO.cpp b/src/aliceVision/sfmDataIO/jsonIO.cpp
@@ -8,6 +8,9 @@
 #include <aliceVision/camera/camera.hpp>
 #include <aliceVision/sfmDataIO/viewIO.hpp>
 
+// Avoids deprecation warning caused by internals of json_parser. This is properly fixed in
+// Boost 1.76.0: https://github.com/boostorg/property_tree/commit/d1c8825a45a0717e1ad79583d3283b0e5e32831e
+#define BOOST_BIND_GLOBAL_PLACEHOLDERS 1
 #include <boost/property_tree/json_parser.hpp>
 
 #include <memory>

diff --git a/src/software/convert/main_importKnownPoses.cpp b/src/software/convert/main_importKnownPoses.cpp
@@ -25,6 +25,10 @@
 
 #include <boost/property_tree/ptree.hpp>
 #include <boost/property_tree/xml_parser.hpp>
+
+// Avoids deprecation warning caused by internals of json_parser. This is properly fixed in
+// Boost 1.76.0: https://github.com/boostorg/property_tree/commit/d1c8825a45a0717e1ad79583d3283b0e5e32831e
+#define BOOST_BIND_GLOBAL_PLACEHOLDERS 1
 #include <boost/property_tree/json_parser.hpp>
 
 

diff --git a/src/software/pipeline/main_panoramaCompositing.cpp b/src/software/pipeline/main_panoramaCompositing.cpp
@@ -30,6 +30,10 @@
 #include <fstream>
 #include <algorithm>
 #include <boost/property_tree/ptree.hpp>
+
+// Avoids deprecation warning caused by internals of json_parser. This is properly fixed in
+// Boost 1.76.0: https://github.com/boostorg/property_tree/commit/d1c8825a45a0717e1ad79583d3283b0e5e32831e
+#define BOOST_BIND_GLOBAL_PLACEHOLDERS 1
 #include <boost/property_tree/json_parser.hpp>
 #include <boost/filesystem.hpp>
 

diff --git a/src/software/pipeline/main_panoramaMerging.cpp b/src/software/pipeline/main_panoramaMerging.cpp
@@ -25,6 +25,10 @@
 #include <fstream>
 #include <algorithm>
 #include <boost/property_tree/ptree.hpp>
+
+// Avoids deprecation warning caused by internals of json_parser. This is properly fixed in
+// Boost 1.76.0: https://github.com/boostorg/property_tree/commit/d1c8825a45a0717e1ad79583d3283b0e5e32831e
+#define BOOST_BIND_GLOBAL_PLACEHOLDERS 1
 #include <boost/property_tree/json_parser.hpp>
 #include <boost/filesystem.hpp>
 

diff --git a/src/software/pipeline/main_panoramaSeams.cpp b/src/software/pipeline/main_panoramaSeams.cpp
@@ -28,6 +28,10 @@
 #include <fstream>
 #include <algorithm>
 #include <boost/property_tree/ptree.hpp>
+
+// Avoids deprecation warning caused by internals of json_parser. This is properly fixed in
+// Boost 1.76.0: https://github.com/boostorg/property_tree/commit/d1c8825a45a0717e1ad79583d3283b0e5e32831e
+#define BOOST_BIND_GLOBAL_PLACEHOLDERS 1
 #include <boost/property_tree/json_parser.hpp>
 #include <boost/filesystem.hpp>
 

diff --git a/src/software/utils/main_colorCheckerCorrection.cpp b/src/software/utils/main_colorCheckerCorrection.cpp
@@ -18,6 +18,10 @@
 #include <boost/filesystem.hpp>
 #include <boost/program_options.hpp>
 #include <boost/property_tree/ptree.hpp>
+
+// Avoids deprecation warning caused by internals of json_parser. This is properly fixed in
+// Boost 1.76.0: https://github.com/boostorg/property_tree/commit/d1c8825a45a0717e1ad79583d3283b0e5e32831e
+#define BOOST_BIND_GLOBAL_PLACEHOLDERS 1
 #include <boost/property_tree/json_parser.hpp>
 
 #include <opencv2/core.hpp>

diff --git a/src/software/utils/main_colorCheckerDetection.cpp b/src/software/utils/main_colorCheckerDetection.cpp
@@ -19,6 +19,10 @@
 #include <boost/filesystem.hpp>
 #include <boost/program_options.hpp>
 #include <boost/property_tree/ptree.hpp>
+
+// Avoids deprecation warning caused by internals of json_parser. This is properly fixed in
+// Boost 1.76.0: https://github.com/boostorg/property_tree/commit/d1c8825a45a0717e1ad79583d3283b0e5e32831e
+#define BOOST_BIND_GLOBAL_PLACEHOLDERS 1
 #include <boost/property_tree/json_parser.hpp>
 
 #include <opencv2/core.hpp>