Merge pull request boostorg#46 from jefftrull/bugfix/instantiate_stds…

…tring Instantiate lexers with std::string, not flex_string
giomasce-throwaway · Jan 12, 2020 · c530f72 · c530f72
2 parents 32df100 + 27dc286
commit c530f72
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/samples/list_includes/instantiate_lexertl_lexer.cpp b/samples/list_includes/instantiate_lexertl_lexer.cpp
@@ -39,6 +39,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 template struct boost::wave::cpplexer::lexertl::new_lexer_gen<
-    BOOST_WAVE_STRINGTYPE::iterator>;
+    std::string::iterator>;
 
 #endif // BOOST_WAVE_SEPARATE_LEXER_INSTANTIATION != 0
diff --git a/samples/real_positions/instantiate_re2c_lexer.cpp b/samples/real_positions/instantiate_re2c_lexer.cpp
@@ -48,10 +48,10 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 template struct boost::wave::cpplexer::new_lexer_gen<
-    BOOST_WAVE_STRINGTYPE::iterator, boost::wave::util::file_position_type,
+    std::string::iterator, boost::wave::util::file_position_type,
     lex_token<boost::wave::util::file_position_type> >;
 template struct boost::wave::cpplexer::new_lexer_gen<
-    BOOST_WAVE_STRINGTYPE::const_iterator, boost::wave::util::file_position_type,
+    std::string::const_iterator, boost::wave::util::file_position_type,
     lex_token<boost::wave::util::file_position_type> >;
 
 // the suffix header occurs after all of the code