[Boost-commit] svn:boost r42471 - in trunk: boost/iostreams boost/iostreams/detail/config libs/iostreams/example libs/iostreams/test/detail

From: technews_at_[hidden]
Date: 2008-01-04 23:51:49

Author: turkanis
Date: 2008-01-04 23:51:49 EST (Fri, 04 Jan 2008)
New Revision: 42471
URL: http://svn.boost.org/trac/boost/changeset/42471

Log:
merged changes from iostreams_dev, revisions 42441-42469; added 'std::' for Intel on Linux/Darwin; added STDCXX workaround for codecvt; fixed docs for invert.hpp
Text files modified: 
   trunk/boost/iostreams/code_converter.hpp                |    18 ++++++++----------                      
   trunk/boost/iostreams/detail/config/codecvt.hpp         |     4 +++-                                    
   trunk/boost/iostreams/invert.hpp                        |     5 +++--                                   
   trunk/libs/iostreams/example/container_device.hpp       |     3 ++-                                     
   trunk/libs/iostreams/test/detail/utf8_codecvt_facet.hpp |     1 +                                       
   5 files changed, 17 insertions(+), 14 deletions(-)

Modified: trunk/boost/iostreams/code_converter.hpp
==============================================================================
--- trunk/boost/iostreams/code_converter.hpp	(original)
+++ trunk/boost/iostreams/code_converter.hpp	2008-01-04 23:51:49 EST (Fri, 04 Jan 2008)
@@ -311,7 +311,6 @@
 std::streamsize code_converter<Device, Codevt, Alloc>::read
     (char_type* s, std::streamsize n)
 {
-    using namespace std;
     const extern_type*   next;        // Next external char.
     intern_type*         nint;        // Next internal char.
     std::streamsize      total = 0;   // Characters read.
@@ -338,12 +337,12 @@
         total = static_cast<std::streamsize>(nint - s);
 
         switch (result) {
-        case codecvt_base::partial:
+        case std::codecvt_base::partial:
             partial = true;
             break;
-        case codecvt_base::ok:
+        case std::codecvt_base::ok:
             break;
-        case codecvt_base::noconv:
+        case std::codecvt_base::noconv:
             {
                 std::streamsize amt = 
                     std::min<std::streamsize>(next - buf.ptr(), n - total);
@@ -351,7 +350,7 @@
                 total += amt;
             }
             break;
-        case codecvt_base::error:
+        case std::codecvt_base::error:
         default:
             buf.state() = state_type();
             throw code_conversion_error();
@@ -366,7 +365,6 @@
 std::streamsize code_converter<Device, Codevt, Alloc>::write
     (const char_type* s, std::streamsize n)
 {
-    using namespace std;
     buffer_type&        buf = out();
     extern_type*        next;              // Next external char.
     const intern_type*  nint;              // Next internal char.
@@ -391,12 +389,12 @@
         buf.eptr() += progress;
 
         switch (result) {
-        case codecvt_base::partial:
+        case std::codecvt_base::partial:
             partial = true; // Fall through.
-        case codecvt_base::ok:
+        case std::codecvt_base::ok:
             total = static_cast<std::streamsize>(nint - s);
             break;
-        case codecvt_base::noconv:
+        case std::codecvt_base::noconv:
             {
                 std::streamsize amt = 
                     std::min<std::streamsize>( nint - total - s, 
@@ -405,7 +403,7 @@
                 total += amt;
             }
             break;
-        case codecvt_base::error:
+        case std::codecvt_base::error:
         default:
             buf.state() = state_type();
             throw code_conversion_error();

Modified: trunk/boost/iostreams/detail/config/codecvt.hpp
==============================================================================
--- trunk/boost/iostreams/detail/config/codecvt.hpp	(original)
+++ trunk/boost/iostreams/detail/config/codecvt.hpp	2008-01-04 23:51:49 EST (Fri, 04 Jan 2008)
@@ -40,7 +40,9 @@
 
 //------------------Normalize codecvt::length---------------------------------//
 
-#if !defined(__MSL_CPP__) && !defined(__LIBCOMO__)
+#if !defined(__MSL_CPP__) && !defined(__LIBCOMO__) && \
+    (!defined(BOOST_RWSTD_VER) || BOOST_RWSTD_VER < 0x04010300)
+    /**/
 # define BOOST_IOSTREAMS_CODECVT_CV_QUALIFIER const
 #else
 # define BOOST_IOSTREAMS_CODECVT_CV_QUALIFIER

Modified: trunk/boost/iostreams/invert.hpp
==============================================================================
--- trunk/boost/iostreams/invert.hpp	(original)
+++ trunk/boost/iostreams/invert.hpp	2008-01-04 23:51:49 EST (Fri, 04 Jan 2008)
@@ -36,8 +36,9 @@
 //
 // Template name: inverse.
 // Template paramters:
-//      Filter - A filter adapter which 
-// Description: Returns an instance of an appropriate specialization of inverse.
+//      Filter - A model of InputFilter or OutputFilter.
+// Description: Generates an InputFilter from an OutputFilter or
+//      vice versa.
 //
 template<typename Filter>
 class inverse {

Modified: trunk/libs/iostreams/example/container_device.hpp
==============================================================================
--- trunk/libs/iostreams/example/container_device.hpp	(original)
+++ trunk/libs/iostreams/example/container_device.hpp	2008-01-04 23:51:49 EST (Fri, 04 Jan 2008)
@@ -30,7 +30,8 @@
     std::streamsize read(char_type* s, std::streamsize n)
     {
         using namespace std;
-        std::streamsize amt = static_cast<streamsize>(container_.size() - pos_);
+        std::streamsize amt = 
+            static_cast<std::streamsize>(container_.size() - pos_);
         std::streamsize result = (min)(n, amt);
         if (result != 0) {
             std::copy( container_.begin() + pos_,

Modified: trunk/libs/iostreams/test/detail/utf8_codecvt_facet.hpp
==============================================================================
--- trunk/libs/iostreams/test/detail/utf8_codecvt_facet.hpp	(original)
+++ trunk/libs/iostreams/test/detail/utf8_codecvt_facet.hpp	2008-01-04 23:51:49 EST (Fri, 04 Jan 2008)
@@ -52,6 +52,7 @@
 
 #include <locale>
 #include <cstddef> // size_t
+#include <wchar.h> // mbstate_t
 #include <boost/integer_traits.hpp>
 #include <boost/iostreams/detail/config/wide_streams.hpp>
 #include <boost/iostreams/detail/codecvt_helper.hpp>