Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r61531 - trunk/boost/iostreams/filter
From: daniel_james_at_[hidden]
Date: 2010-04-24 09:00:33


Author: danieljames
Date: 2010-04-24 09:00:32 EDT (Sat, 24 Apr 2010)
New Revision: 61531
URL: http://svn.boost.org/trac/boost/changeset/61531

Log:
Fix compile error for Boost.Iostreams on clang.

The test still fails at runtime, although I don't think that's anything
to do with the newline filter. It seems to be caused by the combination
of Boost.Test and `<boost/iostreams/filter/test.hpp>`.
Text files modified:
   trunk/boost/iostreams/filter/newline.hpp | 22 +++++++++++-----------
   1 files changed, 11 insertions(+), 11 deletions(-)

Modified: trunk/boost/iostreams/filter/newline.hpp
==============================================================================
--- trunk/boost/iostreams/filter/newline.hpp (original)
+++ trunk/boost/iostreams/filter/newline.hpp 2010-04-24 09:00:32 EDT (Sat, 24 Apr 2010)
@@ -121,9 +121,9 @@
 
     explicit newline_filter(int target) : flags_(target)
     {
- if ( target != newline::posix &&
- target != newline::dos &&
- target != newline::mac )
+ if ( target != iostreams::newline::posix &&
+ target != iostreams::newline::dos &&
+ target != iostreams::newline::mac )
         {
             boost::throw_exception(std::logic_error("bad flags"));
         }
@@ -227,12 +227,12 @@
         using iostreams::newline::CR;
         using iostreams::newline::LF;
 
- switch (flags_ & newline::platform_mask) {
- case newline::posix:
+ switch (flags_ & iostreams::newline::platform_mask) {
+ case iostreams::newline::posix:
             return LF;
- case newline::mac:
+ case iostreams::newline::mac:
             return CR;
- case newline::dos:
+ case iostreams::newline::dos:
             if (flags_ & f_has_LF) {
                 flags_ &= ~f_has_LF;
                 return LF;
@@ -252,14 +252,14 @@
         using iostreams::newline::LF;
 
         bool success = false;
- switch (flags_ & newline::platform_mask) {
- case newline::posix:
+ switch (flags_ & iostreams::newline::platform_mask) {
+ case iostreams::newline::posix:
             success = boost::iostreams::put(dest, LF);
             break;
- case newline::mac:
+ case iostreams::newline::mac:
             success = boost::iostreams::put(dest, CR);
             break;
- case newline::dos:
+ case iostreams::newline::dos:
             if ((flags_ & f_has_LF) != 0) {
                 if ((success = boost::iostreams::put(dest, LF)))
                     flags_ &= ~f_has_LF;


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk