Subject: [Boost-commit] svn:boost r77368 - in branches/release: boost/iostreams boost/iostreams/detail boost/iostreams/detail/adapter boost/iostreams/detail/streambuf boost/iostreams/filter libs/iostreams libs/iostreams/doc/classes libs/iostreams/src libs/iostreams/test
From: dnljms_at_[hidden]
Date: 2012-03-18 09:47:01
Author: danieljames
Date: 2012-03-18 09:46:59 EDT (Sun, 18 Mar 2012)
New Revision: 77368
URL: http://svn.boost.org/trac/boost/changeset/77368
Log:
Iostreams: Merge from trunk.
- [74728] Eliminate unit_test_framework and BOOST_MESSAGE.
- [76301] Fixes #5908.
- [76941] Fix typos in comments. Fixes #6530.
- [76973] Remove extra semi-colons, which break with trunk Boost.Test.
- [77174] Fix parameters for filter::close. Fixes #6650.
Properties modified:
branches/release/boost/iostreams/ (props changed)
branches/release/libs/iostreams/ (props changed)
Text files modified:
branches/release/boost/iostreams/chain.hpp | 2
branches/release/boost/iostreams/close.hpp | 2
branches/release/boost/iostreams/combine.hpp | 8 +++---
branches/release/boost/iostreams/compose.hpp | 4 +-
branches/release/boost/iostreams/detail/adapter/range_adapter.hpp | 2
branches/release/boost/iostreams/detail/buffer.hpp | 4 +-
branches/release/boost/iostreams/detail/restrict_impl.hpp | 6 ++--
branches/release/boost/iostreams/detail/streambuf/chainbuf.hpp | 2
branches/release/boost/iostreams/filter/aggregate.hpp | 2
branches/release/boost/iostreams/filter/counter.hpp | 2
branches/release/boost/iostreams/filter/line.hpp | 2
branches/release/boost/iostreams/invert.hpp | 4 +-
branches/release/boost/iostreams/stream.hpp | 8 +++---
branches/release/boost/iostreams/tee.hpp | 4 +-
branches/release/libs/iostreams/doc/classes/filter.html | 16 +++++-------
branches/release/libs/iostreams/src/gzip.cpp | 2
branches/release/libs/iostreams/test/gzip_test.cpp | 41 ++++++++++++++++++++++++++++++++
branches/release/libs/iostreams/test/mapped_file_test.cpp | 21 ++++++++--------
branches/release/libs/iostreams/test/newline_test.cpp | 50 ++++++++++++++++++++--------------------
19 files changed, 110 insertions(+), 72 deletions(-)
Modified: branches/release/boost/iostreams/chain.hpp
==============================================================================
--- branches/release/boost/iostreams/chain.hpp (original)
+++ branches/release/boost/iostreams/chain.hpp 2012-03-18 09:46:59 EDT (Sun, 18 Mar 2012)
@@ -84,7 +84,7 @@
//
// Concept name: Chain.
// Description: Represents a chain of stream buffers which provides access
-// to the first buffer in the chain and send notifications when the
+// to the first buffer in the chain and sends notifications when the
// streambufs are added to or removed from chain.
// Refines: Closable device with mode equal to typename Chain::mode.
// Models: chain, converting_chain.
Modified: branches/release/boost/iostreams/close.hpp
==============================================================================
--- branches/release/boost/iostreams/close.hpp (original)
+++ branches/release/boost/iostreams/close.hpp 2012-03-18 09:46:59 EDT (Sun, 18 Mar 2012)
@@ -73,7 +73,7 @@
boost::iostreams::close(t, snk, BOOST_IOS::out);
}
-} // End namespaces detail.
+} // End namespace detail.
} } // End namespaces iostreams, boost.
Modified: branches/release/boost/iostreams/combine.hpp
==============================================================================
--- branches/release/boost/iostreams/combine.hpp (original)
+++ branches/release/boost/iostreams/combine.hpp 2012-03-18 09:46:59 EDT (Sun, 18 Mar 2012)
@@ -37,7 +37,7 @@
//
// Template name: combined_device.
// Description: Model of Device defined in terms of a Source/Sink pair.
-// Template paramters:
+// Template parameters:
// Source - A model of Source, with the same char_type and traits_type
// as Sink.
// Sink - A model of Sink, with the same char_type and traits_type
@@ -77,7 +77,7 @@
//
// Template name: combined_filter.
// Description: Model of Device defined in terms of a Source/Sink pair.
-// Template paramters:
+// Template parameters:
// InputFilter - A model of InputFilter, with the same char_type as
// OutputFilter.
// OutputFilter - A model of OutputFilter, with the same char_type as
@@ -179,9 +179,9 @@
//
// Template name: combine.
// Description: Takes a Source/Sink pair or InputFilter/OutputFilter pair and
-// returns a Reource or Filter which performs input using the first member
+// returns a Source or Filter which performs input using the first member
// of the pair and output using the second member of the pair.
-// Template paramters:
+// Template parameters:
// In - A model of Source or InputFilter, with the same char_type as Out.
// Out - A model of Sink or OutputFilter, with the same char_type as In.
//
Modified: branches/release/boost/iostreams/compose.hpp
==============================================================================
--- branches/release/boost/iostreams/compose.hpp (original)
+++ branches/release/boost/iostreams/compose.hpp 2012-03-18 09:46:59 EDT (Sun, 18 Mar 2012)
@@ -55,7 +55,7 @@
//
// Template name: composite_device.
// Description: Provides a Device view of a Filter, Device pair.
-// Template paramters:
+// Template parameters:
// Filter - A model of Filter.
// Device - An indirect model of Device.
//
@@ -115,7 +115,7 @@
//
// Template name: composite_device.
// Description: Provides a Device view of a Filter, Device pair.
-// Template paramters:
+// Template parameters:
// Filter - A model of Filter.
// Device - An indirect model of Device.
//
Modified: branches/release/boost/iostreams/detail/adapter/range_adapter.hpp
==============================================================================
--- branches/release/boost/iostreams/detail/adapter/range_adapter.hpp (original)
+++ branches/release/boost/iostreams/detail/adapter/range_adapter.hpp 2012-03-18 09:46:59 EDT (Sun, 18 Mar 2012)
@@ -36,7 +36,7 @@
//
// Template name: range_adapter
// Description: Device based on an instance of boost::iterator_range.
-// Template paramters:
+// Template parameters:
// Mode - A mode tag.
// Range - An instance of iterator_range.
//
Modified: branches/release/boost/iostreams/detail/buffer.hpp
==============================================================================
--- branches/release/boost/iostreams/detail/buffer.hpp (original)
+++ branches/release/boost/iostreams/detail/buffer.hpp 2012-03-18 09:46:59 EDT (Sun, 18 Mar 2012)
@@ -30,7 +30,7 @@
//
// Template name: buffer
// Description: Character buffer.
-// Template paramters:
+// Template parameters:
// Ch - The character type.
// Alloc - The Allocator type.
//
@@ -69,7 +69,7 @@
// Template name: buffer
// Description: Character buffer with two pointers accessible via ptr() and
// eptr().
-// Template paramters:
+// Template parameters:
// Ch - A character type.
//
template< typename Ch,
Modified: branches/release/boost/iostreams/detail/restrict_impl.hpp
==============================================================================
--- branches/release/boost/iostreams/detail/restrict_impl.hpp (original)
+++ branches/release/boost/iostreams/detail/restrict_impl.hpp 2012-03-18 09:46:59 EDT (Sun, 18 Mar 2012)
@@ -56,7 +56,7 @@
//
// Template name: restricted_indirect_device.
// Description: Provides an restricted view of an indirect Device.
-// Template paramters:
+// Template parameters:
// Device - An indirect model of Device that models either Source or
// SeekableDevice.
//
@@ -88,7 +88,7 @@
//
// Template name: restricted_direct_device.
// Description: Provides an restricted view of a Direct Device.
-// Template paramters:
+// Template parameters:
// Device - A model of Direct and Device.
//
template<typename Device>
@@ -118,7 +118,7 @@
//
// Template name: restricted_filter.
// Description: Provides an restricted view of a Filter.
-// Template paramters:
+// Template parameters:
// Filter - An indirect model of Filter.
//
template<typename Filter>
Modified: branches/release/boost/iostreams/detail/streambuf/chainbuf.hpp
==============================================================================
--- branches/release/boost/iostreams/detail/streambuf/chainbuf.hpp (original)
+++ branches/release/boost/iostreams/detail/streambuf/chainbuf.hpp 2012-03-18 09:46:59 EDT (Sun, 18 Mar 2012)
@@ -31,7 +31,7 @@
// Template name: chainbuf.
// Description: Stream buffer which operates by delegating to the first
// linked_streambuf in a chain.
-// Template paramters:
+// Template parameters:
// Chain - The chain type.
//
template<typename Chain, typename Mode, typename Access>
Modified: branches/release/boost/iostreams/filter/aggregate.hpp
==============================================================================
--- branches/release/boost/iostreams/filter/aggregate.hpp (original)
+++ branches/release/boost/iostreams/filter/aggregate.hpp 2012-03-18 09:46:59 EDT (Sun, 18 Mar 2012)
@@ -33,7 +33,7 @@
//
// Template name: aggregate_filter.
-// Template paramters:
+// Template parameters:
// Ch - The character type.
// Alloc - The allocator type.
// Description: Utility for defining DualUseFilters which filter an
Modified: branches/release/boost/iostreams/filter/counter.hpp
==============================================================================
--- branches/release/boost/iostreams/filter/counter.hpp (original)
+++ branches/release/boost/iostreams/filter/counter.hpp 2012-03-18 09:46:59 EDT (Sun, 18 Mar 2012)
@@ -25,7 +25,7 @@
//
// Template name: basic_counter.
-// Template paramters:
+// Template parameters:
// Ch - The character type.
// Description: Filter which counts lines and characters.
//
Modified: branches/release/boost/iostreams/filter/line.hpp
==============================================================================
--- branches/release/boost/iostreams/filter/line.hpp (original)
+++ branches/release/boost/iostreams/filter/line.hpp 2012-03-18 09:46:59 EDT (Sun, 18 Mar 2012)
@@ -31,7 +31,7 @@
//
// Template name: line_filter.
-// Template paramters:
+// Template parameters:
// Ch - The character type.
// Alloc - The allocator type.
// Description: Filter which processes data one line at a time.
Modified: branches/release/boost/iostreams/invert.hpp
==============================================================================
--- branches/release/boost/iostreams/invert.hpp (original)
+++ branches/release/boost/iostreams/invert.hpp 2012-03-18 09:46:59 EDT (Sun, 18 Mar 2012)
@@ -36,7 +36,7 @@
//
// Template name: inverse.
-// Template paramters:
+// Template parameters:
// Filter - A model of InputFilter or OutputFilter.
// Description: Generates an InputFilter from an OutputFilter or
// vice versa.
@@ -151,7 +151,7 @@
//
// Template name: invert.
-// Template paramters:
+// Template parameters:
// Filter - A model of InputFilter or OutputFilter.
// Description: Returns an instance of an appropriate specialization of inverse.
//
Modified: branches/release/boost/iostreams/stream.hpp
==============================================================================
--- branches/release/boost/iostreams/stream.hpp (original)
+++ branches/release/boost/iostreams/stream.hpp 2012-03-18 09:46:59 EDT (Sun, 18 Mar 2012)
@@ -31,7 +31,7 @@
typedef Tr traits_type;
typedef typename category_of<Device>::type mode;
typedef typename
- iostreams::select< // Dismbiguation required for Tru64.
+ iostreams::select< // Disambiguation required for Tru64.
mpl::and_<
is_convertible<mode, input>,
is_convertible<mode, output>
@@ -43,7 +43,7 @@
BOOST_IOSTREAMS_BASIC_OSTREAM(char_type, traits_type)
>::type stream_type;
typedef typename
- iostreams::select< // Dismbiguation required for Tru64.
+ iostreams::select< // Disambiguation required for Tru64.
mpl::and_<
is_convertible<mode, input>,
is_convertible<mode, output>
@@ -57,7 +57,7 @@
};
// By encapsulating initialization in a base, we can define the macro
-// BOOST_IOSTREAMS_DEFINE_FORWARDING_FUNCTIONS to generate constuctors
+// BOOST_IOSTREAMS_DEFINE_FORWARDING_FUNCTIONS to generate constructors
// without base member initializer lists.
template< typename Device,
typename Tr =
@@ -96,7 +96,7 @@
// Template name: stream.
// Description: A iostream which reads from and writes to an instance of a
// designated device type.
-// Template paramters:
+// Template parameters:
// Device - A device type.
// Alloc - The allocator type.
//
Modified: branches/release/boost/iostreams/tee.hpp
==============================================================================
--- branches/release/boost/iostreams/tee.hpp (original)
+++ branches/release/boost/iostreams/tee.hpp 2012-03-18 09:46:59 EDT (Sun, 18 Mar 2012)
@@ -31,7 +31,7 @@
//
// Template name: tee_filter.
-// Template paramters:
+// Template parameters:
// Device - A blocking Sink.
//
template<typename Device>
@@ -99,7 +99,7 @@
//
// Template name: tee_device.
-// Template paramters:
+// Template parameters:
// Device - A blocking Device.
// Sink - A blocking Sink.
//
Modified: branches/release/libs/iostreams/doc/classes/filter.html
==============================================================================
--- branches/release/libs/iostreams/doc/classes/filter.html (original)
+++ branches/release/libs/iostreams/doc/classes/filter.html 2012-03-18 09:46:59 EDT (Sun, 18 Mar 2012)
@@ -63,7 +63,7 @@
<SPAN CLASS="keyword">typedef</SPAN> wfilter<dual_use> dual_use_wfilter;
<SPAN CLASS="keyword"><SPAN CLASS="keyword">template</SPAN></SPAN><<SPAN CLASS="keyword">typename</SPAN> Mode, <SPAN CLASS="keyword">typename</SPAN> Ch = <SPAN CLASS="keyword">char</SPAN>>
-<SPAN CLASS="keyword">struct</SPAN> <A CLASS="documented" HREF="#multichar_filter">multichar_filter</A> : filter<Mode, Ch> {
+<SPAN CLASS="keyword">struct</SPAN> <A CLASS="documented" HREF="#multichar_filter">multichar_filter</A> : filter<Mode, Ch> {
<SPAN CLASS="keyword">typedef</SPAN> <A STYLE="text-decoration:none" HREF="#category"><SPAN CLASS="omitted">see below</SPAN></A> category;
};
@@ -83,12 +83,12 @@
<SPAN CLASS="keyword">typedef</SPAN> <A STYLE="text-decoration:none" HREF="#category"><SPAN CLASS="omitted">see below</SPAN></A> category;
<SPAN CLASS="keyword">template</SPAN><<SPAN CLASS="keyword">typename</SPAN> Device>
- <SPAN CLASS="keyword">void</SPAN> <A CLASS="documented" HREF="#close">close</A>(Device&);
+ <SPAN CLASS="keyword">void</SPAN> <A CLASS="documented" HREF="#close">close</A>(Device&);
<SPAN CLASS="keyword">template</SPAN><<SPAN CLASS="keyword">typename</SPAN> Device>
- <SPAN CLASS="keyword">void</SPAN> <A CLASS="documented" HREF="#close">close</A>(std::ios_base::openmode, Device&);
+ <SPAN CLASS="keyword">void</SPAN> <A CLASS="documented" HREF="#close">close</A>(Device&, std::ios_base::openmode);
- <SPAN CLASS="keyword">void</SPAN> <A CLASS="documented" HREF="#imbue">imbue</A>(<SPAN CLASS="keyword">const</SPAN> std::locale&);
+ <SPAN CLASS="keyword">void</SPAN> <A CLASS="documented" HREF="#imbue">imbue</A>(<SPAN CLASS="keyword">const</SPAN> std::locale&);
};
} } <SPAN CLASS="comment">// End namespace boost::io</SPAN></PRE>
@@ -104,7 +104,6 @@
<H4>Template parameters</H4>
<TABLE STYLE="margin-left:2em" BORDER=0 CELLPADDING=2>
-<TR>
<TR>
<TD VALIGN="top"><I>Mode</I></TD><TD WIDTH="2em" VALIGN="top">-</TD>
<TD>A mode tag.</TD>
@@ -128,10 +127,10 @@
<H4><CODE>filter::close</CODE></H4>
<PRE CLASS="broken_ie"> <SPAN CLASS="keyword">template</SPAN><<SPAN CLASS="keyword">typename</SPAN> Device>
- <SPAN CLASS="keyword">void</SPAN> <A CLASS="documented" HREF="#close">close</A>(Device&);
+ <SPAN CLASS="keyword">void</SPAN> <A CLASS="documented" HREF="#close">close</A>(Device&);
<SPAN CLASS="keyword">template</SPAN><<SPAN CLASS="keyword">typename</SPAN> Device>
- <SPAN CLASS="keyword">void</SPAN> <A CLASS="documented" HREF="#close">close</A>(std::ios_base::openmode, Device&);</PRE>
+ <SPAN CLASS="keyword">void</SPAN> <A CLASS="documented" HREF="#close">close</A>(Device&, std::ios_base::openmode);</PRE>
<P>
Both overloads are implemented as no-ops. The second is available only if Mode is convertible to bidirectional. The first is available only if Mode is <I>not</I> convertible to bidirectional.
@@ -142,7 +141,7 @@
<A NAME="imbue"></A>
<H4><CODE>filter::imbue</CODE></H4>
-<PRE CLASS="broken_ie"> <SPAN CLASS="keyword">void</SPAN> <A CLASS="documented" HREF="#imbue">imbue</A>(<SPAN CLASS="keyword">const</SPAN> std::locale&);</PRE>
+<PRE CLASS="broken_ie"> <SPAN CLASS="keyword">void</SPAN> <A CLASS="documented" HREF="#imbue">imbue</A>(<SPAN CLASS="keyword">const</SPAN> std::locale&);</PRE>
<P>
Implemented as a no-op. Required by Localizable.
@@ -159,7 +158,6 @@
<H4>Template parameters</H4>
<TABLE STYLE="margin-left:2em" BORDER=0 CELLPADDING=2>
-<TR>
<TR>
<TD VALIGN="top"><I>Mode</I></TD><TD WIDTH="2em" VALIGN="top">-</TD>
<TD>A mode tag.</TD>
Modified: branches/release/libs/iostreams/src/gzip.cpp
==============================================================================
--- branches/release/libs/iostreams/src/gzip.cpp (original)
+++ branches/release/libs/iostreams/src/gzip.cpp 2012-03-18 09:46:59 EDT (Sun, 18 Mar 2012)
@@ -62,7 +62,7 @@
case s_os:
os_ = value;
if (flags_ & gzip::flags::extra) {
- state_ = s_extra;
+ state_ = s_xlen;
} else if (flags_ & gzip::flags::name) {
state_ = s_name;
} else if (flags_ & gzip::flags::comment) {
Modified: branches/release/libs/iostreams/test/gzip_test.cpp
==============================================================================
--- branches/release/libs/iostreams/test/gzip_test.cpp (original)
+++ branches/release/libs/iostreams/test/gzip_test.cpp 2012-03-18 09:46:59 EDT (Sun, 18 Mar 2012)
@@ -5,6 +5,7 @@
// See http://www.boost.org/libs/iostreams for documentation.
+#include <cstddef>
#include <string>
#include <boost/iostreams/copy.hpp>
#include <boost/iostreams/device/array.hpp>
@@ -111,11 +112,51 @@
BOOST_CHECK_EQUAL(data, res);
}
+void header_test()
+{
+ // This test is in response to https://svn.boost.org/trac/boost/ticket/5908
+ // which describes a problem parsing gzip headers with extra fields as
+ // defined in RFC 1952 (http://www.ietf.org/rfc/rfc1952.txt).
+ // The extra field data used here is characteristic of the tabix file
+ // format (http://samtools.sourceforge.net/tabix.shtml).
+ const char header_bytes[] = {
+ gzip::magic::id1,
+ gzip::magic::id2,
+ gzip::method::deflate, // Compression Method: deflate
+ gzip::flags::extra | gzip::flags::name | gzip::flags::comment, // flags
+ 0x22, 0x9c, 0xf3, 0x4e, // 4 byte modification time (little endian)
+ gzip::extra_flags::best_compression, // XFL
+ gzip::os_unix, // OS
+ 6, 0, // 2 byte length of extra field (little endian, 6 bytes)
+ 'B', 'C', 2, 0, 0, 0, // 6 bytes worth of extra field data
+ 'a', 'b', 'c', 0, // original filename, null terminated
+ 'n', 'o', ' ', 'c', 'o', 'm', 'm', 'e', 'n', 't', 0, // comment
+ };
+ size_t sz = sizeof(header_bytes)/sizeof(header_bytes[0]);
+
+ boost::iostreams::detail::gzip_header hdr;
+ for (size_t i = 0; i < sz; ++i) {
+ hdr.process(header_bytes[i]);
+
+ // Require that we are done at the last byte, not before.
+ if (i == sz-1)
+ BOOST_REQUIRE(hdr.done());
+ else
+ BOOST_REQUIRE(!hdr.done());
+ }
+
+ BOOST_CHECK_EQUAL("abc", hdr.file_name());
+ BOOST_CHECK_EQUAL("no comment", hdr.comment());
+ BOOST_CHECK_EQUAL(0x4ef39c22, hdr.mtime());
+ BOOST_CHECK_EQUAL(gzip::os_unix, hdr.os());
+}
+
test_suite* init_unit_test_suite(int, char* [])
{
test_suite* test = BOOST_TEST_SUITE("gzip test");
test->add(BOOST_TEST_CASE(&compression_test));
test->add(BOOST_TEST_CASE(&multiple_member_test));
test->add(BOOST_TEST_CASE(&array_source_test));
+ test->add(BOOST_TEST_CASE(&header_test));
return test;
}
Modified: branches/release/libs/iostreams/test/mapped_file_test.cpp
==============================================================================
--- branches/release/libs/iostreams/test/mapped_file_test.cpp (original)
+++ branches/release/libs/iostreams/test/mapped_file_test.cpp 2012-03-18 09:46:59 EDT (Sun, 18 Mar 2012)
@@ -16,7 +16,6 @@
#include <fstream>
#include <boost/config.hpp>
#include <boost/detail/workaround.hpp>
-#include <boost/test/test_tools.hpp>
#include <boost/test/unit_test.hpp>
#include <boost/iostreams/stream.hpp>
@@ -66,7 +65,7 @@
void mapped_file_test()
{
using namespace boost::iostreams;
- BOOST_MESSAGE("about to begin");
+ BOOST_TEST_MESSAGE("about to begin");
//--------------Reading from a mapped_file_source-------------------------//
@@ -86,7 +85,7 @@
"failed reading from stream<mapped_file_source> in chars"
);
- BOOST_MESSAGE(
+ BOOST_TEST_MESSAGE(
"done reading from stream<mapped_file_source> in chars"
);
}
@@ -103,7 +102,7 @@
"failed reading from stream<mapped_file_source> in chunks"
);
- BOOST_MESSAGE(
+ BOOST_TEST_MESSAGE(
"done reading from stream<mapped_file_source> in chunks"
);
}
@@ -126,7 +125,7 @@
"failed writing to stream<mapped_file_sink> in chars"
);
- BOOST_MESSAGE(
+ BOOST_TEST_MESSAGE(
"done writing to stream<mapped_file_source> in chars"
);
@@ -140,7 +139,7 @@
"failed writing to stream<mapped_file_sink> in chunks"
);
- BOOST_MESSAGE(
+ BOOST_TEST_MESSAGE(
"done writing to stream<mapped_file_source> in chunks"
);
}
@@ -206,7 +205,7 @@
"failed seeking within stream<mapped_file> in chars"
);
- BOOST_MESSAGE(
+ BOOST_TEST_MESSAGE(
"done seeking within stream<mapped_file> in chars"
);
@@ -221,7 +220,7 @@
"failed seeking within stream<mapped_file> in chunks"
);
- BOOST_MESSAGE(
+ BOOST_TEST_MESSAGE(
"done seeking within stream<mapped_file> in chunks"
);
}
@@ -238,7 +237,7 @@
"failed resizing a mapped_file"
);
- BOOST_MESSAGE(
+ BOOST_TEST_MESSAGE(
"done resizing a mapped_file"
);
}
@@ -263,7 +262,7 @@
"failed writing to private mapped_file"
);
- BOOST_MESSAGE(
+ BOOST_TEST_MESSAGE(
"done seeking within private mapped_file"
);
@@ -280,7 +279,7 @@
"failed writing to reopened private mapped_file"
);
- BOOST_MESSAGE(
+ BOOST_TEST_MESSAGE(
"done reopening private mapped_file"
);
}
Modified: branches/release/libs/iostreams/test/newline_test.cpp
==============================================================================
--- branches/release/libs/iostreams/test/newline_test.cpp (original)
+++ branches/release/libs/iostreams/test/newline_test.cpp 2012-03-18 09:46:59 EDT (Sun, 18 Mar 2012)
@@ -319,43 +319,43 @@
BOOST_CHECK_THROW(
test_input_against_flags(io::newline::dos, ::posix, true),
io::newline_error
- )
+ );
BOOST_CHECK_THROW(
test_input_against_flags(io::newline::mac, ::posix, true),
io::newline_error
- )
+ );
BOOST_CHECK_THROW(
test_input_against_flags(io::newline::posix, ::dos, true),
io::newline_error
- )
+ );
BOOST_CHECK_THROW(
test_input_against_flags(io::newline::mac, ::dos, true),
io::newline_error
- )
+ );
BOOST_CHECK_THROW(
test_input_against_flags(io::newline::posix, ::mac, true),
io::newline_error
- )
+ );
BOOST_CHECK_THROW(
test_input_against_flags(io::newline::dos, ::mac, true),
io::newline_error
- )
+ );
BOOST_CHECK_THROW(
test_input_against_flags(io::newline::final_newline, ::no_final_newline, true),
io::newline_error
- )
+ );
BOOST_CHECK_THROW(
test_input_against_flags(io::newline::posix, ::mixed, true),
io::newline_error
- )
+ );
BOOST_CHECK_THROW(
test_input_against_flags(io::newline::dos, ::mixed, true),
io::newline_error
- )
+ );
BOOST_CHECK_THROW(
test_input_against_flags(io::newline::mac, ::mixed, true),
io::newline_error
- )
+ );
}
void write_newline_checker()
@@ -367,7 +367,7 @@
out.push(io::newline_checker(io::newline::posix));
out.push(io::null_sink());
- BOOST_CHECK_NO_THROW(io::copy(string_source(::posix), out))
+ BOOST_CHECK_NO_THROW(io::copy(string_source(::posix), out));
checker = BOOST_IOSTREAMS_COMPONENT(out, 0, io::newline_checker);
BOOST_CHECK(checker->is_posix());
BOOST_CHECK(!checker->is_dos());
@@ -380,7 +380,7 @@
out.push(io::newline_checker(io::newline::dos));
out.push(io::null_sink());
- BOOST_CHECK_NO_THROW(io::copy(string_source(::dos), out))
+ BOOST_CHECK_NO_THROW(io::copy(string_source(::dos), out));
checker = BOOST_IOSTREAMS_COMPONENT(out, 0, io::newline_checker);
BOOST_CHECK(!checker->is_posix());
BOOST_CHECK(checker->is_dos());
@@ -393,7 +393,7 @@
out.push(io::newline_checker(io::newline::mac));
out.push(io::null_sink());
- BOOST_CHECK_NO_THROW(io::copy(string_source(::mac), out))
+ BOOST_CHECK_NO_THROW(io::copy(string_source(::mac), out));
checker = BOOST_IOSTREAMS_COMPONENT(out, 0, io::newline_checker);
BOOST_CHECK(!checker->is_posix());
BOOST_CHECK(!checker->is_dos());
@@ -406,7 +406,7 @@
out.push(io::newline_checker(io::newline::posix));
out.push(io::null_sink());
- BOOST_CHECK_NO_THROW(io::copy(string_source(::no_final_newline), out))
+ BOOST_CHECK_NO_THROW(io::copy(string_source(::no_final_newline), out));
checker = BOOST_IOSTREAMS_COMPONENT(out, 0, io::newline_checker);
BOOST_CHECK(checker->is_posix());
BOOST_CHECK(!checker->is_dos());
@@ -419,7 +419,7 @@
out.push(io::newline_checker());
out.push(io::null_sink());
- BOOST_CHECK_NO_THROW(io::copy(string_source(::mixed), out))
+ BOOST_CHECK_NO_THROW(io::copy(string_source(::mixed), out));
checker = BOOST_IOSTREAMS_COMPONENT(out, 0, io::newline_checker);
BOOST_CHECK(!checker->is_posix());
BOOST_CHECK(!checker->is_dos());
@@ -436,43 +436,43 @@
BOOST_CHECK_THROW(
test_input_against_flags(io::newline::dos, ::posix, false),
io::newline_error
- )
+ );
BOOST_CHECK_THROW(
test_input_against_flags(io::newline::mac, ::posix, false),
io::newline_error
- )
+ );
BOOST_CHECK_THROW(
test_input_against_flags(io::newline::posix, ::dos, false),
io::newline_error
- )
+ );
BOOST_CHECK_THROW(
test_input_against_flags(io::newline::mac, ::dos, false),
io::newline_error
- )
+ );
BOOST_CHECK_THROW(
test_input_against_flags(io::newline::posix, ::mac, false),
io::newline_error
- )
+ );
BOOST_CHECK_THROW(
test_input_against_flags(io::newline::dos, ::mac, false),
io::newline_error
- )
+ );
BOOST_CHECK_THROW(
test_input_against_flags(io::newline::final_newline, ::no_final_newline, false),
io::newline_error
- )
+ );
BOOST_CHECK_THROW(
test_input_against_flags(io::newline::posix, ::mixed, false),
io::newline_error
- )
+ );
BOOST_CHECK_THROW(
test_input_against_flags(io::newline::dos, ::mixed, false),
io::newline_error
- )
+ );
BOOST_CHECK_THROW(
test_input_against_flags(io::newline::mac, ::mixed, false),
io::newline_error
- )
+ );
}
test_suite* init_unit_test_suite(int, char* [])