|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r67665 - in branches/release: boost/iostreams boost/iostreams/detail boost/iostreams/detail/adapter boost/iostreams/detail/streambuf boost/iostreams/filter libs/iostreams libs/iostreams/doc libs/iostreams/doc/classes libs/iostreams/doc/concepts libs/iostreams/src
From: dnljms_at_[hidden]
Date: 2011-01-04 18:09:07
Author: danieljames
Date: 2011-01-04 18:09:04 EST (Tue, 04 Jan 2011)
New Revision: 67665
URL: http://svn.boost.org/trac/boost/changeset/67665
Log:
Merge iostreams from trunk.
- Use `BOOST_ASSERT` instead of `assert`.
- Fix some documentation errors.
Properties modified:
branches/release/boost/iostreams/ (props changed)
branches/release/libs/iostreams/ (props changed)
Text files modified:
branches/release/boost/iostreams/chain.hpp | 4 ++--
branches/release/boost/iostreams/close.hpp | 4 ++--
branches/release/boost/iostreams/detail/adapter/range_adapter.hpp | 4 ++--
branches/release/boost/iostreams/detail/optional.hpp | 14 +++++++-------
branches/release/boost/iostreams/detail/streambuf/direct_streambuf.hpp | 6 +++---
branches/release/boost/iostreams/filter/aggregate.hpp | 6 +++---
branches/release/boost/iostreams/filter/gzip.hpp | 4 ++--
branches/release/boost/iostreams/filter/line.hpp | 6 +++---
branches/release/boost/iostreams/filter/newline.hpp | 8 ++++----
branches/release/boost/iostreams/filter/symmetric.hpp | 8 ++++----
branches/release/boost/iostreams/invert.hpp | 6 +++---
branches/release/boost/iostreams/tee.hpp | 10 +++++-----
branches/release/libs/iostreams/doc/classes/file_descriptor.html | 16 ++++++++--------
branches/release/libs/iostreams/doc/concepts/sink.html | 2 +-
branches/release/libs/iostreams/doc/release_notes.html | 4 ++++
branches/release/libs/iostreams/src/gzip.cpp | 4 ++--
16 files changed, 55 insertions(+), 51 deletions(-)
Modified: branches/release/boost/iostreams/chain.hpp
==============================================================================
--- branches/release/boost/iostreams/chain.hpp (original)
+++ branches/release/boost/iostreams/chain.hpp 2011-01-04 18:09:04 EST (Tue, 04 Jan 2011)
@@ -12,7 +12,7 @@
# pragma once
#endif
-#include <cassert>
+#include <boost/assert.hpp>
#include <exception>
#include <functional> // unary_function.
#include <iterator> // advance.
@@ -573,7 +573,7 @@
template<typename Self, typename Ch, typename Tr, typename Alloc, typename Mode>
void chain_base<Self, Ch, Tr, Alloc, Mode>::pop()
{
- assert(!empty());
+ BOOST_ASSERT(!empty());
if (auto_close())
pimpl_->close();
streambuf_type* buf = 0;
Modified: branches/release/boost/iostreams/close.hpp
==============================================================================
--- branches/release/boost/iostreams/close.hpp (original)
+++ branches/release/boost/iostreams/close.hpp 2011-01-04 18:09:04 EST (Tue, 04 Jan 2011)
@@ -97,7 +97,7 @@
void close(T& t, BOOST_IOS::openmode which)
{
#ifdef BOOST_IOSTREAMS_STRICT
- assert(which == BOOST_IOS::in || which == BOOST_IOS::out);
+ BOOST_ASSERT(which == BOOST_IOS::in || which == BOOST_IOS::out);
#else
if (which == (BOOST_IOS::in | BOOST_IOS::out)) {
detail::close_all(t);
@@ -111,7 +111,7 @@
void close(T& t, Sink& snk, BOOST_IOS::openmode which)
{
#ifdef BOOST_IOSTREAMS_STRICT
- assert(which == BOOST_IOS::in || which == BOOST_IOS::out);
+ BOOST_ASSERT(which == BOOST_IOS::in || which == BOOST_IOS::out);
#else
if (which == (BOOST_IOS::in | BOOST_IOS::out)) {
detail::close_all(t, snk);
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 2011-01-04 18:09:04 EST (Tue, 04 Jan 2011)
@@ -13,7 +13,7 @@
#endif
#include <algorithm> // min.
-#include <cassert>
+#include <boost/assert.hpp>
#include <cstddef> // ptrdiff_t.
#include <iosfwd> // streamsize, streamoff.
#include <boost/detail/iterator.hpp> // boost::iterator_traits.
@@ -175,7 +175,7 @@
cur = last + off;
break;
default:
- assert(0);
+ BOOST_ASSERT(0);
}
}
};
Modified: branches/release/boost/iostreams/detail/optional.hpp
==============================================================================
--- branches/release/boost/iostreams/detail/optional.hpp (original)
+++ branches/release/boost/iostreams/detail/optional.hpp 2011-01-04 18:09:04 EST (Tue, 04 Jan 2011)
@@ -18,7 +18,7 @@
# pragma once
#endif
-#include <cassert>
+#include <boost/assert.hpp>
#include <boost/mpl/int.hpp>
#include <boost/type_traits/aligned_storage.hpp>
#include <boost/type_traits/alignment_of.hpp>
@@ -52,32 +52,32 @@
~optional() { reset(); }
T& operator*()
{
- assert(initialized_);
+ BOOST_ASSERT(initialized_);
return *static_cast<T*>(address());
}
const T& operator*() const
{
- assert(initialized_);
+ BOOST_ASSERT(initialized_);
return *static_cast<const T*>(address());
}
T* operator->()
{
- assert(initialized_);
+ BOOST_ASSERT(initialized_);
return static_cast<T*>(address());
}
const T* operator->() const
{
- assert(initialized_);
+ BOOST_ASSERT(initialized_);
return static_cast<const T*>(address());
}
T* get()
{
- assert(initialized_);
+ BOOST_ASSERT(initialized_);
return static_cast<T*>(address());
}
const T* get() const
{
- assert(initialized_);
+ BOOST_ASSERT(initialized_);
return static_cast<const T*>(address());
}
void reset()
Modified: branches/release/boost/iostreams/detail/streambuf/direct_streambuf.hpp
==============================================================================
--- branches/release/boost/iostreams/detail/streambuf/direct_streambuf.hpp (original)
+++ branches/release/boost/iostreams/detail/streambuf/direct_streambuf.hpp 2011-01-04 18:09:04 EST (Tue, 04 Jan 2011)
@@ -12,7 +12,7 @@
# pragma once
#endif
-#include <cassert>
+#include <boost/assert.hpp>
#include <cstddef>
#include <typeinfo>
#include <utility> // pair.
@@ -234,7 +234,7 @@
case BOOST_IOS::beg: next = off; break;
case BOOST_IOS::cur: next = (gptr() - ibeg_) + off; break;
case BOOST_IOS::end: next = (iend_ - ibeg_) + off; break;
- default: assert(0);
+ default: BOOST_ASSERT(0);
}
if (next < 0 || next > (iend_ - ibeg_))
boost::throw_exception(bad_seek());
@@ -248,7 +248,7 @@
case BOOST_IOS::beg: next = off; break;
case BOOST_IOS::cur: next = (pptr() - obeg_) + off; break;
case BOOST_IOS::end: next = (oend_ - obeg_) + off; break;
- default: assert(0);
+ default: BOOST_ASSERT(0);
}
if (next < 0 || next > (oend_ - obeg_))
boost::throw_exception(bad_seek());
Modified: branches/release/boost/iostreams/filter/aggregate.hpp
==============================================================================
--- branches/release/boost/iostreams/filter/aggregate.hpp (original)
+++ branches/release/boost/iostreams/filter/aggregate.hpp 2011-01-04 18:09:04 EST (Tue, 04 Jan 2011)
@@ -13,7 +13,7 @@
#endif
#include <algorithm> // copy, min.
-#include <cassert>
+#include <boost/assert.hpp>
#include <iterator> // back_inserter
#include <vector>
#include <boost/iostreams/constants.hpp> // default_device_buffer_size
@@ -58,7 +58,7 @@
std::streamsize read(Source& src, char_type* s, std::streamsize n)
{
using namespace std;
- assert(!(state_ & f_write));
+ BOOST_ASSERT(!(state_ & f_write));
state_ |= f_read;
if (!(state_ & f_eof))
do_read(src);
@@ -74,7 +74,7 @@
template<typename Sink>
std::streamsize write(Sink&, const char_type* s, std::streamsize n)
{
- assert(!(state_ & f_read));
+ BOOST_ASSERT(!(state_ & f_read));
state_ |= f_write;
data_.insert(data_.end(), s, s + n);
return n;
Modified: branches/release/boost/iostreams/filter/gzip.hpp
==============================================================================
--- branches/release/boost/iostreams/filter/gzip.hpp (original)
+++ branches/release/boost/iostreams/filter/gzip.hpp 2011-01-04 18:09:04 EST (Tue, 04 Jan 2011)
@@ -19,7 +19,7 @@
#include <boost/config.hpp> // STATIC_CONSTANT, STDC_NAMESPACE,
// DINKUMWARE_STDLIB, __STL_CONFIG_H.
#include <algorithm> // min.
-#include <cassert>
+#include <boost/assert.hpp>
#include <cstdio> // EOF.
#include <cstddef> // size_t.
#include <ctime> // std::time_t.
@@ -548,7 +548,7 @@
else if(footer_.crc() != this->crc())
boost::throw_exception(gzip_error(gzip::bad_crc));
} else {
- assert(!"Bad state");
+ BOOST_ASSERT(!"Bad state");
}
}
state_ = s_start;
Modified: branches/release/boost/iostreams/filter/line.hpp
==============================================================================
--- branches/release/boost/iostreams/filter/line.hpp (original)
+++ branches/release/boost/iostreams/filter/line.hpp 2011-01-04 18:09:04 EST (Tue, 04 Jan 2011)
@@ -13,7 +13,7 @@
#endif
#include <algorithm> // min.
-#include <cassert>
+#include <boost/assert.hpp>
#include <memory> // allocator.
#include <string>
#include <boost/config.hpp> // BOOST_STATIC_CONSTANT.
@@ -73,7 +73,7 @@
std::streamsize read(Source& src, char_type* s, std::streamsize n)
{
using namespace std;
- assert(!(flags_ & f_write));
+ BOOST_ASSERT(!(flags_ & f_write));
flags_ |= f_read;
// Handle unfinished business.
@@ -98,7 +98,7 @@
std::streamsize write(Sink& snk, const char_type* s, std::streamsize n)
{
using namespace std;
- assert(!(flags_ & f_read));
+ BOOST_ASSERT(!(flags_ & f_read));
flags_ |= f_write;
// Handle unfinished business.
Modified: branches/release/boost/iostreams/filter/newline.hpp
==============================================================================
--- branches/release/boost/iostreams/filter/newline.hpp (original)
+++ branches/release/boost/iostreams/filter/newline.hpp 2011-01-04 18:09:04 EST (Tue, 04 Jan 2011)
@@ -15,7 +15,7 @@
# pragma once
#endif
-#include <cassert>
+#include <boost/assert.hpp>
#include <cstdio>
#include <stdexcept> // logic_error.
#include <boost/config.hpp> // BOOST_STATIC_CONSTANT.
@@ -34,7 +34,7 @@
#include <boost/iostreams/detail/config/disable_warnings.hpp>
#define BOOST_IOSTREAMS_ASSERT_UNREACHABLE(val) \
- (assert("unreachable code" == 0), val) \
+ (BOOST_ASSERT("unreachable code" == 0), val) \
/**/
namespace boost { namespace iostreams {
@@ -135,7 +135,7 @@
using iostreams::newline::CR;
using iostreams::newline::LF;
- assert((flags_ & f_write) == 0);
+ BOOST_ASSERT((flags_ & f_write) == 0);
flags_ |= f_read;
if (flags_ & (f_has_LF | f_has_EOF)) {
@@ -187,7 +187,7 @@
using iostreams::newline::CR;
using iostreams::newline::LF;
- assert((flags_ & f_read) == 0);
+ BOOST_ASSERT((flags_ & f_read) == 0);
flags_ |= f_write;
if ((flags_ & f_has_LF) != 0)
Modified: branches/release/boost/iostreams/filter/symmetric.hpp
==============================================================================
--- branches/release/boost/iostreams/filter/symmetric.hpp (original)
+++ branches/release/boost/iostreams/filter/symmetric.hpp 2011-01-04 18:09:04 EST (Tue, 04 Jan 2011)
@@ -41,7 +41,7 @@
# pragma once
#endif
-#include <cassert>
+#include <boost/assert.hpp>
#include <memory> // allocator, auto_ptr.
#include <boost/config.hpp> // BOOST_DEDUCED_TYPENAME.
#include <boost/iostreams/char_traits.hpp>
@@ -89,7 +89,7 @@
BOOST_PP_ENUM_BINARY_PARAMS(n, const T, &t) ) \
: pimpl_(new impl(buffer_size BOOST_PP_COMMA_IF(n) \
BOOST_PP_ENUM_PARAMS(n, t))) \
- { assert(buffer_size > 0); } \
+ { BOOST_ASSERT(buffer_size > 0); } \
/**/
#define BOOST_PP_LOCAL_LIMITS (0, BOOST_IOSTREAMS_MAX_FORWARDING_ARITY)
#include BOOST_PP_LOCAL_ITERATE()
@@ -275,7 +275,7 @@
template<typename SymmetricFilter, typename Alloc>
void symmetric_filter<SymmetricFilter, Alloc>::begin_read()
{
- assert(!(state() & f_write));
+ BOOST_ASSERT(!(state() & f_write));
state() |= f_read;
buf().set(0, 0);
}
@@ -283,7 +283,7 @@
template<typename SymmetricFilter, typename Alloc>
void symmetric_filter<SymmetricFilter, Alloc>::begin_write()
{
- assert(!(state() & f_read));
+ BOOST_ASSERT(!(state() & f_read));
state() |= f_write;
buf().set(0, buf().size());
}
Modified: branches/release/boost/iostreams/invert.hpp
==============================================================================
--- branches/release/boost/iostreams/invert.hpp (original)
+++ branches/release/boost/iostreams/invert.hpp 2011-01-04 18:09:04 EST (Tue, 04 Jan 2011)
@@ -13,7 +13,7 @@
#endif
#include <algorithm> // copy, min.
-#include <cassert>
+#include <boost/assert.hpp>
#include <boost/config.hpp> // BOOST_DEDUCED_TYPENAME.
#include <boost/detail/workaround.hpp> // default_filter_buffer_size.
#include <boost/iostreams/char_traits.hpp>
@@ -78,7 +78,7 @@
typedef detail::counted_array_sink<char_type> array_sink;
typedef composite<filter_ref, array_sink> filtered_array_sink;
- assert((flags() & f_write) == 0);
+ BOOST_ASSERT((flags() & f_write) == 0);
if (flags() == 0) {
flags() = f_read;
buf().set(0, 0);
@@ -106,7 +106,7 @@
typedef detail::counted_array_source<char_type> array_source;
typedef composite<filter_ref, array_source> filtered_array_source;
- assert((flags() & f_read) == 0);
+ BOOST_ASSERT((flags() & f_read) == 0);
if (flags() == 0) {
flags() = f_write;
buf().set(0, 0);
Modified: branches/release/boost/iostreams/tee.hpp
==============================================================================
--- branches/release/boost/iostreams/tee.hpp (original)
+++ branches/release/boost/iostreams/tee.hpp 2011-01-04 18:09:04 EST (Tue, 04 Jan 2011)
@@ -12,7 +12,7 @@
# pragma once
#endif
-#include <cassert>
+#include <boost/assert.hpp>
#include <boost/config.hpp> // BOOST_DEDUCE_TYPENAME.
#include <boost/iostreams/categories.hpp>
#include <boost/iostreams/detail/adapter/device_adapter.hpp>
@@ -66,7 +66,7 @@
if (result != -1) {
std::streamsize result2 = iostreams::write(this->component(), s, result);
(void) result2; // Suppress 'unused variable' warning.
- assert(result == result2);
+ BOOST_ASSERT(result == result2);
}
return result;
}
@@ -77,7 +77,7 @@
std::streamsize result = iostreams::write(snk, s, n);
std::streamsize result2 = iostreams::write(this->component(), s, result);
(void) result2; // Suppress 'unused variable' warning.
- assert(result == result2);
+ BOOST_ASSERT(result == result2);
return result;
}
@@ -158,7 +158,7 @@
std::streamsize result2 = iostreams::write(sink_, s, result1);
(void) result1; // Suppress 'unused variable' warning.
(void) result2;
- assert(result1 == result2);
+ BOOST_ASSERT(result1 == result2);
}
return result1;
}
@@ -173,7 +173,7 @@
std::streamsize result2 = iostreams::write(sink_, s, n);
(void) result1; // Suppress 'unused variable' warning.
(void) result2;
- assert(result1 == n && result2 == n);
+ BOOST_ASSERT(result1 == n && result2 == n);
return n;
}
void close()
Modified: branches/release/libs/iostreams/doc/classes/file_descriptor.html
==============================================================================
--- branches/release/libs/iostreams/doc/classes/file_descriptor.html (original)
+++ branches/release/libs/iostreams/doc/classes/file_descriptor.html 2011-01-04 18:09:04 EST (Tue, 04 Jan 2011)
@@ -251,16 +251,16 @@
<A CLASS="documented" HREF="#file_descriptor_sink_ctor">file_descriptor_sink</A>( <SPAN CLASS="keyword">const</SPAN> Path& pathname,
std::ios_base::open_mode mode =
std::ios_base::out );
- <A CLASS="documented" HREF="#file_descriptor_sink_ctor">file_descriptor_sink</A>( <SPAN CLASS="keyword">int</SPAN> fd, <SPAN CLASS="keyword">bool</SPAN> close_on_exit = <SPAN CLASS="keyword">false</SPAN> );
+ <A CLASS="documented" HREF="#file_descriptor_sink_ctor">file_descriptor_sink</A>( <SPAN CLASS="keyword">int</SPAN> fd, <SPAN CLASS="keyword">file_descriptor_flags</SPAN> );
<SPAN CLASS='comment'>// Windows-only</SPAN>
- <A CLASS="documented" HREF="#file_descriptor_sink_ctor">file_descriptor_sink</A>( HANDLE hFile, <SPAN CLASS="keyword">bool</SPAN> close_on_exit = <SPAN CLASS="keyword">false</SPAN> );
+ <A CLASS="documented" HREF="#file_descriptor_sink_ctor">file_descriptor_sink</A>( HANDLE hFile, <SPAN CLASS="keyword">file_descriptor_flags</SPAN> );
<SPAN CLASS='comment'>// Deprecated</SPAN>
- <A CLASS="documented" HREF="#file_descriptor_sink_ctor">file_descriptor_sink</A>( <SPAN CLASS="keyword">int</SPAN> fd, <SPAN CLASS="keyword">file_descriptor_flags</SPAN> );
+ <A CLASS="documented" HREF="#file_descriptor_sink_ctor">file_descriptor_sink</A>( <SPAN CLASS="keyword">int</SPAN> fd, <SPAN CLASS="keyword">bool</SPAN> close_on_exit = <SPAN CLASS="keyword">false</SPAN> );
<SPAN CLASS='comment'>// Deprecated, Windows-only</SPAN>
- <A CLASS="documented" HREF="#file_descriptor_sink_ctor">file_descriptor_sink</A>( HANDLE hFile, <SPAN CLASS="keyword">file_descriptor_flags</SPAN> );
+ <A CLASS="documented" HREF="#file_descriptor_sink_ctor">file_descriptor_sink</A>( HANDLE hFile, <SPAN CLASS="keyword">bool</SPAN> close_on_exit = <SPAN CLASS="keyword">false</SPAN> );
<SPAN CLASS="keyword">template</SPAN><<SPAN CLASS="keyword">typename</SPAN> Path>
<SPAN CLASS="keyword">void</SPAN> <A CLASS="documented" HREF="#file_descriptor_sink_open">open</A>( <SPAN CLASS="keyword">const</SPAN> Path& pathname,
@@ -292,16 +292,16 @@
file_descriptor_sink( <SPAN CLASS="keyword">const</SPAN> Path& pathname,
std::ios_base::open_mode mode =
std::ios_base::out );
- file_descriptor_sink( <SPAN CLASS="keyword">int</SPAN> fd, <SPAN CLASS="keyword">bool</SPAN> close_on_exit = <SPAN CLASS="keyword">false</SPAN> );
+ file_descriptor_sink( <SPAN CLASS="keyword">int</SPAN> fd, <SPAN CLASS="keyword">file_descriptor_flags</SPAN> );
<SPAN CLASS='comment'>// Windows-only</SPAN>
- file_descriptor_sink( HANDLE hFile, <SPAN CLASS="keyword">bool</SPAN> close_on_exit = <SPAN CLASS="keyword">false</SPAN> );
+ file_descriptor_sink( HANDLE hFile, <SPAN CLASS="keyword">file_descriptor_flags</SPAN> );
<SPAN CLASS='comment'>// Deprecated</SPAN>
- file_descriptor_sink( <SPAN CLASS="keyword">int</SPAN> fd, <SPAN CLASS="keyword">file_descriptor_flags</SPAN> );
+ file_descriptor_sink( <SPAN CLASS="keyword">int</SPAN> fd, <SPAN CLASS="keyword">bool</SPAN> close_on_exit = <SPAN CLASS="keyword">false</SPAN> );
<SPAN CLASS='comment'>// Deprecated, Windows-only</SPAN>
- file_descriptor_sink( HANDLE hFile, <SPAN CLASS="keyword">file_descriptor_flags</SPAN> );</PRE>
+ file_descriptor_sink( HANDLE hFile, <SPAN CLASS="keyword">bool</SPAN> close_on_exit = <SPAN CLASS="keyword">false</SPAN> );</PRE>
<P>
The first member constructs an empty <CODE>file_descriptor_sink</CODE>.
Modified: branches/release/libs/iostreams/doc/concepts/sink.html
==============================================================================
--- branches/release/libs/iostreams/doc/concepts/sink.html (original)
+++ branches/release/libs/iostreams/doc/concepts/sink.html 2011-01-04 18:09:04 EST (Tue, 04 Jan 2011)
@@ -47,7 +47,7 @@
<PRE CLASS="broken_ie"><SPAN CLASS="keyword">struct</SPAN> Sink {
<SPAN CLASS="keyword">typedef</SPAN> <SPAN CLASS="keyword">char</SPAN> char_type;
<SPAN CLASS="keyword">typedef</SPAN> sink_tag category;
- <SPAN CLASS="keyword">void</SPAN> write(<SPAN CLASS="keyword">const</SPAN> <SPAN CLASS="keyword">char</SPAN>* s, std::streamsize n)
+ std::streamsize write(<SPAN CLASS="keyword">const</SPAN> <SPAN CLASS="keyword">char</SPAN>* s, std::streamsize n)
{
<SPAN CLASS="comment">// Write up to n characters from the buffer
// s to the output sequence, returning the
Modified: branches/release/libs/iostreams/doc/release_notes.html
==============================================================================
--- branches/release/libs/iostreams/doc/release_notes.html (original)
+++ branches/release/libs/iostreams/doc/release_notes.html 2011-01-04 18:09:04 EST (Tue, 04 Jan 2011)
@@ -14,6 +14,10 @@
<!-- End Banner -->
+<h4>1.46</h4>
+
+<p>Use <code>BOOST_ASSERT</code> instead of <code>assert</code>.</p>
+
<h4>1.44</h4>
<p>Lots of fixes in this version, almost all are by Steven Watanabe.</p>
Modified: branches/release/libs/iostreams/src/gzip.cpp
==============================================================================
--- branches/release/libs/iostreams/src/gzip.cpp (original)
+++ branches/release/libs/iostreams/src/gzip.cpp 2011-01-04 18:09:04 EST (Tue, 04 Jan 2011)
@@ -124,7 +124,7 @@
}
break;
default:
- assert(0);
+ BOOST_ASSERT(0);
}
}
@@ -159,7 +159,7 @@
++offset_;
}
} else {
- assert(0);
+ BOOST_ASSERT(0);
}
}
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