Merge pull request #735 from borglab/feature/std-keyformatter

KeyFormatter - boost::function to std::function
borglab · Apr 8, 2021 · 58cc7b8 · 58cc7b8
2 parents d2549c6 + 1d0c61b
commit 58cc7b8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/gtsam/inference/Key.h b/gtsam/inference/Key.h
@@ -25,14 +25,14 @@
 #include <gtsam/base/types.h>
 #include <gtsam/dllexport.h>
 
-#include <boost/function.hpp>
+#include <functional>
 
 #include <iosfwd>
 
 namespace gtsam {
 
 /// Typedef for a function to format a key, i.e. to convert it to a string
-typedef boost::function<std::string(Key)> KeyFormatter;
+typedef std::function<std::string(Key)> KeyFormatter;
 
 // Helper function for DefaultKeyFormatter
 GTSAM_EXPORT std::string _defaultKeyFormatter(Key key);

diff --git a/gtsam/inference/LabeledSymbol.h b/gtsam/inference/LabeledSymbol.h
@@ -20,6 +20,7 @@
 #pragma once
 
 #include <gtsam/inference/Symbol.h>
+#include <boost/function.hpp>
 
 namespace gtsam {
 

diff --git a/gtsam/inference/Symbol.h b/gtsam/inference/Symbol.h
@@ -21,6 +21,7 @@
 #include <gtsam/inference/Key.h>
 #include <gtsam/base/Testable.h>
 #include <boost/serialization/nvp.hpp>
+#include <boost/function.hpp>
 #include <cstdint>
 
 namespace gtsam {