update boost

linx64/include/boost/spirit/home/support/detail/lexer/char_traits.hpp

@@ -3,8 +3,8 @@
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file licence_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_LEXER_CHAR_TRAITS_H
-#define BOOST_LEXER_CHAR_TRAITS_H
+#ifndef BOOST_SPIRIT_SUPPORT_DETAIL_LEXER_CHAR_TRAITS_HPP
+#define BOOST_SPIRIT_SUPPORT_DETAIL_LEXER_CHAR_TRAITS_HPP
 
 // Make sure wchar_t is defined
 #include <string>

linx64/include/boost/spirit/home/support/detail/lexer/consts.hpp

@@ -3,8 +3,8 @@
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file licence_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_LEXER_CONSTS_H
-#define BOOST_LEXER_CONSTS_H
+#ifndef BOOST_SPIRIT_SUPPORT_DETAIL_LEXER_CONSTS_HPP
+#define BOOST_SPIRIT_SUPPORT_DETAIL_LEXER_CONSTS_HPP
 
 #include <boost/config.hpp>
 #include <boost/integer_traits.hpp>

linx64/include/boost/spirit/home/support/detail/lexer/containers/ptr_list.hpp

@@ -3,8 +3,8 @@
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file licence_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_LEXER_PTR_LIST_HPP
-#define BOOST_LEXER_PTR_LIST_HPP
+#ifndef BOOST_SPIRIT_SUPPORT_DETAIL_LEXER_CONTAINERS_PTR_LIST_HPP
+#define BOOST_SPIRIT_SUPPORT_DETAIL_LEXER_CONTAINERS_PTR_LIST_HPP
 
 #include <list>
 

linx64/include/boost/spirit/home/support/detail/lexer/containers/ptr_vector.hpp

@@ -3,8 +3,8 @@
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file licence_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_LEXER_PTR_VECTOR_HPP
-#define BOOST_LEXER_PTR_VECTOR_HPP
+#ifndef BOOST_SPIRIT_SUPPORT_DETAIL_LEXER_CONTAINERS_PTR_VECTOR_HPP
+#define BOOST_SPIRIT_SUPPORT_DETAIL_LEXER_CONTAINERS_PTR_VECTOR_HPP
 
 #include "../size_t.hpp"
 #include <vector>

linx64/include/boost/spirit/home/support/detail/lexer/conversion/char_state_machine.hpp

@@ -3,8 +3,8 @@
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file licence_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_LEXER_CHAR_STATE_MACHINE_HPP
-#define BOOST_LEXER_CHAR_STATE_MACHINE_HPP
+#ifndef BOOST_SPIRIT_SUPPORT_DETAIL_LEXER_CONVERSION_CHAR_STATE_MACHINE_HPP
+#define BOOST_SPIRIT_SUPPORT_DETAIL_LEXER_CONVERSION_CHAR_STATE_MACHINE_HPP
 
 #include "../consts.hpp"
 #include <map>

linx64/include/boost/spirit/home/support/detail/lexer/debug.hpp

@@ -3,15 +3,15 @@
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file licence_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_LEXER_DEBUG_HPP
-#define BOOST_LEXER_DEBUG_HPP
+#ifndef BOOST_SPIRIT_SUPPORT_DETAIL_LEXER_DEBUG_HPP
+#define BOOST_SPIRIT_SUPPORT_DETAIL_LEXER_DEBUG_HPP
 
 #include <map>
-#include <ostream>
 #include "rules.hpp"
 #include "size_t.hpp"
 #include "state_machine.hpp"
 #include "string_token.hpp"
+#include <ios>
 #include <vector>
 
 namespace boost

linx64/include/boost/spirit/home/support/detail/lexer/file_input.hpp

@@ -3,15 +3,15 @@
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file licence_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_LEXER_FILE_INPUT
-#define BOOST_LEXER_FILE_INPUT
+#ifndef BOOST_SPIRIT_SUPPORT_DETAIL_LEXER_FILE_INPUT_HPP
+#define BOOST_SPIRIT_SUPPORT_DETAIL_LEXER_FILE_INPUT_HPP
 
 #include "char_traits.hpp"
 // memcpy
 #include <cstring>
-#include <fstream>
 #include "size_t.hpp"
 #include "state_machine.hpp"
