kab-iostreams-RC_1_34_0.patch0000644000175000001440000074401610622652237014604 0ustar kabusersdiff -Naur -x CVS ../../RC_1_34_0/boost/boost/iostreams/char_traits.hpp ./boost/iostreams/char_traits.hpp --- ../../RC_1_34_0/boost/boost/iostreams/char_traits.hpp 2007-05-14 18:47:47.000000000 -0400 +++ ./boost/iostreams/char_traits.hpp 2007-05-15 20:12:07.000000000 -0400 @@ -27,8 +27,8 @@ namespace boost { namespace iostreams { -// Dinkumware that comes with QNX Momentics 6.3.0, 4.0.2, incorrectly defines the -// EOF and WEOF macros to not std:: qualify the wint_t type (and so does +// Dinkumware that comes with QNX Momentics 6.3.0, 4.0.2, incorrectly defines +// the EOF and WEOF macros to not std:: qualify the wint_t type (and so does // Sun C++ 5.8 + STLport 4). Fix by placing the def in this scope. // NOTE: Use BOOST_WORKAROUND? #if (defined(__QNX__) && defined(BOOST_DINKUMWARE_STDLIB)) \ diff -Naur -x CVS ../../RC_1_34_0/boost/boost/iostreams/checked_operations.hpp ./boost/iostreams/checked_operations.hpp --- ../../RC_1_34_0/boost/boost/iostreams/checked_operations.hpp 2007-05-14 18:40:19.000000000 -0400 +++ ./boost/iostreams/checked_operations.hpp 2007-05-15 20:07:38.000000000 -0400 @@ -127,7 +127,7 @@ template<> struct seek_if_impl { template - static stream_offset + static std::streampos seek( T& t, stream_offset off, BOOST_IOS::seekdir way, BOOST_IOS::openmode which ) { return iostreams::seek(t, off, way, which); } @@ -136,7 +136,7 @@ template<> struct seek_if_impl { template - static stream_offset + static std::streampos seek(T&, stream_offset, BOOST_IOS::seekdir, BOOST_IOS::openmode) { throw cant_seek(); } }; diff -Naur -x CVS ../../RC_1_34_0/boost/boost/iostreams/code_converter.hpp ./boost/iostreams/code_converter.hpp --- ../../RC_1_34_0/boost/boost/iostreams/code_converter.hpp 2007-05-14 18:40:19.000000000 -0400 +++ ./boost/iostreams/code_converter.hpp 2007-05-15 20:07:38.000000000 -0400 @@ -23,7 +23,7 @@ #include // max. #include // memcpy. #include -#include // DEDUCED_TYPENAME. +#include // DEDUCED_TYPENAME, #include #include // default_filter_buffer_size. #include @@ -57,6 +57,32 @@ namespace detail { +//--------------Definition of strncpy_if_same---------------------------------// + +// Helper template for strncpy_if_same, below. +template +struct strncpy_if_same_impl; + +template<> +struct strncpy_if_same_impl { + template + static Ch* copy(Ch* tgt, const Ch* src, std::streamsize n) + { return BOOST_IOSTREAMS_CHAR_TRAITS(Ch)::copy(tgt, src, n); } +}; + +template<> +struct strncpy_if_same_impl { + template + static Tgt* copy(Tgt* tgt, const Src*, std::streamsize) { return tgt; } +}; + +template +Tgt* strncpy_if_same(Tgt* tgt, const Src* src, std::streamsize n) +{ + typedef strncpy_if_same_impl::value> impl; + return impl::copy(tgt, src, n); +} + //--------------Definition of conversion_buffer-------------------------------// // Buffer and conversion state for reading. @@ -169,7 +195,7 @@ policy_type& dev() { return **dev_; } - enum { + enum flag_type { f_open = 1, f_input_closed = f_open << 1, f_output_closed = f_input_closed << 1 @@ -311,16 +337,18 @@ break; case codecvt_base::ok: break; - case codecvt_base::error: - buf.state() = state_type(); - throw code_conversion_error(); case codecvt_base::noconv: + { + streamsize amt = + std::min(next - buf.ptr(), n - total); + detail::strncpy_if_same(s + total, buf.ptr(), amt); + total += amt; + } + break; + case codecvt_base::error: default: buf.state() = state_type(); - intern_type c = intern_type(); - memcpy(&c, (const void*) buf.ptr(), sizeof(extern_type)); - s[total++] = c; - break; + throw code_conversion_error(); } } while (total < n && status != EOF && status != WOULD_BLOCK); @@ -362,24 +390,19 @@ case codecvt_base::ok: total = static_cast(nint - s); break; - case codecvt_base::error: - buf.state() = state_type(); - throw code_conversion_error(); case codecvt_base::noconv: { - // This can be shortened to two memcpy's. - const char* c = (const char*) (s + total); - for ( std::size_t index = 0; - index < sizeof(intern_type); - index += sizeof(extern_type), - ++buf.ptr() ) - { - memcpy(buf.ptr(), c + index, sizeof(extern_type)); - if (buf.eptr() == buf.end()) - buf.flush(dev()); - } - ++total; + streamsize amt = + std::min( nint - total - s, + buf.end() - buf.eptr() ); + detail::strncpy_if_same(buf.eptr(), s + total, amt); + total += amt; } + break; + case codecvt_base::error: + default: + buf.state() = state_type(); + throw code_conversion_error(); } } return total; diff -Naur -x CVS ../../RC_1_34_0/boost/boost/iostreams/compose.hpp ./boost/iostreams/compose.hpp --- ../../RC_1_34_0/boost/boost/iostreams/compose.hpp 2007-05-14 18:40:19.000000000 -0400 +++ ./boost/iostreams/compose.hpp 2007-05-15 20:07:38.000000000 -0400 @@ -78,9 +78,9 @@ composite_device(const Filter& flt, param_type dev); std::streamsize read(char_type* s, std::streamsize n); std::streamsize write(const char_type* s, std::streamsize n); - stream_offset seek( stream_offset off, BOOST_IOS::seekdir way, - BOOST_IOS::openmode which = - BOOST_IOS::in | BOOST_IOS::out ); + std::streampos seek( stream_offset off, BOOST_IOS::seekdir way, + BOOST_IOS::openmode which = + BOOST_IOS::in | BOOST_IOS::out ); void close(); void close(BOOST_IOS::openmode which); @@ -142,9 +142,9 @@ } template - stream_offset seek( Device& dev, stream_offset off, BOOST_IOS::seekdir way, - BOOST_IOS::openmode which = - BOOST_IOS::in | BOOST_IOS::out ) + std::streampos seek( Device& dev, stream_offset off, BOOST_IOS::seekdir way, + BOOST_IOS::openmode which = + BOOST_IOS::in | BOOST_IOS::out ) { composite_device cmp(boost::ref(filter2_), dev); return iostreams::seek(filter1_, cmp, off, way, which); @@ -325,7 +325,7 @@ { return iostreams::write(filter_, device_, s, n); } template -stream_offset composite_device::seek +std::streampos composite_device::seek (stream_offset off, BOOST_IOS::seekdir way, BOOST_IOS::openmode which) { return iostreams::seek(filter_, device_, off, way, which); } diff -Naur -x CVS ../../RC_1_34_0/boost/boost/iostreams/detail/adapter/concept_adapter.hpp ./boost/iostreams/detail/adapter/concept_adapter.hpp --- ../../RC_1_34_0/boost/boost/iostreams/detail/adapter/concept_adapter.hpp 2007-05-14 18:40:19.000000000 -0400 +++ ./boost/iostreams/detail/adapter/concept_adapter.hpp 2007-05-15 20:07:38.000000000 -0400 @@ -80,16 +80,16 @@ std::streamsize write(const char_type* s, std::streamsize n, Sink* snk) { return output_impl::write(t_, snk, s, n); } - stream_offset seek( stream_offset off, BOOST_IOS::seekdir way, - BOOST_IOS::openmode which ) + std::streampos seek( stream_offset off, BOOST_IOS::seekdir way, + BOOST_IOS::openmode which ) { return this->seek( off, way, which, (basic_null_device*) 0); } template - stream_offset seek( stream_offset off, BOOST_IOS::seekdir way, - BOOST_IOS::openmode which, Device* dev ) + std::streampos seek( stream_offset off, BOOST_IOS::seekdir way, + BOOST_IOS::openmode which, Device* dev ) { return any_impl::seek(t_, dev, off, way, which); } void close(BOOST_IOS::openmode which) @@ -122,7 +122,7 @@ template<> struct device_wrapper_impl { template - static stream_offset + static std::streampos seek( Device& dev, Dummy*, stream_offset off, BOOST_IOS::seekdir way, BOOST_IOS::openmode which ) { @@ -131,7 +131,7 @@ } template - static stream_offset + static std::streampos seek( Device&, stream_offset, BOOST_IOS::seekdir, BOOST_IOS::openmode, any_tag ) { @@ -139,7 +139,7 @@ } template - static stream_offset + static std::streampos seek( Device& dev, stream_offset off, BOOST_IOS::seekdir way, BOOST_IOS::openmode which, random_access ) @@ -191,7 +191,7 @@ template<> struct flt_wrapper_impl { template - static stream_offset + static std::streampos seek( Filter& f, Device* dev, stream_offset off, BOOST_IOS::seekdir way, BOOST_IOS::openmode which ) { @@ -200,13 +200,13 @@ } template - static stream_offset + static std::streampos seek( Filter&, Device*, stream_offset, BOOST_IOS::seekdir, BOOST_IOS::openmode, any_tag ) { throw cant_seek(); } template - static stream_offset + static std::streampos seek( Filter& f, Device* dev, stream_offset off, BOOST_IOS::seekdir way, BOOST_IOS::openmode which, random_access tag ) @@ -216,14 +216,14 @@ } template - static stream_offset + static std::streampos seek( Filter& f, Device* dev, stream_offset off, BOOST_IOS::seekdir way, BOOST_IOS::openmode which, random_access, any_tag ) { return f.seek(*dev, off, way); } template - static stream_offset + static std::streampos seek( Filter& f, Device* dev, stream_offset off, BOOST_IOS::seekdir way, BOOST_IOS::openmode which, random_access, two_sequence ) diff -Naur -x CVS ../../RC_1_34_0/boost/boost/iostreams/detail/adapter/direct_adapter.hpp ./boost/iostreams/detail/adapter/direct_adapter.hpp --- ../../RC_1_34_0/boost/boost/iostreams/detail/adapter/direct_adapter.hpp 2007-05-14 18:40:19.000000000 -0400 +++ ./boost/iostreams/detail/adapter/direct_adapter.hpp 2007-05-15 20:07:38.000000000 -0400 @@ -111,8 +111,8 @@ std::streamsize read(char_type* s, std::streamsize n); std::streamsize write(const char_type* s, std::streamsize n); - stream_offset seek( stream_offset, BOOST_IOS::seekdir, - BOOST_IOS::openmode = BOOST_IOS::in | BOOST_IOS::out ); + std::streampos seek( stream_offset, BOOST_IOS::seekdir, + BOOST_IOS::openmode = BOOST_IOS::in | BOOST_IOS::out ); void close(); void close(BOOST_IOS::openmode which); #ifndef BOOST_IOSTREAMS_NO_LOCALE @@ -214,7 +214,7 @@ } template -inline stream_offset direct_adapter::seek +inline std::streampos direct_adapter::seek ( stream_offset off, BOOST_IOS::seekdir way, BOOST_IOS::openmode which ) { @@ -248,7 +248,7 @@ else bad_seek(); } - return static_cast(next); + return offset_to_position(next); } template diff -Naur -x CVS ../../RC_1_34_0/boost/boost/iostreams/detail/adapter/mode_adapter.hpp ./boost/iostreams/detail/adapter/mode_adapter.hpp --- ../../RC_1_34_0/boost/boost/iostreams/detail/adapter/mode_adapter.hpp 2007-05-14 18:40:19.000000000 -0400 +++ ./boost/iostreams/detail/adapter/mode_adapter.hpp 2007-05-15 20:07:38.000000000 -0400 @@ -48,9 +48,9 @@ std::streamsize read(char_type* s, std::streamsize n); std::streamsize write(const char_type* s, std::streamsize n); - stream_offset seek( stream_offset off, BOOST_IOS::seekdir way, - BOOST_IOS::openmode which = - BOOST_IOS::in | BOOST_IOS::out ); + std::streampos seek( stream_offset off, BOOST_IOS::seekdir way, + BOOST_IOS::openmode which = + BOOST_IOS::in | BOOST_IOS::out ); #if !BOOST_WORKAROUND(BOOST_MSVC, < 1300) void close(BOOST_IOS::openmode which = BOOST_IOS::in | BOOST_IOS::out); #endif @@ -66,12 +66,12 @@ { return iostreams::write(t_, snk, s, n); } template - stream_offset seek(Device& dev, stream_offset off, BOOST_IOS::seekdir way) + std::streampos seek(Device& dev, stream_offset off, BOOST_IOS::seekdir way) { return iostreams::seek(t_, dev, off, way); } template - stream_offset seek( Device& dev, stream_offset off, - BOOST_IOS::seekdir way, BOOST_IOS::openmode which ) + std::streampos seek( Device& dev, stream_offset off, + BOOST_IOS::seekdir way, BOOST_IOS::openmode which ) { return iostreams::seek(t_, dev, off, way, which); } template @@ -102,7 +102,7 @@ { return boost::iostreams::write(t_, s, n); } template -stream_offset mode_adapter::seek +std::streampos mode_adapter::seek (stream_offset off, BOOST_IOS::seekdir way, BOOST_IOS::openmode which) { return boost::iostreams::seek(t_, off, way, which); } diff -Naur -x CVS ../../RC_1_34_0/boost/boost/iostreams/detail/adapter/non_blocking_adapter.hpp ./boost/iostreams/detail/adapter/non_blocking_adapter.hpp --- ../../RC_1_34_0/boost/boost/iostreams/detail/adapter/non_blocking_adapter.hpp 2007-05-14 18:40:19.000000000 -0400 +++ ./boost/iostreams/detail/adapter/non_blocking_adapter.hpp 2007-05-15 20:07:38.000000000 -0400 @@ -44,9 +44,9 @@ } return result; } - stream_offset seek( stream_offset off, BOOST_IOS::seekdir way, - BOOST_IOS::openmode which = - BOOST_IOS::in | BOOST_IOS::out ) + std::streampos seek( stream_offset off, BOOST_IOS::seekdir way, + BOOST_IOS::openmode which = + BOOST_IOS::in | BOOST_IOS::out ) { return iostreams::seek(device_, off, way, which); } public: Device& device_; diff -Naur -x CVS ../../RC_1_34_0/boost/boost/iostreams/detail/adapter/range_adapter.hpp ./boost/iostreams/detail/adapter/range_adapter.hpp --- ../../RC_1_34_0/boost/boost/iostreams/detail/adapter/range_adapter.hpp 2007-05-14 18:40:19.000000000 -0400 +++ ./boost/iostreams/detail/adapter/range_adapter.hpp 2007-05-15 20:07:38.000000000 -0400 @@ -62,7 +62,7 @@ range_adapter(iterator first, iterator last); std::streamsize read(char_type* s, std::streamsize n); std::streamsize write(const char_type* s, std::streamsize n); - stream_offset seek(stream_offset off, BOOST_IOS::seekdir way); + std::streampos seek(stream_offset off, BOOST_IOS::seekdir way); private: iterator first_, cur_, last_; }; @@ -89,11 +89,11 @@ template -stream_offset range_adapter::seek +std::streampos range_adapter::seek (stream_offset off, BOOST_IOS::seekdir way) { impl::seek(first_, cur_, last_, off, way); - return static_cast(cur_ - first_); + return offset_to_position(cur_ - first_); } //------------------Implementation of range_adapter_impl----------------------// diff -Naur -x CVS ../../RC_1_34_0/boost/boost/iostreams/detail/resolve.hpp ./boost/iostreams/detail/resolve.hpp --- ../../RC_1_34_0/boost/boost/iostreams/detail/resolve.hpp 2007-05-14 18:40:19.000000000 -0400 +++ ./boost/iostreams/detail/resolve.hpp 2007-05-15 20:07:38.000000000 -0400 @@ -47,10 +47,7 @@ struct resolve_traits { typedef typename mpl::if_< - mpl::and_< - boost::detail::is_incrementable, // Must come first - is_dereferenceable // for CW 9.[0-4] - >, + boost::detail::is_incrementable, output_iterator_adapter, const T& >::type type; @@ -163,10 +160,7 @@ mode_adapter, is_iterator_range, range_adapter, - mpl::and_< - is_dereferenceable, - boost::detail::is_incrementable - >, + is_dereferenceable, output_iterator_adapter, is_array, array_adapter, diff -Naur -x CVS ../../RC_1_34_0/boost/boost/iostreams/detail/streambuf/direct_streambuf.hpp ./boost/iostreams/detail/streambuf/direct_streambuf.hpp --- ../../RC_1_34_0/boost/boost/iostreams/detail/streambuf/direct_streambuf.hpp 2007-05-14 18:40:19.000000000 -0400 +++ ./boost/iostreams/detail/streambuf/direct_streambuf.hpp 2007-05-15 20:07:38.000000000 -0400 @@ -24,6 +24,7 @@ #include #include #include +#include #include // Must come last. @@ -52,7 +53,7 @@ ) streambuf_type; public: // stream needs access. void open(const T& t, int buffer_size, int pback_size); - bool is_open(); + bool is_open() const; void close(); bool auto_close() const { return auto_close_; } void set_auto_close(bool close) { auto_close_ = close; } @@ -85,7 +86,7 @@ BOOST_IOS::openmode which ); pos_type seekpos(pos_type sp, BOOST_IOS::openmode which); private: - pos_type seek_impl( off_type off, BOOST_IOS::seekdir way, + pos_type seek_impl( stream_offset off, BOOST_IOS::seekdir way, BOOST_IOS::openmode which ); void init_input(any_tag) { } void init_input(input); @@ -118,7 +119,8 @@ } template -bool direct_streambuf::is_open() { return ibeg_ != 0 && !obeg_ != 0; } +bool direct_streambuf::is_open() const +{ return ibeg_ != 0 && !obeg_ != 0; } template void direct_streambuf::close() @@ -185,7 +187,10 @@ inline typename direct_streambuf::pos_type direct_streambuf::seekpos (pos_type sp, BOOST_IOS::openmode) -{ return seek_impl(sp, BOOST_IOS::beg, BOOST_IOS::in | BOOST_IOS::out); } +{ + return seek_impl( position_to_offset(sp), BOOST_IOS::beg, + BOOST_IOS::in | BOOST_IOS::out ); +} template void direct_streambuf::close(BOOST_IOS::openmode which) @@ -204,13 +209,13 @@ template typename direct_streambuf::pos_type direct_streambuf::seek_impl - (off_type off, BOOST_IOS::seekdir way, BOOST_IOS::openmode which) + (stream_offset off, BOOST_IOS::seekdir way, BOOST_IOS::openmode which) { using namespace std; BOOST_IOS::openmode both = BOOST_IOS::in | BOOST_IOS::out; if (two_head() && (which & both) == both) throw bad_seek(); - off_type result = -1; + stream_offset result = -1; bool one = one_head(); if (one && (pptr() != 0 || gptr()== 0)) init_get_area(); // Switch to input mode, for code reuse. @@ -242,7 +247,7 @@ pbump(static_cast(next - (pptr() - obeg_))); result = next; } - return result; + return offset_to_position(result); } template diff -Naur -x CVS ../../RC_1_34_0/boost/boost/iostreams/detail/streambuf/indirect_streambuf.hpp ./boost/iostreams/detail/streambuf/indirect_streambuf.hpp --- ../../RC_1_34_0/boost/boost/iostreams/detail/streambuf/indirect_streambuf.hpp 2007-05-14 18:47:48.000000000 -0400 +++ ./boost/iostreams/detail/streambuf/indirect_streambuf.hpp 2007-05-15 20:07:38.000000000 -0400 @@ -118,7 +118,7 @@ void sync_impl(); void close_impl(BOOST_IOS::openmode); - enum { + enum flag_type { f_open = 1, f_input_closed = f_open << 1, f_output_closed = f_input_closed << 1, @@ -328,7 +328,10 @@ inline typename indirect_streambuf::pos_type indirect_streambuf::seekpos (pos_type sp, BOOST_IOS::openmode) -{ return seek_impl(sp, BOOST_IOS::beg, BOOST_IOS::in | BOOST_IOS::out); } +{ + return seek_impl( position_to_offset(sp), BOOST_IOS::beg, + BOOST_IOS::in | BOOST_IOS::out ); +} template typename indirect_streambuf::pos_type diff -Naur -x CVS ../../RC_1_34_0/boost/boost/iostreams/device/file_descriptor.hpp ./boost/iostreams/device/file_descriptor.hpp --- ../../RC_1_34_0/boost/boost/iostreams/device/file_descriptor.hpp 2007-05-14 18:40:19.000000000 -0400 +++ ./boost/iostreams/device/file_descriptor.hpp 2007-05-15 20:07:38.000000000 -0400 @@ -63,7 +63,7 @@ bool is_open() const { return pimpl_->flags_ != 0; } std::streamsize read(char_type* s, std::streamsize n); std::streamsize write(const char_type* s, std::streamsize n); - stream_offset seek(stream_offset off, BOOST_IOS::seekdir way); + std::streampos seek(stream_offset off, BOOST_IOS::seekdir way); void close(); private: struct impl { diff -Naur -x CVS ../../RC_1_34_0/boost/boost/iostreams/device/file.hpp ./boost/iostreams/device/file.hpp --- ../../RC_1_34_0/boost/boost/iostreams/device/file.hpp 2007-05-14 18:40:19.000000000 -0400 +++ ./boost/iostreams/device/file.hpp 2007-05-15 20:07:38.000000000 -0400 @@ -51,9 +51,9 @@ BOOST_IOS::in | BOOST_IOS::out ); std::streamsize read(char_type* s, std::streamsize n); std::streamsize write(const char_type* s, std::streamsize n); - stream_offset seek( stream_offset off, BOOST_IOS::seekdir way, - BOOST_IOS::openmode which = - BOOST_IOS::in | BOOST_IOS::out ); + std::streampos seek( stream_offset off, BOOST_IOS::seekdir way, + BOOST_IOS::openmode which = + BOOST_IOS::in | BOOST_IOS::out ); void open( const std::string& path, BOOST_IOS::openmode mode = BOOST_IOS::in | BOOST_IOS::out, @@ -154,7 +154,7 @@ { return pimpl_->file_.sputn(s, n); } template -stream_offset basic_file::seek +std::streampos basic_file::seek ( stream_offset off, BOOST_IOS::seekdir way, BOOST_IOS::openmode ) { return iostreams::seek(pimpl_->file_, off, way); } diff -Naur -x CVS ../../RC_1_34_0/boost/boost/iostreams/device/mapped_file.hpp ./boost/iostreams/device/mapped_file.hpp --- ../../RC_1_34_0/boost/boost/iostreams/device/mapped_file.hpp 2007-05-14 18:40:19.000000000 -0400 +++ ./boost/iostreams/device/mapped_file.hpp 2007-05-15 20:07:38.000000000 -0400 @@ -137,7 +137,7 @@ //------------------Definition of mapped_file---------------------------------// -class mapped_file { +class BOOST_IOSTREAMS_DECL mapped_file { private: typedef mapped_file_source delegate_type; delegate_type delegate_; @@ -202,7 +202,7 @@ static int alignment() { return mapped_file_source::alignment(); } }; -struct mapped_file_sink : private mapped_file { +struct BOOST_IOSTREAMS_DECL mapped_file_sink : private mapped_file { friend struct operations; typedef char char_type; struct category diff -Naur -x CVS ../../RC_1_34_0/boost/boost/iostreams/device/null.hpp ./boost/iostreams/device/null.hpp --- ../../RC_1_34_0/boost/boost/iostreams/device/null.hpp 2007-05-14 18:40:19.000000000 -0400 +++ ./boost/iostreams/device/null.hpp 2007-05-15 20:07:38.000000000 -0400 @@ -30,9 +30,9 @@ { }; std::streamsize read(Ch*, std::streamsize) { return 0; } std::streamsize write(const Ch*, std::streamsize n) { return n; } - stream_offset seek( stream_offset, BOOST_IOS::seekdir, - BOOST_IOS::openmode = - BOOST_IOS::in | BOOST_IOS::out ) + std::streampos seek( stream_offset, BOOST_IOS::seekdir, + BOOST_IOS::openmode = + BOOST_IOS::in | BOOST_IOS::out ) { return -1; } void close(BOOST_IOS::openmode = BOOST_IOS::in | BOOST_IOS::out) { } }; diff -Naur -x CVS ../../RC_1_34_0/boost/boost/iostreams/filter/aggregate.hpp ./boost/iostreams/filter/aggregate.hpp --- ../../RC_1_34_0/boost/boost/iostreams/filter/aggregate.hpp 2007-05-14 18:40:19.000000000 -0400 +++ ./boost/iostreams/filter/aggregate.hpp 2007-05-15 20:07:38.000000000 -0400 @@ -145,7 +145,7 @@ do_close(); } - enum { + enum flag_type { f_read = 1, f_write = f_read << 1, f_eof = f_write << 1 diff -Naur -x CVS ../../RC_1_34_0/boost/boost/iostreams/filter/gzip.hpp ./boost/iostreams/filter/gzip.hpp --- ../../RC_1_34_0/boost/boost/iostreams/filter/gzip.hpp 2007-05-14 18:40:19.000000000 -0400 +++ ./boost/iostreams/filter/gzip.hpp 2007-05-15 20:07:38.000000000 -0400 @@ -234,14 +234,20 @@ template void close(Sink& snk, BOOST_IOS::openmode m) { + namespace io = boost::iostreams; + if (m & BOOST_IOS::out) { // Close zlib compressor. base_type::close(snk, BOOST_IOS::out); - // Write final fields of gzip file format. - write_long(this->crc(), snk); - write_long(this->total_in(), snk); + if (flags_ & f_header_done) { + + // Write final fields of gzip file format. + write_long(this->crc(), snk); + write_long(this->total_in(), snk); + } + } #if BOOST_WORKAROUND(__GNUC__, == 2) && defined(__STL_CONFIG_H) || \ BOOST_WORKAROUND(BOOST_DINKUMWARE_STDLIB, == 1) \ @@ -267,7 +273,7 @@ boost::iostreams::put(next, static_cast(0xFF & (n >> 24))); } - enum { + enum flag_type { f_header_done = 1, f_body_done = f_header_done << 1, f_footer_done = f_body_done << 1 @@ -456,7 +462,7 @@ if (static_cast(read_uint32(rng, gzip::bad_footer)) != this->total_out()) throw gzip_error(gzip::bad_length); } - enum { + enum flag_type { f_header_read = 1, f_footer_read = f_header_read << 1, f_text = f_footer_read << 1 @@ -547,11 +553,11 @@ static_cast(str.size() - offset_); streamsize amt = (std::min)(avail, n); std::copy( str.data() + offset_, - str.data() + offset_ + amt, - s ); + str.data() + offset_ + amt, + s ); offset_ += amt; if ( !(flags_ & f_header_done) && - offset_ == static_cast(str.size()) ) + offset_ == static_cast(str.size()) ) { flags_ |= f_header_done; } diff -Naur -x CVS ../../RC_1_34_0/boost/boost/iostreams/filter/line.hpp ./boost/iostreams/filter/line.hpp --- ../../RC_1_34_0/boost/boost/iostreams/filter/line.hpp 2007-05-14 18:40:19.000000000 -0400 +++ ./boost/iostreams/filter/line.hpp 2007-05-15 20:07:38.000000000 -0400 @@ -193,7 +193,7 @@ pos_ = string_type::npos; } - enum { + enum flag_type { f_read = 1, f_write = f_read << 1 }; diff -Naur -x CVS ../../RC_1_34_0/boost/boost/iostreams/filter/zlib.hpp ./boost/iostreams/filter/zlib.hpp --- ../../RC_1_34_0/boost/boost/iostreams/filter/zlib.hpp 2007-05-14 18:40:19.000000000 -0400 +++ ./boost/iostreams/filter/zlib.hpp 2007-05-15 20:07:38.000000000 -0400 @@ -332,7 +332,7 @@ template zlib_compressor_impl::~zlib_compressor_impl() -{ /*reset(true, false);*/ } +{ reset(true, false); } template bool zlib_compressor_impl::filter @@ -357,7 +357,7 @@ template zlib_decompressor_impl::~zlib_decompressor_impl() -{ /*reset(false, false);*/ } +{ reset(false, false); } template zlib_decompressor_impl::zlib_decompressor_impl(int window_bits) diff -Naur -x CVS ../../RC_1_34_0/boost/boost/iostreams/restrict.hpp ./boost/iostreams/restrict.hpp --- ../../RC_1_34_0/boost/boost/iostreams/restrict.hpp 2007-05-14 18:40:19.000000000 -0400 +++ ./boost/iostreams/restrict.hpp 2007-05-15 20:07:38.000000000 -0400 @@ -61,7 +61,7 @@ stream_offset len = -1 ); std::streamsize read(char_type* s, std::streamsize n); std::streamsize write(const char_type* s, std::streamsize n); - stream_offset seek(stream_offset off, BOOST_IOS::seekdir way); + std::streampos seek(stream_offset off, BOOST_IOS::seekdir way); private: stream_offset beg_, pos_, end_; }; @@ -145,7 +145,7 @@ } template - stream_offset seek(Device& dev, stream_offset off, BOOST_IOS::seekdir way) + std::streampos seek(Device& dev, stream_offset off, BOOST_IOS::seekdir way) { stream_offset next; if (way == BOOST_IOS::beg) { @@ -159,12 +159,12 @@ pos_ = this->component().seek(dev, off, BOOST_IOS::end); if (pos_ < beg_) bad_seek(); - return pos_ - beg_; + return offset_to_position(pos_ - beg_); } if (next < beg_ || end_ != -1 && next >= end_) bad_seek(); pos_ = this->component().seek(dev, next, BOOST_IOS::cur); - return pos_ - beg_; + return offset_to_position(pos_ - beg_); } private: template @@ -329,7 +329,7 @@ } template -stream_offset restricted_indirect_device::seek +std::streampos restricted_indirect_device::seek (stream_offset off, BOOST_IOS::seekdir way) { stream_offset next; @@ -344,12 +344,12 @@ pos_ = iostreams::seek(this->component(), off, BOOST_IOS::end); if (pos_ < beg_) bad_seek(); - return pos_ - beg_; + return offset_to_position(pos_ - beg_); } if (next < beg_ || end_ != -1 && next >= end_) bad_seek(); pos_ = iostreams::seek(this->component(), next - pos_, BOOST_IOS::cur); - return pos_ - beg_; + return offset_to_position(pos_ - beg_); } //--------------Implementation of restricted_direct_device--------------------// diff -Naur -x CVS ../../RC_1_34_0/boost/libs/iostreams/build/Jamfile ./libs/iostreams/build/Jamfile --- ../../RC_1_34_0/boost/libs/iostreams/build/Jamfile 1969-12-31 19:00:00.000000000 -0500 +++ ./libs/iostreams/build/Jamfile 2007-05-15 20:07:13.000000000 -0400 @@ -0,0 +1,70 @@ +# Boost.Iostreams Library Build Jamfile + +# (C) Copyright Jonathan Turkanis 2004 +# Distributed under the Boost Software License, Version 1.0. (See accompanying +# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt.) + +# See http://www.boost.org/libs/iostreams for documentation. + +subproject libs/iostreams/build ; + +import ./bzip2 ; +import ./zlib ; + +SOURCES = file_descriptor mapped_file ; + +template iostreams + : # sources + ../src/$(SOURCES).cpp +