Merge pull request boostorg#767 from Lastique/feature/fix_missing_includes

djowel · web-flow · commit 59515f0e56ae · 2023-10-09T07:08:18.000+08:00
Fix missing includes in `match_manip.hpp`
diff --git a/include/boost/spirit/home/karma/stream/detail/format_manip.hpp b/include/boost/spirit/home/karma/stream/detail/format_manip.hpp
@@ -10,10 +10,12 @@
 #pragma once
 #endif
 
+#include <iosfwd>
 #include <iterator>
 #include <string>
 #include <boost/spirit/home/karma/generate.hpp>
 #include <boost/spirit/home/support/iterators/ostream_iterator.hpp>
+#include <boost/core/scoped_enum.hpp>
 #include <boost/mpl/bool.hpp>
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -148,7 +150,7 @@ namespace boost { namespace spirit { namespace karma { namespace detail
         karma::ostream_iterator<Char, Char, Traits> sink(os);
         if (!karma::generate (sink, fm.expr))
         {
-            os.setstate(std::ios_base::failbit);
+            os.setstate(std::basic_ostream<Char, Traits>::failbit);
         }
         return os;
     }
@@ -163,7 +165,7 @@ namespace boost { namespace spirit { namespace karma { namespace detail
         karma::ostream_iterator<Char, Char, Traits> sink(os);
         if (!karma::generate(sink, fm.expr, fm.attr))
         {
-            os.setstate(std::ios_base::failbit);
+            os.setstate(std::basic_ostream<Char, Traits>::failbit);
         }
         return os;
     }
@@ -177,7 +179,7 @@ namespace boost { namespace spirit { namespace karma { namespace detail
         karma::ostream_iterator<Char, Char, Traits> sink(os);
         if (!karma::generate_delimited(sink, fm.expr, fm.delim, fm.pre))
         {
-            os.setstate(std::ios_base::failbit);
+            os.setstate(std::basic_ostream<Char, Traits>::failbit);
         }
         return os;
     }
@@ -193,7 +195,7 @@ namespace boost { namespace spirit { namespace karma { namespace detail
         karma::ostream_iterator<Char, Char, Traits> sink(os);
         if (!karma::generate_delimited(sink, fm.expr, fm.delim, fm.pre, fm.attr))
         {
-            os.setstate(std::ios_base::failbit);
+            os.setstate(std::basic_ostream<Char, Traits>::failbit);
         }
         return os;
     }
diff --git a/include/boost/spirit/home/karma/stream/detail/format_manip_auto.hpp b/include/boost/spirit/home/karma/stream/detail/format_manip_auto.hpp
@@ -12,7 +12,8 @@
 
 #include <boost/spirit/home/karma/stream/detail/format_manip.hpp>
 #include <boost/spirit/home/karma/auto/create_generator.hpp>
-#include <boost/utility/enable_if.hpp>
+#include <boost/core/enable_if.hpp>
+#include <boost/mpl/bool.hpp>
 
 ///////////////////////////////////////////////////////////////////////////////
 namespace boost { namespace spirit { namespace karma { namespace detail
diff --git a/include/boost/spirit/home/karma/stream/format_manip.hpp b/include/boost/spirit/home/karma/stream/format_manip.hpp
@@ -15,6 +15,8 @@
 #include <boost/spirit/home/karma/detail/output_iterator.hpp>
 #include <boost/spirit/home/karma/stream/detail/format_manip.hpp>
 #include <boost/spirit/home/support/unused.hpp>
+#include <boost/mpl/bool.hpp>
+#include <iosfwd>
 
 ///////////////////////////////////////////////////////////////////////////////
 namespace boost { namespace spirit { namespace karma 
@@ -107,7 +109,7 @@ namespace boost { namespace spirit { namespace karma
 
         if (!g.derived().generate(sink, unused, unused, unused))
         {
-            os.setstate(std::ios_base::failbit);
+            os.setstate(std::basic_ostream<Char, Traits>::failbit);
         }
         return os;
     }
diff --git a/include/boost/spirit/home/karma/stream/format_manip_attr.hpp b/include/boost/spirit/home/karma/stream/format_manip_attr.hpp
@@ -10,7 +10,9 @@
 
 #include <boost/spirit/home/karma/stream/format_manip.hpp>
 
+#include <boost/mpl/bool.hpp>
 #include <boost/fusion/include/vector.hpp>
+#include <boost/preprocessor/cat.hpp>
 #include <boost/preprocessor/iterate.hpp>
 #include <boost/preprocessor/repetition/enum.hpp>
 #include <boost/preprocessor/repetition/enum_params.hpp>
diff --git a/include/boost/spirit/home/karma/stream/ostream_iterator.hpp b/include/boost/spirit/home/karma/stream/ostream_iterator.hpp
@@ -10,6 +10,7 @@
 #pragma once
 #endif
 
+#include <iosfwd>
 #include <iterator>
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/include/boost/spirit/home/karma/stream/stream.hpp b/include/boost/spirit/home/karma/stream/stream.hpp
@@ -27,7 +27,8 @@
 #include <boost/fusion/include/at.hpp>
 #include <boost/fusion/include/vector.hpp>
 #include <boost/fusion/include/cons.hpp>
-#include <boost/utility/enable_if.hpp>
+#include <boost/core/enable_if.hpp>
+#include <boost/mpl/bool.hpp>
 #include <boost/type_traits/is_same.hpp>
 #include <ostream>
 
diff --git a/include/boost/spirit/home/qi/stream/detail/match_manip.hpp b/include/boost/spirit/home/qi/stream/detail/match_manip.hpp
@@ -14,6 +14,7 @@
 #include <boost/spirit/home/qi/parse.hpp>
 #include <boost/spirit/home/support/iterators/istream_iterator.hpp>
 #include <boost/spirit/home/support/unused.hpp>
+#include <boost/core/enable_if.hpp>
 #include <boost/mpl/bool.hpp>
 
 #include <iosfwd>
@@ -155,7 +156,7 @@ namespace boost { namespace spirit { namespace qi { namespace detail
         input_iterator l;
         if (!qi::parse(f, l, fm.expr))
         {
-            is.setstate(std::ios_base::failbit);
+            is.setstate(std::basic_istream<Char, Traits>::failbit);
         }
         return is;
     }
@@ -174,7 +175,7 @@ namespace boost { namespace spirit { namespace qi { namespace detail
         input_iterator l;
         if (!qi::parse(f, l, fm.expr, fm.attr))
         {
-            is.setstate(std::ios_base::failbit);
+            is.setstate(std::basic_istream<Char, Traits>::failbit);
         }
         return is;
     }
@@ -194,7 +195,7 @@ namespace boost { namespace spirit { namespace qi { namespace detail
         if (!qi::phrase_parse(
                 f, l, fm.expr, fm.skipper, fm.post_skip))
         {
-            is.setstate(std::ios_base::failbit);
+            is.setstate(std::basic_istream<Char, Traits>::failbit);
         }
         return is;
     }
@@ -216,7 +217,7 @@ namespace boost { namespace spirit { namespace qi { namespace detail
         if (!qi::phrase_parse(
                 f, l, fm.expr, fm.skipper, fm.post_skip, fm.attr))
         {
-            is.setstate(std::ios_base::failbit);
+            is.setstate(std::basic_istream<Char, Traits>::failbit);
         }
         return is;
     }
diff --git a/include/boost/spirit/home/qi/stream/detail/match_manip_auto.hpp b/include/boost/spirit/home/qi/stream/detail/match_manip_auto.hpp
@@ -13,7 +13,7 @@
 
 #include <boost/spirit/home/qi/stream/detail/match_manip.hpp>
 #include <boost/spirit/home/qi/auto/create_parser.hpp>
-#include <boost/utility/enable_if.hpp>
+#include <boost/core/enable_if.hpp>
 
 ///////////////////////////////////////////////////////////////////////////////
 namespace boost { namespace spirit { namespace qi { namespace detail
diff --git a/include/boost/spirit/home/qi/stream/match_manip.hpp b/include/boost/spirit/home/qi/stream/match_manip.hpp
@@ -16,6 +16,7 @@
 #include <boost/spirit/home/qi/parser.hpp>
 #include <boost/spirit/home/support/unused.hpp>
 #include <boost/spirit/home/qi/stream/detail/match_manip.hpp>
+#include <boost/mpl/bool.hpp>
 #include <iosfwd>
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -113,7 +114,7 @@ namespace boost { namespace spirit { namespace qi
         input_iterator l;
         if (!p.derived().parse(f, l, unused, unused, unused))
         {
-            is.setstate(std::ios_base::failbit);
+            is.setstate(std::basic_istream<Char, Traits>::failbit);
         }
         return is;
     }

Original file line number	Diff line number	Diff line change
`@@ -10,10 +10,12 @@`
`10`	`10`	`#pragma once`
`11`	`11`	`#endif`
`12`	`12`
	`13`	`+#include <iosfwd>`
`13`	`14`	`#include <iterator>`
`14`	`15`	`#include <string>`
`15`	`16`	`#include <boost/spirit/home/karma/generate.hpp>`
`16`	`17`	`#include <boost/spirit/home/support/iterators/ostream_iterator.hpp>`
	`18`	`+#include <boost/core/scoped_enum.hpp>`
`17`	`19`	`#include <boost/mpl/bool.hpp>`
`18`	`20`
`19`	`21`	`///////////////////////////////////////////////////////////////////////////////`
`@@ -148,7 +150,7 @@ namespace boost { namespace spirit { namespace karma { namespace detail`
`148`	`150`	`karma::ostream_iterator<Char, Char, Traits> sink(os);`
`149`	`151`	`if (!karma::generate (sink, fm.expr))`
`150`	`152`	`{`
`151`		`- os.setstate(std::ios_base::failbit);`
	`153`	`+ os.setstate(std::basic_ostream<Char, Traits>::failbit);`
`152`	`154`	`}`
`153`	`155`	`return os;`
`154`	`156`	`}`
`@@ -163,7 +165,7 @@ namespace boost { namespace spirit { namespace karma { namespace detail`
`163`	`165`	`karma::ostream_iterator<Char, Char, Traits> sink(os);`
`164`	`166`	`if (!karma::generate(sink, fm.expr, fm.attr))`
`165`	`167`	`{`
`166`		`- os.setstate(std::ios_base::failbit);`
	`168`	`+ os.setstate(std::basic_ostream<Char, Traits>::failbit);`
`167`	`169`	`}`
`168`	`170`	`return os;`
`169`	`171`	`}`
`@@ -177,7 +179,7 @@ namespace boost { namespace spirit { namespace karma { namespace detail`
`177`	`179`	`karma::ostream_iterator<Char, Char, Traits> sink(os);`
`178`	`180`	`if (!karma::generate_delimited(sink, fm.expr, fm.delim, fm.pre))`
`179`	`181`	`{`
`180`		`- os.setstate(std::ios_base::failbit);`
	`182`	`+ os.setstate(std::basic_ostream<Char, Traits>::failbit);`
`181`	`183`	`}`
`182`	`184`	`return os;`
`183`	`185`	`}`
`@@ -193,7 +195,7 @@ namespace boost { namespace spirit { namespace karma { namespace detail`
`193`	`195`	`karma::ostream_iterator<Char, Char, Traits> sink(os);`
`194`	`196`	`if (!karma::generate_delimited(sink, fm.expr, fm.delim, fm.pre, fm.attr))`
`195`	`197`	`{`
`196`		`- os.setstate(std::ios_base::failbit);`
	`198`	`+ os.setstate(std::basic_ostream<Char, Traits>::failbit);`
`197`	`199`	`}`
`198`	`200`	`return os;`
`199`	`201`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,8 @@`
`15`	`15`	`#include <boost/spirit/home/karma/detail/output_iterator.hpp>`
`16`	`16`	`#include <boost/spirit/home/karma/stream/detail/format_manip.hpp>`
`17`	`17`	`#include <boost/spirit/home/support/unused.hpp>`
	`18`	`+#include <boost/mpl/bool.hpp>`
	`19`	`+#include <iosfwd>`
`18`	`20`
`19`	`21`	`///////////////////////////////////////////////////////////////////////////////`
`20`	`22`	`namespace boost { namespace spirit { namespace karma`
`@@ -107,7 +109,7 @@ namespace boost { namespace spirit { namespace karma`
`107`	`109`
`108`	`110`	`if (!g.derived().generate(sink, unused, unused, unused))`
`109`	`111`	`{`
`110`		`- os.setstate(std::ios_base::failbit);`
	`112`	`+ os.setstate(std::basic_ostream<Char, Traits>::failbit);`
`111`	`113`	`}`
`112`	`114`	`return os;`
`113`	`115`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`#include <boost/spirit/home/qi/parse.hpp>`
`15`	`15`	`#include <boost/spirit/home/support/iterators/istream_iterator.hpp>`
`16`	`16`	`#include <boost/spirit/home/support/unused.hpp>`
	`17`	`+#include <boost/core/enable_if.hpp>`
`17`	`18`	`#include <boost/mpl/bool.hpp>`
`18`	`19`
`19`	`20`	`#include <iosfwd>`
`@@ -155,7 +156,7 @@ namespace boost { namespace spirit { namespace qi { namespace detail`
`155`	`156`	`input_iterator l;`
`156`	`157`	`if (!qi::parse(f, l, fm.expr))`
`157`	`158`	`{`
`158`		`- is.setstate(std::ios_base::failbit);`
	`159`	`+ is.setstate(std::basic_istream<Char, Traits>::failbit);`
`159`	`160`	`}`
`160`	`161`	`return is;`
`161`	`162`	`}`
`@@ -174,7 +175,7 @@ namespace boost { namespace spirit { namespace qi { namespace detail`
`174`	`175`	`input_iterator l;`
`175`	`176`	`if (!qi::parse(f, l, fm.expr, fm.attr))`
`176`	`177`	`{`
`177`		`- is.setstate(std::ios_base::failbit);`
	`178`	`+ is.setstate(std::basic_istream<Char, Traits>::failbit);`
`178`	`179`	`}`
`179`	`180`	`return is;`
`180`	`181`	`}`
`@@ -194,7 +195,7 @@ namespace boost { namespace spirit { namespace qi { namespace detail`
`194`	`195`	`if (!qi::phrase_parse(`
`195`	`196`	`f, l, fm.expr, fm.skipper, fm.post_skip))`
`196`	`197`	`{`
`197`		`- is.setstate(std::ios_base::failbit);`
	`198`	`+ is.setstate(std::basic_istream<Char, Traits>::failbit);`
`198`	`199`	`}`
`199`	`200`	`return is;`
`200`	`201`	`}`
`@@ -216,7 +217,7 @@ namespace boost { namespace spirit { namespace qi { namespace detail`
`216`	`217`	`if (!qi::phrase_parse(`
`217`	`218`	`f, l, fm.expr, fm.skipper, fm.post_skip, fm.attr))`
`218`	`219`	`{`
`219`		`- is.setstate(std::ios_base::failbit);`
	`220`	`+ is.setstate(std::basic_istream<Char, Traits>::failbit);`
`220`	`221`	`}`
`221`	`222`	`return is;`
`222`	`223`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`	`#include <boost/spirit/home/qi/parser.hpp>`
`17`	`17`	`#include <boost/spirit/home/support/unused.hpp>`
`18`	`18`	`#include <boost/spirit/home/qi/stream/detail/match_manip.hpp>`
	`19`	`+#include <boost/mpl/bool.hpp>`
`19`	`20`	`#include <iosfwd>`
`20`	`21`
`21`	`22`	`///////////////////////////////////////////////////////////////////////////////`
`@@ -113,7 +114,7 @@ namespace boost { namespace spirit { namespace qi`
`113`	`114`	`input_iterator l;`
`114`	`115`	`if (!p.derived().parse(f, l, unused, unused, unused))`
`115`	`116`	`{`
`116`		`- is.setstate(std::ios_base::failbit);`
	`117`	`+ is.setstate(std::basic_istream<Char, Traits>::failbit);`
`117`	`118`	`}`
`118`	`119`	`return is;`
`119`	`120`	`}`