+#include <iosfwd>
 
 namespace boost
 {
@@ -130,7 +130,7 @@ public:
 
     friend class iterator;
 
-    // Make it explict that we are NOT taking a copy of state_machine_!
+    // Make it explicit that we are NOT taking a copy of state_machine_!
     basic_file_input (const basic_state_machine<CharT> *state_machine_,
         std::basic_ifstream<CharT> *is_,
         const std::streamsize buffer_size_ = 4096,

linx64/include/boost/spirit/home/support/detail/lexer/generate_cpp.hpp

@@ -3,16 +3,16 @@
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file licence_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_LEXER_GENERATE_CPP_HPP
-#define BOOST_LEXER_GENERATE_CPP_HPP
+#ifndef BOOST_SPIRIT_SUPPORT_DETAIL_LEXER_GENERATE_CPP_HPP
+#define BOOST_SPIRIT_SUPPORT_DETAIL_LEXER_GENERATE_CPP_HPP
 
 #include "char_traits.hpp"
 #include "consts.hpp"
 #include "internals.hpp"
-#include <iostream>
 #include "runtime_error.hpp"
 #include "size_t.hpp"
 #include "state_machine.hpp"
+#include <iosfwd>
 #include <vector>
 
 namespace boost

linx64/include/boost/spirit/home/support/detail/lexer/generate_re2c.hpp

@@ -3,16 +3,16 @@
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file licence_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#ifndef LEXERTL_GENERATE_RE2C_HPP
-#define LEXERTL_GENERATE_RE2C_HPP
+#ifndef BOOST_SPIRIT_SUPPORT_DETAIL_LEXER_GENERATE_RE2C_HPP
+#define BOOST_SPIRIT_SUPPORT_DETAIL_LEXER_GENERATE_RE2C_HPP
 
 #include "char_traits.hpp"
 #include "consts.hpp"
 #include "internals.hpp"
-#include <iostream>
 #include "runtime_error.hpp"
 #include "size_t.hpp"
 #include "state_machine.hpp"
+#include <iosfwd>
 #include <vector>
 
 namespace boost

linx64/include/boost/spirit/home/support/detail/lexer/generator.hpp

@@ -3,8 +3,8 @@
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file licence_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_LEXER_GENERATOR_HPP
-#define BOOST_LEXER_GENERATOR_HPP
+#ifndef BOOST_SPIRIT_SUPPORT_DETAIL_LEXER_GENERATOR_HPP
+#define BOOST_SPIRIT_SUPPORT_DETAIL_LEXER_GENERATOR_HPP
 
 #include "char_traits.hpp"
 // memcmp()

linx64/include/boost/spirit/home/support/detail/lexer/input.hpp

@@ -3,8 +3,8 @@
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file licence_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_LEXER_INPUT
-#define BOOST_LEXER_INPUT
+#ifndef BOOST_SPIRIT_SUPPORT_DETAIL_LEXER_INPUT_HPP
+#define BOOST_SPIRIT_SUPPORT_DETAIL_LEXER_INPUT_HPP
 
 #include "char_traits.hpp"
 #include "size_t.hpp"
@@ -479,7 +479,7 @@ public:
 
     friend class iterator;
 
-    // Make it explict that we are NOT taking a copy of state_machine_!
+    // Make it explicit that we are NOT taking a copy of state_machine_!
     basic_input (const basic_state_machine<typename Traits::char_type>
         *state_machine_, const FwdIter &begin_, const FwdIter &end_) :
         _state_machine (state_machine_),

linx64/include/boost/spirit/home/support/detail/lexer/internals.hpp

@@ -3,8 +3,8 @@
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file licence_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_LEXER_INTERNALS_HPP
-#define BOOST_LEXER_INTERNALS_HPP
+#ifndef BOOST_SPIRIT_SUPPORT_DETAIL_LEXER_INTERNALS_HPP
+#define BOOST_SPIRIT_SUPPORT_DETAIL_LEXER_INTERNALS_HPP
 
 #include "containers/ptr_vector.hpp"
 

linx64/include/boost/spirit/home/support/detail/lexer/parser/parser.hpp

@@ -3,8 +3,8 @@
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file licence_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_LEXER_PARSER_HPP
-#define BOOST_LEXER_PARSER_HPP
+#ifndef BOOST_SPIRIT_SUPPORT_DETAIL_LEXER_PARSER_PARSER_HPP
+#define BOOST_SPIRIT_SUPPORT_DETAIL_LEXER_PARSER_PARSER_HPP
 
 #include <boost/assert.hpp>
 #include "tree/end_node.hpp"
@@ -15,6 +15,7 @@
 #include "tree/sequence_node.hpp"
 #include "../size_t.hpp"
 #include "tokeniser/re_tokeniser.hpp"
+#include <sstream>
 
 namespace boost
 {

linx64/include/boost/spirit/home/support/detail/lexer/parser/tokeniser/num_token.hpp

@@ -3,8 +3,8 @@
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file licence_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_LEXER_NUM_TOKEN_HPP
-#define BOOST_LEXER_NUM_TOKEN_HPP
+#ifndef BOOST_SPIRIT_SUPPORT_DETAIL_LEXER_PARSER_TOKENISER_NUM_TOKEN_HPP
+#define BOOST_SPIRIT_SUPPORT_DETAIL_LEXER_PARSER_TOKENISER_NUM_TOKEN_HPP
 
 #include <boost/config.hpp>
 #include "../../consts.hpp" // null_token
@@ -45,30 +45,6 @@ struct basic_num_token
         *_macro = 0;
     }
 
-    basic_num_token &operator = (const basic_num_token &rhs_)
-    {
-        _type = rhs_._type;
-        _id = rhs_._id;
-        _min = rhs_._min;
-        _comma = rhs_._comma;
-        _max = rhs_._max;
-
-        if (_type == MACRO)
-        {
-            const CharT *read_ = rhs_._macro;
-            CharT *write_ = _macro;
-
-            while (*read_)
-            {
-                *write_++ = *read_++;
-            }
-
-            *write_ = 0;
-        }
-
-        return *this;
-    }
-
     void set (const type type_)
     {
         _type = type_;

linx64/include/boost/spirit/home/support/detail/lexer/parser/tokeniser/re_tokeniser.hpp

@@ -3,8 +3,8 @@
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file licence_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_LEXER_RE_TOKENISER_HPP
-#define BOOST_LEXER_RE_TOKENISER_HPP
+#ifndef BOOST_SPIRIT_SUPPORT_DETAIL_LEXER_PARSER_TOKENISER_RE_TOKENISER_HPP
+#define BOOST_SPIRIT_SUPPORT_DETAIL_LEXER_PARSER_TOKENISER_RE_TOKENISER_HPP
 
 // memcpy()
 #include <cstring>

linx64/include/boost/spirit/home/support/detail/lexer/parser/tokeniser/re_tokeniser_helper.hpp

@@ -3,14 +3,15 @@
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file licence_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_LEXER_RE_TOKENISER_HELPER_H
-#define BOOST_LEXER_RE_TOKENISER_HELPER_H
+#ifndef BOOST_SPIRIT_SUPPORT_DETAIL_LEXER_PARSER_TOKENISER_RE_TOKENISER_HELPER_HPP
+#define BOOST_SPIRIT_SUPPORT_DETAIL_LEXER_PARSER_TOKENISER_RE_TOKENISER_HELPER_HPP
 
 #include "../../char_traits.hpp"
 // strlen()
 #include <cstring>
 #include "../../size_t.hpp"
 #include "re_tokeniser_state.hpp"
+#include <sstream>
 
 namespace boost
 {
@@ -523,21 +524,21 @@ private:
 
         for (; start_ <= end_; ++start_)
         {
-            CharT ch_ = static_cast<CharT> (start_);
+            CharT ch_i = static_cast<CharT> (start_);
 
             if ((state_._flags & icase) &&
-                (std::isupper (ch_, state_._locale) ||
-                std::islower (ch_, state_._locale)))
+                (std::isupper (ch_i, state_._locale) ||
+                std::islower (ch_i, state_._locale)))
             {
-                CharT upper_ = std::toupper (ch_, state_._locale);
-                CharT lower_ = std::tolower (ch_, state_._locale);
+                CharT upper_ = std::toupper (ch_i, state_._locale);
+                CharT lower_ = std::tolower (ch_i, state_._locale);
 
                 chars_ += (upper_);
                 chars_ += (lower_);
             }
             else
             {
-                chars_ += (ch_);
+                chars_ += (ch_i);
             }
         }
     }

linx64/include/boost/spirit/home/support/detail/lexer/parser/tokeniser/re_tokeniser_state.hpp

@@ -3,8 +3,8 @@
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file licence_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_LEXER_RE_TOKENISER_STATE_HPP
-#define BOOST_LEXER_RE_TOKENISER_STATE_HPP
+#ifndef BOOST_SPIRIT_SUPPORT_DETAIL_LEXER_PARSER_TOKENISER_RE_TOKENISER_STATE_HPP
+#define BOOST_SPIRIT_SUPPORT_DETAIL_LEXER_PARSER_TOKENISER_RE_TOKENISER_STATE_HPP
 
 #include "../../consts.hpp"
 #include <locale>

linx64/include/boost/spirit/home/support/detail/lexer/parser/tree/end_node.hpp

@@ -3,8 +3,8 @@
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file licence_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_LEXER_END_NODE_HPP
-#define BOOST_LEXER_END_NODE_HPP
+#ifndef BOOST_SPIRIT_SUPPORT_DETAIL_LEXER_PARSER_TREE_END_NODE_HPP
+#define BOOST_SPIRIT_SUPPORT_DETAIL_LEXER_PARSER_TREE_END_NODE_HPP
 
 #include "node.hpp"
 #include "../../size_t.hpp"

linx64/include/boost/spirit/home/support/detail/lexer/parser/tree/iteration_node.hpp

@@ -3,8 +3,8 @@
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file licence_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_LEXER_ITERATION_NODE_HPP
-#define BOOST_LEXER_ITERATION_NODE_HPP
+#ifndef BOOST_SPIRIT_SUPPORT_DETAIL_LEXER_PARSER_TREE_ITERATION_NODE_HPP
+#define BOOST_SPIRIT_SUPPORT_DETAIL_LEXER_PARSER_TREE_ITERATION_NODE_HPP
 
 #include "node.hpp"
 

linx64/include/boost/spirit/home/support/detail/lexer/parser/tree/leaf_node.hpp

@@ -3,8 +3,8 @@
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file licence_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_LEXER_LEAF_NODE_HPP
-#define BOOST_LEXER_LEAF_NODE_HPP
+#ifndef BOOST_SPIRIT_SUPPORT_DETAIL_LEXER_PARSER_TREE_LEAF_NODE_HPP
+#define BOOST_SPIRIT_SUPPORT_DETAIL_LEXER_PARSER_TREE_LEAF_NODE_HPP
 
 #include "../../consts.hpp" // null_token
 #include "node.hpp"

linx64/include/boost/spirit/home/support/detail/lexer/parser/tree/node.hpp

@@ -3,8 +3,8 @@
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file licence_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_LEXER_NODE_HPP
-#define BOOST_LEXER_NODE_HPP
+#ifndef BOOST_SPIRIT_SUPPORT_DETAIL_LEXER_PARSER_TREE_NODE_HPP
+#define BOOST_SPIRIT_SUPPORT_DETAIL_LEXER_PARSER_TREE_NODE_HPP
 
 #include <boost/assert.hpp>
 #include "../../containers/ptr_vector.hpp"

linx64/include/boost/spirit/home/support/detail/lexer/parser/tree/selection_node.hpp

@@ -3,8 +3,8 @@
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file licence_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_LEXER_SELECTION_NODE_HPP
-#define BOOST_LEXER_SELECTION_NODE_HPP
+#ifndef BOOST_SPIRIT_SUPPORT_DETAIL_LEXER_PARSER_TREE_SELECTION_NODE_HPP
+#define BOOST_SPIRIT_SUPPORT_DETAIL_LEXER_PARSER_TREE_SELECTION_NODE_HPP
 
 #include "node.hpp"
 

linx64/include/boost/spirit/home/support/detail/lexer/parser/tree/sequence_node.hpp

@@ -3,8 +3,8 @@
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file licence_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_LEXER_SEQUENCE_NODE_HPP
-#define BOOST_LEXER_SEQUENCE_NODE_HPP
+#ifndef BOOST_SPIRIT_SUPPORT_DETAIL_LEXER_PARSER_TREE_SEQUENCE_NODE_HPP
+#define BOOST_SPIRIT_SUPPORT_DETAIL_LEXER_PARSER_TREE_SEQUENCE_NODE_HPP
 
 #include "node.hpp"
 

linx64/include/boost/spirit/home/support/detail/lexer/partition/charset.hpp

@@ -3,8 +3,8 @@
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file licence_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_LEXER_CHARSET_HPP
-#define BOOST_LEXER_CHARSET_HPP
+#ifndef BOOST_SPIRIT_SUPPORT_DETAIL_LEXER_PARTITION_CHARSET_HPP
+#define BOOST_SPIRIT_SUPPORT_DETAIL_LEXER_PARTITION_CHARSET_HPP
 
 #include <set>
 #include "../size_t.hpp"

linx64/include/boost/spirit/home/support/detail/lexer/partition/equivset.hpp

@@ -3,8 +3,8 @@
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file licence_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_LEXER_EQUIVSET_HPP
-#define BOOST_LEXER_EQUIVSET_HPP
+#ifndef BOOST_SPIRIT_SUPPORT_DETAIL_LEXER_PARTITION_EQUIVSET_HPP
+#define BOOST_SPIRIT_SUPPORT_DETAIL_LEXER_PARTITION_EQUIVSET_HPP
 
 #include <algorithm>
 #include "../parser/tree/node.hpp"

linx64/include/boost/spirit/home/support/detail/lexer/rules.hpp

@@ -3,8 +3,8 @@
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file licence_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_LEXER_RULES_HPP
-#define BOOST_LEXER_RULES_HPP
+#ifndef BOOST_SPIRIT_SUPPORT_DETAIL_LEXER_RULES_HPP
+#define BOOST_SPIRIT_SUPPORT_DETAIL_LEXER_RULES_HPP
 
 #include "consts.hpp"
 #include <deque>

linx64/include/boost/spirit/home/support/detail/lexer/runtime_error.hpp

@@ -3,8 +3,8 @@
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file licence_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_LEXER_RUNTIME_ERROR_HPP
-#define BOOST_LEXER_RUNTIME_ERROR_HPP
+#ifndef BOOST_SPIRIT_SUPPORT_DETAIL_LEXER_RUNTIME_ERROR_HPP
+#define BOOST_SPIRIT_SUPPORT_DETAIL_LEXER_RUNTIME_ERROR_HPP
 
 #include <boost/config.hpp> // for BOOST_SYMBOL_VISIBLE
 #include <stdexcept>

linx64/include/boost/spirit/home/support/detail/lexer/size_t.hpp

@@ -3,8 +3,8 @@
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file licence_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_LEXER_SIZE_T_H
-#define BOOST_LEXER_SIZE_T_H
+#ifndef BOOST_SPIRIT_SUPPORT_DETAIL_LEXER_SIZE_T_HPP
+#define BOOST_SPIRIT_SUPPORT_DETAIL_LEXER_SIZE_T_HPP
 
 #include <stddef.h> // ptrdiff_t
 

linx64/include/boost/spirit/home/support/detail/lexer/state_machine.hpp

@@ -3,8 +3,8 @@
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file licence_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_LEXER_STATE_MACHINE_HPP
-#define BOOST_LEXER_STATE_MACHINE_HPP
+#ifndef BOOST_SPIRIT_SUPPORT_DETAIL_LEXER_STATE_MACHINE_HPP
+#define BOOST_SPIRIT_SUPPORT_DETAIL_LEXER_STATE_MACHINE_HPP
 
 #include <algorithm>
 #include "conversion/char_state_machine.hpp"

linx64/include/boost/spirit/home/support/detail/lexer/string_token.hpp

@@ -3,12 +3,13 @@
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file licence_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_LEXER_STRING_TOKEN_HPP
-#define BOOST_LEXER_STRING_TOKEN_HPP
+#ifndef BOOST_SPIRIT_SUPPORT_DETAIL_LEXER_STRING_TOKEN_HPP
+#define BOOST_SPIRIT_SUPPORT_DETAIL_LEXER_STRING_TOKEN_HPP
 
 #include <algorithm>
 #include "size_t.hpp"
 #include "consts.hpp" // num_chars, num_wchar_ts
+#include <sstream>
 #include <string>
 #include <limits>