From 7d4c03fa032299f2d46149b7b3136c9fd43e4f81 Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <nok.raven@gmail.com>
Date: Sat, 18 Mar 2023 11:31:22 +0300
Subject: [PATCH] Don't include std stream headers ourselves (#270)

---
 include/boost/fusion/sequence/io/detail/in.hpp    |  1 -
 include/boost/fusion/sequence/io/detail/manip.hpp | 11 +++++------
 include/boost/fusion/sequence/io/detail/out.hpp   |  1 -
 include/boost/fusion/sequence/io/in.hpp           |  2 +-
 include/boost/fusion/sequence/io/out.hpp          |  2 +-
 5 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/include/boost/fusion/sequence/io/detail/in.hpp b/include/boost/fusion/sequence/io/detail/in.hpp
index d0a8dc49..d409a406 100644
--- a/include/boost/fusion/sequence/io/detail/in.hpp
+++ b/include/boost/fusion/sequence/io/detail/in.hpp
@@ -10,7 +10,6 @@
 #define FUSION_IN_05052005_0121
 
 #include <boost/fusion/support/config.hpp>
-#include <istream>
 #include <boost/fusion/sequence/io/detail/manip.hpp>
 
 #include <boost/mpl/bool.hpp>
diff --git a/include/boost/fusion/sequence/io/detail/manip.hpp b/include/boost/fusion/sequence/io/detail/manip.hpp
index 254c444b..3cda2ea9 100644
--- a/include/boost/fusion/sequence/io/detail/manip.hpp
+++ b/include/boost/fusion/sequence/io/detail/manip.hpp
@@ -36,10 +36,10 @@ namespace boost { namespace fusion
     namespace detail
     {
         template <typename Tag>
-        int get_xalloc_index(Tag* = 0)
+        int get_xalloc_index(int xalloc())
         {
             // each Tag will have a unique index
-            static int index = std::ios::xalloc();
+            static int const index = xalloc();
             return index;
         }
 
@@ -66,12 +66,12 @@ namespace boost { namespace fusion
             {
                 static arena ar; // our arena
                 ar.data.push_back(new T(data));
-                stream.pword(get_xalloc_index<Tag>()) = ar.data.back();
+                stream.pword(get_xalloc_index<Tag>(stream.xalloc)) = ar.data.back();
             }
 
             static T const* get(Stream& stream)
             {
-                return (T const*)stream.pword(get_xalloc_index<Tag>());
+                return (T const*)stream.pword(get_xalloc_index<Tag>(stream.xalloc));
             }
         };
 
@@ -114,7 +114,6 @@ namespace boost { namespace fusion
             {
                 // read a delimiter
                 string_type const* p = stream_data_t::get(stream);
-                std::ws(stream);
 
                 if (p)
                 {
@@ -141,7 +140,7 @@ namespace boost { namespace fusion
                     if (stream.get() != c)
                     {
                         stream.unget();
-                        stream.setstate(std::ios::failbit);
+                        stream.setstate(Stream::failbit);
                     }
                 }
             }
diff --git a/include/boost/fusion/sequence/io/detail/out.hpp b/include/boost/fusion/sequence/io/detail/out.hpp
index 7da87a53..43eb2bf2 100644
--- a/include/boost/fusion/sequence/io/detail/out.hpp
+++ b/include/boost/fusion/sequence/io/detail/out.hpp
@@ -10,7 +10,6 @@
 #define FUSION_OUT_05052005_0121
 
 #include <boost/fusion/support/config.hpp>
-#include <ostream>
 #include <boost/fusion/sequence/io/detail/manip.hpp>
 
 #include <boost/mpl/bool.hpp>
diff --git a/include/boost/fusion/sequence/io/in.hpp b/include/boost/fusion/sequence/io/in.hpp
index 288c2473..98e24122 100644
--- a/include/boost/fusion/sequence/io/in.hpp
+++ b/include/boost/fusion/sequence/io/in.hpp
@@ -10,9 +10,9 @@
 #define BOOST_IN_05042005_0120
 
 #include <boost/fusion/support/config.hpp>
-#include <istream>
 #include <boost/fusion/sequence/io/detail/in.hpp>
 #include <boost/fusion/support/is_sequence.hpp>
+#include <iosfwd>
 
 namespace boost { namespace fusion
 {
diff --git a/include/boost/fusion/sequence/io/out.hpp b/include/boost/fusion/sequence/io/out.hpp
index 5c4637d5..edb6be38 100644
--- a/include/boost/fusion/sequence/io/out.hpp
+++ b/include/boost/fusion/sequence/io/out.hpp
@@ -10,11 +10,11 @@
 #define BOOST_OUT_05042005_0120
 
 #include <boost/fusion/support/config.hpp>
-#include <ostream>
 #include <boost/fusion/sequence/io/detail/out.hpp>
 #include <boost/fusion/support/is_sequence.hpp>
 #include <boost/utility/enable_if.hpp>
 #include <boost/mpl/or.hpp>
+#include <iosfwd>
 
 namespace boost { namespace fusion
 {