From f3fed061787f0a3c24e94433dbad1885620bbdce Mon Sep 17 00:00:00 2001 From: Jonathan Turkanis Date: Wed, 6 Apr 2005 23:02:45 +0000 Subject: [PATCH] made chain public [SVN r28034] --- include/boost/iostreams/{detail => }/chain.hpp | 6 ++++++ include/boost/iostreams/detail/converting_chain.hpp | 2 +- include/boost/iostreams/detail/streambuf/chainbuf.hpp | 2 +- include/boost/iostreams/filtering_stream.hpp | 4 ++-- include/boost/iostreams/filtering_streambuf.hpp | 6 +++--- include/boost/iostreams/reverse.hpp | 8 ++++---- 6 files changed, 17 insertions(+), 11 deletions(-) rename include/boost/iostreams/{detail => }/chain.hpp (99%) diff --git a/include/boost/iostreams/detail/chain.hpp b/include/boost/iostreams/chain.hpp similarity index 99% rename from include/boost/iostreams/detail/chain.hpp rename to include/boost/iostreams/chain.hpp index 9c0bb84..10511a0 100755 --- a/include/boost/iostreams/detail/chain.hpp +++ b/include/boost/iostreams/chain.hpp @@ -36,6 +36,8 @@ namespace boost { namespace iostreams { +//--------------Definition of chain and wchain--------------------------------// + namespace detail { template class chain_client; @@ -247,6 +249,8 @@ private: shared_ptr pimpl_; }; +} // End namespace detail. + // // Macro: BOOST_IOSTREAMS_DECL_CHAIN(name, category) // Description: Defines a template derived from chain_base appropriate for a @@ -292,6 +296,8 @@ BOOST_IOSTREAMS_DECL_CHAIN(wchain, wchar_t) //--------------Definition of chain_client------------------------------------// +namespace detail { + // // Template name: chain_client // Description: Class whose instances provide access to an underlying chain diff --git a/include/boost/iostreams/detail/converting_chain.hpp b/include/boost/iostreams/detail/converting_chain.hpp index 0371495..0422b69 100755 --- a/include/boost/iostreams/detail/converting_chain.hpp +++ b/include/boost/iostreams/detail/converting_chain.hpp @@ -15,7 +15,7 @@ #include // allocator. #include -#include +#include #include #include // seekdir, streamsize. #include // pubsync. diff --git a/include/boost/iostreams/detail/streambuf/chainbuf.hpp b/include/boost/iostreams/detail/streambuf/chainbuf.hpp index 1287c39..ea616bd 100755 --- a/include/boost/iostreams/detail/streambuf/chainbuf.hpp +++ b/include/boost/iostreams/detail/streambuf/chainbuf.hpp @@ -13,8 +13,8 @@ #include // BOOST_MSVC, template friends. #include +#include #include -#include #include #include #include diff --git a/include/boost/iostreams/filtering_stream.hpp b/include/boost/iostreams/filtering_stream.hpp index 1a44b09..d37b737 100755 --- a/include/boost/iostreams/filtering_stream.hpp +++ b/include/boost/iostreams/filtering_stream.hpp @@ -130,8 +130,8 @@ private: { client_type::push(t BOOST_IOSTREAMS_PUSH_ARGS()); } \ }; \ /**/ -BOOST_IOSTREAMS_DEFINE_FILTER_STREAM(filtering_stream, boost::iostreams::detail::chain, char) -BOOST_IOSTREAMS_DEFINE_FILTER_STREAM(wfiltering_stream, boost::iostreams::detail::chain, wchar_t) +BOOST_IOSTREAMS_DEFINE_FILTER_STREAM(filtering_stream, boost::iostreams::chain, char) +BOOST_IOSTREAMS_DEFINE_FILTER_STREAM(wfiltering_stream, boost::iostreams::chain, wchar_t) typedef filtering_stream filtering_istream; typedef filtering_stream filtering_ostream; diff --git a/include/boost/iostreams/filtering_streambuf.hpp b/include/boost/iostreams/filtering_streambuf.hpp index 9186511..84338df 100755 --- a/include/boost/iostreams/filtering_streambuf.hpp +++ b/include/boost/iostreams/filtering_streambuf.hpp @@ -13,8 +13,8 @@ #include #include // allocator. +#include #include -#include #include #include #include // pubsync. @@ -51,8 +51,8 @@ namespace boost { namespace iostreams { ~name_() { if (this->is_complete()) this->BOOST_IOSTREAMS_PUBSYNC(); } \ }; \ /**/ -BOOST_IOSTREAMS_DEFINE_FILTER_STREAMBUF(filtering_streambuf, boost::iostreams::detail::chain, char) -BOOST_IOSTREAMS_DEFINE_FILTER_STREAMBUF(filtering_wstreambuf, boost::iostreams::detail::chain, wchar_t) +BOOST_IOSTREAMS_DEFINE_FILTER_STREAMBUF(filtering_streambuf, boost::iostreams::chain, char) +BOOST_IOSTREAMS_DEFINE_FILTER_STREAMBUF(filtering_wstreambuf, boost::iostreams::chain, wchar_t) typedef filtering_streambuf filtering_istreambuf; typedef filtering_streambuf filtering_ostreambuf; diff --git a/include/boost/iostreams/reverse.hpp b/include/boost/iostreams/reverse.hpp index a293c7f..8578430 100755 --- a/include/boost/iostreams/reverse.hpp +++ b/include/boost/iostreams/reverse.hpp @@ -15,10 +15,10 @@ #include #include // allocator. #include // BOOST_DEDUCED_TYPENAME. -#include +#include #include +#include #include -#include #include #include #include @@ -60,7 +60,7 @@ protected: typedef typename base_type::vector_type vector_type; void do_filter(const vector_type& src, vector_type& dest) { - detail::chain out; + chain out; out.push(filter_); out.push(iostreams::back_inserter(dest)); out.write(&src[0], (std::streamsize) src.size()); @@ -97,7 +97,7 @@ protected: typedef typename base_type::vector_type vector_type; void do_filter(const vector_type& src, vector_type& dest) { - detail::chain in; + chain in; in.push(filter_); in.push(make_iterator_range(src)); copy(in, iostreams::back_inserter(dest));