From 66d9baaed342cb7eefcdde745f2197bbf0874fb9 Mon Sep 17 00:00:00 2001
From: Jonathan Turkanis <j@coderage.com>
Date: Fri, 20 May 2005 05:51:06 +0000
Subject: [PATCH] renamed combined_view --> combination

[SVN r29097]
---
 include/boost/iostreams/combine.hpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/boost/iostreams/combine.hpp b/include/boost/iostreams/combine.hpp
index c1054c3..2736082 100755
--- a/include/boost/iostreams/combine.hpp
+++ b/include/boost/iostreams/combine.hpp
@@ -113,7 +113,7 @@ private:
 };
 
 template<typename In, typename Out>
-struct combined_traits 
+struct combination_traits 
     : mpl::if_<
           is_device<In>,
           combined_device<
@@ -130,11 +130,11 @@ struct combined_traits
 } // End namespace detail.
 
 template<typename In, typename Out>
-struct combined_view : detail::combined_traits<In, Out>::type {
-    typedef typename detail::combined_traits<In, Out>::type  base_type;
+struct combination : detail::combination_traits<In, Out>::type {
+    typedef typename detail::combination_traits<In, Out>::type  base_type;
     typedef typename detail::wrapped_type<In>::type          in_type;
     typedef typename detail::wrapped_type<Out>::type         out_type;
-    combined_view(const in_type& in, const out_type& out)
+    combination(const in_type& in, const out_type& out)
         : base_type(in, out) { }
 };
 
@@ -143,7 +143,7 @@ namespace detail {
 // Workaround for VC6 ETI bug.
 template<typename In, typename Out>
 struct combine_traits {
-    typedef combined_view<
+    typedef combination<
                 BOOST_DEDUCED_TYPENAME detail::unwrapped_type<In>::type, 
                 BOOST_DEDUCED_TYPENAME detail::unwrapped_type<Out>::type
             > type;