From aa441800fcb8a87ca0251713d26bf0b3b56f207e Mon Sep 17 00:00:00 2001
From: Jonathan Turkanis <j@coderage.com>
Date: Sat, 5 Feb 2005 06:52:38 +0000
Subject: [PATCH] oved ios_traits back to separate header to break circular
 dependency

[SVN r27141]
---
 .../detail/adapter/concept_adapter.hpp          |  1 +
 .../boost/iostreams/detail/enable_if_stream.hpp |  4 ++--
 include/boost/iostreams/detail/resolve.hpp      |  1 +
 include/boost/iostreams/detail/wrap_unwrap.hpp  |  1 +
 include/boost/iostreams/operations.hpp          |  1 +
 include/boost/iostreams/traits.hpp              | 17 +----------------
 6 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/include/boost/iostreams/detail/adapter/concept_adapter.hpp b/include/boost/iostreams/detail/adapter/concept_adapter.hpp
index 766e258..bd2c1d5 100755
--- a/include/boost/iostreams/detail/adapter/concept_adapter.hpp
+++ b/include/boost/iostreams/detail/adapter/concept_adapter.hpp
@@ -14,6 +14,7 @@
 #include <boost/iostreams/categories.hpp>
 #include <boost/iostreams/detail/dispatch.hpp>
 #include <boost/iostreams/detail/error.hpp>
+#include <boost/iostreams/detail/ios_traits.hpp>
 #include <boost/iostreams/device/null.hpp>
 #include <boost/iostreams/traits.hpp>
 #include <boost/iostreams/is_device.hpp>
diff --git a/include/boost/iostreams/detail/enable_if_stream.hpp b/include/boost/iostreams/detail/enable_if_stream.hpp
index 62e2cc6..25b2d4e 100755
--- a/include/boost/iostreams/detail/enable_if_stream.hpp
+++ b/include/boost/iostreams/detail/enable_if_stream.hpp
@@ -11,9 +11,9 @@
 # pragma once
 #endif              
 
-#include <boost/config.hpp>             // BOOST_NO_SFINAE 
+#include <boost/config.hpp>                // BOOST_NO_SFINAE.
 #include <boost/utility/enable_if.hpp>                  
-#include <boost/iostreams/traits.hpp>   // is_std_io.
+#include <boost/iostreams/detail/ios_traits.hpp>  // is_std_io.
 
 #ifndef BOOST_NO_SFINAE
 # define BOOST_IOSTREAMS_ENABLE_IF_STREAM(T) \
diff --git a/include/boost/iostreams/detail/resolve.hpp b/include/boost/iostreams/detail/resolve.hpp
index 929bf9b..0d3e773 100755
--- a/include/boost/iostreams/detail/resolve.hpp
+++ b/include/boost/iostreams/detail/resolve.hpp
@@ -20,6 +20,7 @@
 #include <boost/iostreams/detail/adapter/range_adapter.hpp>
 #include <boost/iostreams/detail/config/overload_resolution.hpp>
 #include <boost/iostreams/detail/enable_if_stream.hpp>
+#include <boost/iostreams/detail/ios_traits.hpp>
 #include <boost/iostreams/detail/is_dereferenceable.hpp>
 #include <boost/iostreams/detail/is_iterator_range.hpp>
 #include <boost/iostreams/detail/select.hpp>
diff --git a/include/boost/iostreams/detail/wrap_unwrap.hpp b/include/boost/iostreams/detail/wrap_unwrap.hpp
index 8ec477c..ce80af3 100755
--- a/include/boost/iostreams/detail/wrap_unwrap.hpp
+++ b/include/boost/iostreams/detail/wrap_unwrap.hpp
@@ -13,6 +13,7 @@
 
 #include <boost/config.hpp>                             // SFINAE.
 #include <boost/iostreams/detail/enable_if_stream.hpp>
+#include <boost/iostreams/detail/ios_traits.hpp>
 #include <boost/iostreams/traits.hpp>                   // is_std_io.
 #include <boost/mpl/bool.hpp>
 #include <boost/mpl/identity.hpp>
diff --git a/include/boost/iostreams/operations.hpp b/include/boost/iostreams/operations.hpp
index 346cc21..da7cd61 100755
--- a/include/boost/iostreams/operations.hpp
+++ b/include/boost/iostreams/operations.hpp
@@ -15,6 +15,7 @@
 #include <boost/config.hpp>  // NO_STD_LOCALE, DEDUCED_TYPENAME, MSVC.
 #include <boost/detail/workaround.hpp>
 #include <boost/iostreams/detail/dispatch.hpp>
+#include <boost/iostreams/detail/ios_traits.hpp>
 #include <boost/iostreams/detail/wrap_unwrap.hpp>
 #include <boost/iostreams/traits.hpp>
 #include <boost/mpl/bool.hpp>
diff --git a/include/boost/iostreams/traits.hpp b/include/boost/iostreams/traits.hpp
index f6d3960..71dce40 100755
--- a/include/boost/iostreams/traits.hpp
+++ b/include/boost/iostreams/traits.hpp
@@ -23,6 +23,7 @@
 #include <boost/iostreams/categories.hpp>
 #include <boost/iostreams/detail/bool_trait_def.hpp> 
 #include <boost/iostreams/detail/is_iterator_range.hpp>    
+#include <boost/iostreams/detail/ios_traits.hpp>   
 #include <boost/iostreams/detail/select.hpp>            
 #include <boost/iostreams/detail/wrap_unwrap.hpp> 
 #include <boost/mpl/eval_if.hpp>
@@ -35,24 +36,8 @@
 #define BOOST_SELECT_BY_SIZE_MAX_CASE 9     
 #include <boost/iostreams/detail/select_by_size.hpp>    
 
-//------------------Definitions of predicates for stream types----------------//
-
-BOOST_IOSTREAMS_BOOL_TRAIT_DEF(is_istream, std::basic_istream, 2)
-BOOST_IOSTREAMS_BOOL_TRAIT_DEF(is_ostream, std::basic_ostream, 2)
-BOOST_IOSTREAMS_BOOL_TRAIT_DEF(is_iostream, std::basic_iostream, 2)
-BOOST_IOSTREAMS_BOOL_TRAIT_DEF(is_streambuf, std::basic_streambuf, 2)
-BOOST_IOSTREAMS_BOOL_TRAIT_DEF(is_stringstream, std::basic_stringstream, 3)
-BOOST_IOSTREAMS_BOOL_TRAIT_DEF(is_stringbuf, std::basic_stringbuf, 3)
-
 namespace boost { namespace iostreams {          
 
-//------------------Definitions of is_std_io----------------------------------//
-
-template<typename T>
-struct is_std_io
-    : mpl::or_< is_istream<T>, is_ostream<T>, is_streambuf<T> >
-    { };
-
 //------------------Definitions of io_char------------------------------------//
 
 namespace detail {