Merge pull request #314 from Kojoley/repository-no-predifined-termina…

…ls-compatability Fixed problems with BOOST_SPIRIT_NO_PREDEFINED_TERMINALS
boostorg · Dec 6, 2017 · 9448f43 · 9448f43
2 parents 5a72073 + d58e26e
commit 9448f43
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 6 deletions.
diff --git a/include/boost/spirit/home/karma/auxiliary/attr_cast.hpp b/include/boost/spirit/home/karma/auxiliary/attr_cast.hpp
@@ -31,9 +31,7 @@ namespace boost { namespace spirit
 
 namespace boost { namespace spirit { namespace karma
 {
-#ifndef BOOST_SPIRIT_NO_PREDEFINED_TERMINALS
     using spirit::attr_cast;
-#endif
 
     ///////////////////////////////////////////////////////////////////////////
     // attr_cast_generator consumes the attribute of subject generator without

diff --git a/include/boost/spirit/repository/home/karma/directive/confix.hpp b/include/boost/spirit/repository/home/karma/directive/confix.hpp
@@ -45,8 +45,10 @@ namespace boost { namespace spirit
 ///////////////////////////////////////////////////////////////////////////////
 namespace boost { namespace spirit { namespace repository { namespace karma
 {
-    using repository::confix_type;
+#ifndef BOOST_SPIRIT_NO_PREDEFINED_TERMINALS
     using repository::confix;
+#endif
+    using repository::confix_type;
 
     ///////////////////////////////////////////////////////////////////////////
     template <typename Subject, typename Prefix, typename Suffix>

diff --git a/include/boost/spirit/repository/home/qi/directive/confix.hpp b/include/boost/spirit/repository/home/qi/directive/confix.hpp
@@ -46,8 +46,10 @@ namespace boost { namespace spirit
 ///////////////////////////////////////////////////////////////////////////////
 namespace boost { namespace spirit { namespace repository { namespace qi
 {
-    using repository::confix_type;
+#ifndef BOOST_SPIRIT_NO_PREDEFINED_TERMINALS
     using repository::confix;
+#endif
+    using repository::confix_type;
 
     ///////////////////////////////////////////////////////////////////////////
     // the confix() generated parser

diff --git a/include/boost/spirit/repository/home/qi/directive/distinct.hpp b/include/boost/spirit/repository/home/qi/directive/distinct.hpp
@@ -56,8 +56,10 @@ namespace boost { namespace spirit
 ///////////////////////////////////////////////////////////////////////////////
 namespace boost { namespace spirit { namespace repository {namespace qi
 {
-    using repository::distinct_type;
+#ifndef BOOST_SPIRIT_NO_PREDEFINED_TERMINALS
     using repository::distinct;
+#endif
+    using repository::distinct_type;
 
     template <typename Subject, typename Tail, typename Modifier>
     struct distinct_parser

diff --git a/include/boost/spirit/repository/home/qi/directive/kwd.hpp b/include/boost/spirit/repository/home/qi/directive/kwd.hpp
@@ -16,6 +16,7 @@
 #include <boost/spirit/home/qi/parser.hpp>
 #include <boost/spirit/home/qi/auxiliary/lazy.hpp>
 #include <boost/spirit/home/qi/operator/kleene.hpp>
+#include <boost/spirit/home/qi/string/lit.hpp>
 #include <boost/spirit/home/support/container.hpp>
 #include <boost/spirit/home/qi/detail/attributes.hpp>
 #include <boost/spirit/home/qi/detail/fail_function.hpp>
@@ -148,11 +149,17 @@ namespace boost { namespace spirit
 
 namespace boost { namespace spirit { namespace repository { namespace qi
 {
+#ifndef BOOST_SPIRIT_NO_PREDEFINED_TERMINALS
     using repository::kwd;
     using repository::ikwd;
     using repository::dkwd;
     using repository::idkwd;
     using spirit::inf;
+#endif
+    using repository::kwd_type;
+    using repository::ikwd_type;
+    using repository::dkwd_type;
+    using repository::idkwd_type;
     using spirit::inf_type;
 
 template <typename T>

diff --git a/include/boost/spirit/repository/home/qi/operator/keywords.hpp b/include/boost/spirit/repository/home/qi/operator/keywords.hpp
@@ -31,6 +31,7 @@
 #include <boost/spirit/home/qi/action/action.hpp>
 #include <boost/spirit/home/qi/directive/hold.hpp>
 #include <boost/mpl/count_if.hpp>
+#include <boost/mpl/greater.hpp>
 #include <boost/mpl/range_c.hpp>
 #include <boost/mpl/copy.hpp>
 #include <boost/mpl/size.hpp>

diff --git a/include/boost/spirit/repository/home/qi/primitive/advance.hpp b/include/boost/spirit/repository/home/qi/primitive/advance.hpp
@@ -6,6 +6,7 @@
 #if !defined(BOOST_SPIRIT_REPOSITORY_QI_ADVANCE_JAN_23_2011_1203PM)
 #define BOOST_SPIRIT_REPOSITORY_QI_ADVANCE_JAN_23_2011_1203PM
 
+#include <boost/spirit/home/support/terminal.hpp>
 #include <boost/spirit/include/qi_parse.hpp>
 
 ///////////////////////////////////////////////////////////////////////////////

diff --git a/include/boost/spirit/repository/home/qi/primitive/flush_multi_pass.hpp b/include/boost/spirit/repository/home/qi/primitive/flush_multi_pass.hpp
@@ -37,8 +37,10 @@ namespace boost { namespace spirit
 ///////////////////////////////////////////////////////////////////////////////
 namespace boost { namespace spirit { namespace repository { namespace qi
 {
-    using repository::flush_multi_pass_type;
+#ifndef BOOST_SPIRIT_NO_PREDEFINED_TERMINALS
     using repository::flush_multi_pass;
+#endif
+    using repository::flush_multi_pass_type;
 
     ///////////////////////////////////////////////////////////////////////////
     // for a flush_multi_pass_parser generated parser