From: technews_at_[hidden]
Date: 2008-01-08 17:25:02
Author: turkanis
Date: 2008-01-08 17:25:01 EST (Tue, 08 Jan 2008)
New Revision: 42625
URL: http://svn.boost.org/trac/boost/changeset/42625
Log:
merged changes from branches/iostreams_dev, revisions 42602-42624: adding missing included to fix #1550; fix for positioning on IBM; fix for file_descriptor on POSIX; restructed the version range for the Borland workaround in large_file_test.cpp
Text files modified:
trunk/boost/iostreams/device/file_descriptor.hpp | 9 ++++++++-
trunk/boost/iostreams/filter/aggregate.hpp | 3 +++
trunk/boost/iostreams/filter/gzip.hpp | 2 +-
trunk/boost/iostreams/filter/line.hpp | 2 ++
trunk/boost/iostreams/filter/newline.hpp | 6 +++++-
trunk/boost/iostreams/input_sequence.hpp | 1 +
trunk/boost/iostreams/output_sequence.hpp | 1 +
trunk/boost/iostreams/positioning.hpp | 2 +-
trunk/libs/iostreams/test/large_file_test.cpp | 6 +++---
9 files changed, 25 insertions(+), 7 deletions(-)
Modified: trunk/boost/iostreams/device/file_descriptor.hpp
==============================================================================
--- trunk/boost/iostreams/device/file_descriptor.hpp (original)
+++ trunk/boost/iostreams/device/file_descriptor.hpp 2008-01-08 17:25:01 EST (Tue, 08 Jan 2008)
@@ -64,7 +64,14 @@
handle_type handle() const { return pimpl_->handle_; }
private:
struct impl {
- impl() : handle_(reinterpret_cast<handle_type>(-1)), flags_(0) { }
+ impl() :
+ #ifdef BOOST_IOSTREAMS_WINDOWS
+ handle_(reinterpret_cast<handle_type>(-1)),
+ #else
+ handle_(-1),
+ #endif
+ flags_(0)
+ { }
impl(handle_type fd, bool close_on_exit)
: handle_(fd), flags_(0)
{ if (close_on_exit) flags_ |= impl::close_on_exit; }
Modified: trunk/boost/iostreams/filter/aggregate.hpp
==============================================================================
--- trunk/boost/iostreams/filter/aggregate.hpp (original)
+++ trunk/boost/iostreams/filter/aggregate.hpp 2008-01-08 17:25:01 EST (Tue, 08 Jan 2008)
@@ -15,10 +15,13 @@
#include <cassert>
#include <iterator> // back_inserter
#include <vector>
+#include <boost/iostreams/constants.hpp> // default_device_buffer_size
#include <boost/iostreams/categories.hpp>
#include <boost/iostreams/detail/char_traits.hpp>
#include <boost/iostreams/detail/ios.hpp> // openmode, streamsize.
#include <boost/iostreams/pipeline.hpp>
+#include <boost/iostreams/read.hpp> // check_eof
+#include <boost/iostreams/write.hpp>
#include <boost/mpl/bool.hpp>
#include <boost/type_traits/is_convertible.hpp>
Modified: trunk/boost/iostreams/filter/gzip.hpp
==============================================================================
--- trunk/boost/iostreams/filter/gzip.hpp (original)
+++ trunk/boost/iostreams/filter/gzip.hpp 2008-01-08 17:25:01 EST (Tue, 08 Jan 2008)
@@ -134,7 +134,7 @@
std::string comment = "",
std::time_t mtime = 0 )
: zlib_params(level, method, window_bits, mem_level, strategy),
- file_name(file_name), mtime(mtime)
+ file_name(file_name), comment(comment), mtime(mtime)
{ }
std::string file_name;
std::string comment;
Modified: trunk/boost/iostreams/filter/line.hpp
==============================================================================
--- trunk/boost/iostreams/filter/line.hpp (original)
+++ trunk/boost/iostreams/filter/line.hpp 2008-01-08 17:25:01 EST (Tue, 08 Jan 2008)
@@ -18,7 +18,9 @@
#include <boost/config.hpp> // BOOST_STATIC_CONSTANT.
#include <boost/iostreams/categories.hpp>
#include <boost/iostreams/detail/ios.hpp> // openmode, streamsize.
+#include <boost/iostreams/read.hpp> // check_eof
#include <boost/iostreams/pipeline.hpp>
+#include <boost/iostreams/write.hpp>
// Must come last.
#include <boost/iostreams/detail/config/disable_warnings.hpp> // VC7.1 C4244.
Modified: trunk/boost/iostreams/filter/newline.hpp
==============================================================================
--- trunk/boost/iostreams/filter/newline.hpp (original)
+++ trunk/boost/iostreams/filter/newline.hpp 2008-01-08 17:25:01 EST (Tue, 08 Jan 2008)
@@ -19,8 +19,12 @@
#include <stdexcept> // logic_error.
#include <boost/config.hpp> // BOOST_STATIC_CONSTANT.
#include <boost/iostreams/categories.hpp>
-#include <boost/iostreams/detail/char_traits.hpp>
+#include <boost/iostreams/detail/char_traits.hpp>
+#include <boost/iostreams/detail/ios.hpp> // BOOST_IOSTREAMS_FAILURE
+#include <boost/iostreams/read.hpp> // get
+#include <boost/iostreams/write.hpp> // put
#include <boost/iostreams/pipeline.hpp>
+#include <boost/iostreams/putback.hpp>
#include <boost/mpl/bool.hpp>
#include <boost/type_traits/is_convertible.hpp>
Modified: trunk/boost/iostreams/input_sequence.hpp
==============================================================================
--- trunk/boost/iostreams/input_sequence.hpp (original)
+++ trunk/boost/iostreams/input_sequence.hpp 2008-01-08 17:25:01 EST (Tue, 08 Jan 2008)
@@ -15,6 +15,7 @@
#include <boost/config.hpp> // DEDUCED_TYPENAME, MSVC.
#include <boost/detail/workaround.hpp>
#include <boost/iostreams/detail/wrap_unwrap.hpp>
+#include <boost/iostreams/operations_fwd.hpp> // is_custom
#include <boost/iostreams/traits.hpp>
#include <boost/mpl/if.hpp>
Modified: trunk/boost/iostreams/output_sequence.hpp
==============================================================================
--- trunk/boost/iostreams/output_sequence.hpp (original)
+++ trunk/boost/iostreams/output_sequence.hpp 2008-01-08 17:25:01 EST (Tue, 08 Jan 2008)
@@ -15,6 +15,7 @@
#include <boost/config.hpp> // DEDUCED_TYPENAME, MSVC.
#include <boost/detail/workaround.hpp>
#include <boost/iostreams/detail/wrap_unwrap.hpp>
+#include <boost/iostreams/operations_fwd.hpp> // is_custom
#include <boost/iostreams/traits.hpp>
#include <boost/mpl/if.hpp>
Modified: trunk/boost/iostreams/positioning.hpp
==============================================================================
--- trunk/boost/iostreams/positioning.hpp (original)
+++ trunk/boost/iostreams/positioning.hpp 2008-01-08 17:25:01 EST (Tue, 08 Jan 2008)
@@ -78,7 +78,7 @@
// Helper function
inline std::fpos_t streampos_to_fpos_t(std::streampos pos)
{
-# ifdef _CPPLIB_VER
+# if defined (_CPPLIB_VER) || defined(__IBMCPP__)
return pos.seekpos();
# else
return pos.get_fpos_t();
Modified: trunk/libs/iostreams/test/large_file_test.cpp
==============================================================================
--- trunk/libs/iostreams/test/large_file_test.cpp (original)
+++ trunk/libs/iostreams/test/large_file_test.cpp 2008-01-08 17:25:01 EST (Tue, 08 Jan 2008)
@@ -252,7 +252,7 @@
return false;
}
-# if !BOOST_WORKAROUND(__BORLANDC__, == 0x582)
+# if !defined(__BORLANDC__) || __BORLANDC__ < 0x582 || __BORLANDC__ >= 0x592
// Close handle; all further access is via mapped_file
CloseHandle(hnd);
@@ -260,7 +260,7 @@
// Initialize file data
return map_large_file();
-# else // Borland 5.8.2
+# else // Borland >= 5.8.2 and Borland < 5.9.2
// Initialize file data (very slow, even though only 9 writes are required)
for (stream_offset z = 0; z <= 8; ++z) {
@@ -292,7 +292,7 @@
CloseHandle(hnd);
return true;
-# endif // Borland 5.8.2 workaround
+# endif // Borland workaround
#else // #ifdef BOOST_IOSTREAMS_WINDOWS
// Create file