Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r61059 - in branches/release: boost/iostreams libs/iostreams libs/iostreams/test
From: daniel_james_at_[hidden]
Date: 2010-04-05 03:31:43


Author: danieljames
Date: 2010-04-05 03:31:41 EDT (Mon, 05 Apr 2010)
New Revision: 61059
URL: http://svn.boost.org/trac/boost/changeset/61059

Log:
Small iostreams merge.

 - Minor test fix for some compilers.
 - Inspect fix.

Properties modified:
   branches/release/boost/iostreams/ (props changed)
   branches/release/libs/iostreams/ (props changed)
Text files modified:
   branches/release/libs/iostreams/test/stream_offset_64bit_test.cpp | 2 +-
   branches/release/libs/iostreams/test/wide_stream_test.cpp | 8 ++++----
   2 files changed, 5 insertions(+), 5 deletions(-)

Modified: branches/release/libs/iostreams/test/stream_offset_64bit_test.cpp
==============================================================================
--- branches/release/libs/iostreams/test/stream_offset_64bit_test.cpp (original)
+++ branches/release/libs/iostreams/test/stream_offset_64bit_test.cpp 2010-04-05 03:31:41 EDT (Mon, 05 Apr 2010)
@@ -57,7 +57,7 @@
               << static_cast<unsigned int>(off >> 32)
               << " and (off & 0xFFFFFFFF) == 0x"
               << static_cast<unsigned int>(off & 0xFFFFFFFF)
- << std::endl;
+ << std::endl;
             BOOST_REQUIRE_MESSAGE(0, s.str().c_str());
         }
     }

Modified: branches/release/libs/iostreams/test/wide_stream_test.cpp
==============================================================================
--- branches/release/libs/iostreams/test/wide_stream_test.cpp (original)
+++ branches/release/libs/iostreams/test/wide_stream_test.cpp 2010-04-05 03:31:41 EDT (Mon, 05 Apr 2010)
@@ -94,7 +94,7 @@
         write_data_in_chars(out);
         BOOST_CHECK_MESSAGE(
             first.size() == second.size() &&
- equal(first.begin(), first.end(), second.begin()),
+ std::equal(first.begin(), first.end(), second.begin()),
             "failed writing to filtering_wostream in chars with no buffer"
         );
     }
@@ -106,7 +106,7 @@
         write_data_in_chunks(out);
         BOOST_CHECK_MESSAGE(
             first.size() == second.size() &&
- equal(first.begin(), first.end(), second.begin()),
+ std::equal(first.begin(), first.end(), second.begin()),
             "failed writing to filtering_wostream in chunks with no buffer"
         );
     }
@@ -118,7 +118,7 @@
         write_data_in_chars(out);
         BOOST_CHECK_MESSAGE(
             first.size() == second.size() &&
- equal(first.begin(), first.end(), second.begin()),
+ std::equal(first.begin(), first.end(), second.begin()),
             "failed writing to filtering_wostream in chars with large buffer"
         );
     }
@@ -130,7 +130,7 @@
         write_data_in_chunks(out);
         BOOST_CHECK_MESSAGE(
             first.size() == second.size() &&
- equal(first.begin(), first.end(), second.begin()),
+ std::equal(first.begin(), first.end(), second.begin()),
             "failed writing to filtering_wostream in chunks with large buffer"
         );
     }


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