update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / json_spirit / json_spirit_reader_template.h

diff --git a/ceph/src/json_spirit/json_spirit_reader_template.h b/ceph/src/json_spirit/json_spirit_reader_template.h
index 2d0b3a440e61714daeb60f476697833446af5fbb..a5790b9b5e1df916e148d34bcc2a5ca878bb8e8c 100644 (file)
--- a/ceph/src/json_spirit/json_spirit_reader_template.h
+++ b/ceph/src/json_spirit/json_spirit_reader_template.h
@@ -17,30 +17,21 @@
 \r
 #define BOOST_SPIRIT_THREADSAFE  // uncomment for multithreaded use, requires linking to boost.thread\r
 \r
-#include <boost/bind.hpp>\r
+#include <boost/bind/bind.hpp>\r
 #include <boost/function.hpp>\r
 #include <boost/version.hpp>\r
-\r
-#if BOOST_VERSION >= 103800\r
-    #include <boost/spirit/include/classic_core.hpp>\r
-    #include <boost/spirit/include/classic_confix.hpp>\r
-    #include <boost/spirit/include/classic_escape_char.hpp>\r
-    #include <boost/spirit/include/classic_multi_pass.hpp>\r
-    #include <boost/spirit/include/classic_position_iterator.hpp>\r
-    #define spirit_namespace boost::spirit::classic\r
-#else\r
-    #include <boost/spirit/core.hpp>\r
-    #include <boost/spirit/utility/confix.hpp>\r
-    #include <boost/spirit/utility/escape_char.hpp>\r
-    #include <boost/spirit/iterator/multi_pass.hpp>\r
-    #include <boost/spirit/iterator/position_iterator.hpp>\r
-    #define spirit_namespace boost::spirit\r
-#endif\r
+#include <boost/spirit/include/classic_core.hpp>\r
+#include <boost/spirit/include/classic_confix.hpp>\r
+#include <boost/spirit/include/classic_escape_char.hpp>\r
+#include <boost/spirit/include/classic_multi_pass.hpp>\r
+#include <boost/spirit/include/classic_position_iterator.hpp>\r
 \r
 #include "include/ceph_assert.h"\r
 \r
 namespace json_spirit\r
 {\r
+    namespace spirit_namespace = boost::spirit::classic;\r
+\r
     const spirit_namespace::int_parser < boost::int64_t >  int64_p  = spirit_namespace::int_parser < boost::int64_t  >();\r
     const spirit_namespace::uint_parser< boost::uint64_t > uint64_p = spirit_namespace::uint_parser< boost::uint64_t >();\r
 \r
@@ -211,6 +202,8 @@ namespace json_spirit
         return get_str( tmp.begin(), tmp.end() );\r
     }\r
 \r
+    using namespace boost::placeholders;\r
+\r
     // this class's methods get called by the spirit parse resulting\r
     // in the creation of a JSON object or array\r
     //\r