[Boost-commit] svn:boost r42468 - branches/iostreams_dev/boost/iostreams

From: technews_at_[hidden]
Date: 2008-01-04 20:51:26

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

Log:
added more 'std::' qualifications for Intel Linux/Darwin, and removed some now usless using directives
Text files modified: 
   branches/iostreams_dev/boost/iostreams/code_converter.hpp |    18 ++++++++----------                      
   1 files changed, 8 insertions(+), 10 deletions(-)

Modified: branches/iostreams_dev/boost/iostreams/code_converter.hpp
==============================================================================
--- branches/iostreams_dev/boost/iostreams/code_converter.hpp	(original)
+++ branches/iostreams_dev/boost/iostreams/code_converter.hpp	2008-01-04 20:51:25 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();