update boost

linx64/include/boost/spirit/home/lex/qi/in_state.hpp

@@ -10,7 +10,7 @@
 #pragma once
 #endif
 
-#include <boost/proto/core.hpp>
+#include <boost/proto/traits.hpp>
 
 ///////////////////////////////////////////////////////////////////////////////
 namespace boost { namespace spirit { namespace qi

linx64/include/boost/spirit/home/lex/qi/plain_raw_token.hpp

@@ -19,14 +19,13 @@
 #include <boost/spirit/home/qi/parser.hpp>
 #include <boost/spirit/home/qi/meta_compiler.hpp>
 #include <boost/spirit/home/qi/detail/assign_to.hpp>
-#include <boost/range/iterator_range.hpp>
 #include <boost/fusion/include/vector.hpp>
 #include <boost/fusion/include/at.hpp>
 #include <boost/mpl/or.hpp>
 #include <boost/type_traits/is_integral.hpp>
 #include <boost/type_traits/is_enum.hpp>
-#include <boost/lexical_cast.hpp>
 #include <iterator> // for std::iterator_traits
+#include <sstream>
 
 namespace boost { namespace spirit
 {
@@ -103,8 +102,9 @@ namespace boost { namespace spirit { namespace qi
         template <typename Context>
         info what(Context& /*context*/) const
         {
-            return info("raw_token",
-                "raw_token(" + boost::lexical_cast<utf8_string>(id) + ")");
+            std::stringstream ss;
+            ss << "raw_token(" << id << ")";
+            return info("raw_token", ss.str());
         }
 
         TokenId id;

linx64/include/boost/spirit/home/lex/qi/plain_token.hpp

@@ -19,15 +19,16 @@
 #include <boost/spirit/home/qi/parser.hpp>
 #include <boost/spirit/home/qi/meta_compiler.hpp>
 #include <boost/spirit/home/qi/detail/assign_to.hpp>
-#include <boost/range/iterator_range.hpp>
+
 #include <boost/fusion/include/vector.hpp>
 #include <boost/fusion/include/at.hpp>
 #include <boost/mpl/or.hpp>
 #include <boost/mpl/and.hpp>
+#include <boost/range/iterator_range_core.hpp>
 #include <boost/type_traits/is_integral.hpp>
 #include <boost/type_traits/is_enum.hpp>
-#include <boost/lexical_cast.hpp>
 #include <iterator> // for std::iterator_traits
+#include <sstream>
 
 namespace boost { namespace spirit
 {
@@ -120,8 +121,9 @@ namespace boost { namespace spirit { namespace qi
         template <typename Context>
         info what(Context& /*context*/) const
         {
-            return info("token",
-                "token(" + boost::lexical_cast<utf8_string>(id) + ")");
+            std::stringstream ss;
+            ss << "token(" << id << ")";
+            return info("token", ss.str());
         }
 
         TokenId id;
@@ -173,12 +175,9 @@ namespace boost { namespace spirit { namespace qi
         template <typename Context>
         info what(Context& /*context*/) const
         {
-            return info("token_range"
-              , "token(" +
-                    boost::lexical_cast<utf8_string>(idmin) + ", " +
-                    boost::lexical_cast<utf8_string>(idmax) + ")"
-            );
-            return info("token_range");
+            std::stringstream ss;
+            ss << "token(" << idmin << ", " << idmax << ")";
+            return info("token_range", ss.str());
         }
 
         TokenId idmin, idmax;

linx64/include/boost/spirit/home/lex/qi/plain_tokenid.hpp

@@ -19,15 +19,15 @@
 #include <boost/spirit/home/qi/parser.hpp>
 #include <boost/spirit/home/qi/meta_compiler.hpp>
 #include <boost/spirit/home/qi/detail/assign_to.hpp>
-#include <boost/range/iterator_range.hpp>
+
 #include <boost/fusion/include/vector.hpp>
 #include <boost/fusion/include/at.hpp>
 #include <boost/mpl/or.hpp>
 #include <boost/mpl/and.hpp>
 #include <boost/type_traits/is_integral.hpp>
 #include <boost/type_traits/is_enum.hpp>
-#include <boost/lexical_cast.hpp>
 #include <iterator> // for std::iterator_traits
+#include <sstream>
 
 namespace boost { namespace spirit
 {
@@ -122,8 +122,9 @@ namespace boost { namespace spirit { namespace qi
         template <typename Context>
         info what(Context& /*context*/) const
         {
-            return info("tokenid",
-                "tokenid(" + boost::lexical_cast<utf8_string>(id) + ")");
+            std::stringstream ss;
+            ss << "tokenid(" << id << ")";
+            return info("tokenid", ss.str());
         }
 
         TokenId id;
@@ -174,11 +175,9 @@ namespace boost { namespace spirit { namespace qi
         template <typename Context>
         info what(Context& /*context*/) const
         {
-            return info("tokenid_range"
-              , "token(" +
-                    boost::lexical_cast<utf8_string>(idmin) + ", " +
-                    boost::lexical_cast<utf8_string>(idmax) + ")"
-            );
+            std::stringstream ss;
+            ss << "token(" << idmin << ", " << idmax << ")";
+            return info("tokenid_range", ss.str());
         }
 
         TokenId idmin, idmax;

linx64/include/boost/spirit/home/lex/qi/plain_tokenid_mask.hpp

@@ -19,14 +19,15 @@
 #include <boost/spirit/home/qi/parser.hpp>
 #include <boost/spirit/home/qi/meta_compiler.hpp>
 #include <boost/spirit/home/qi/detail/assign_to.hpp>
-#include <boost/range/iterator_range.hpp>
+
 #include <boost/fusion/include/vector.hpp>
 #include <boost/fusion/include/at.hpp>
 #include <boost/mpl/or.hpp>
+#include <boost/range/iterator_range_core.hpp>
 #include <boost/type_traits/is_integral.hpp>
 #include <boost/type_traits/is_enum.hpp>
-#include <boost/lexical_cast.hpp>
 #include <iterator> // for std::iterator_traits
+#include <sstream>
 
 namespace boost { namespace spirit
 {
@@ -103,8 +104,9 @@ namespace boost { namespace spirit { namespace qi
         template <typename Context>
         info what(Context& /*context*/) const
         {
-            return info("tokenid_mask",
-                "tokenid_mask(" + boost::lexical_cast<utf8_string>(mask) + ")");
+            std::stringstream ss;
+            ss << "tokenid_mask(" << mask << ")";
+            return info("tokenid_mask", ss.str());
         }
 
         Mask mask;

linx64/include/boost/spirit/home/lex/qi/state_switcher.hpp

@@ -21,7 +21,6 @@
 #include <boost/spirit/home/qi/domain.hpp>
 #include <boost/spirit/home/qi/parser.hpp>
 #include <boost/spirit/home/qi/meta_compiler.hpp>
-#include <boost/mpl/print.hpp>
 
 namespace boost { namespace spirit
 {
@@ -136,6 +135,10 @@ namespace boost { namespace spirit { namespace qi
     ///////////////////////////////////////////////////////////////////////////
     namespace detail
     {
+#ifdef _MSC_VER
+#  pragma warning(push)
+#  pragma warning(disable: 4512) // assignment operator could not be generated.
+#endif
         template <typename Iterator>
         struct reset_state_on_exit
         {
@@ -153,11 +156,10 @@ namespace boost { namespace spirit { namespace qi
 
             Iterator& it;
             std::size_t state;
-
-        private:
-            // silence MSVC warning C4512: assignment operator could not be generated
-            reset_state_on_exit& operator= (reset_state_on_exit const&);
         };
+#ifdef _MSC_VER
+#  pragma warning(pop)
+#endif
     }
 
     ///////////////////////////////////////////////////////////////////////////
@@ -213,10 +215,6 @@ namespace boost { namespace spirit { namespace qi
 
         Subject subject;
         State state;
-
-    private:
-        // silence MSVC warning C4512: assignment operator could not be generated
-        state_switcher_context& operator= (state_switcher_context const&);
     };
 
     ///////////////////////////////////////////////////////////////////////////