[Boost-commit] svn:boost r78433 - in branches/release: . libs libs/iostreams libs/iostreams/test libs/iostreams/test/detail

Subject: [Boost-commit] svn:boost r78433 - in branches/release: . libs libs/iostreams libs/iostreams/test libs/iostreams/test/detail
From: dnljms_at_[hidden]
Date: 2012-05-12 04:18:16

Author: danieljames
Date: 2012-05-12 04:18:14 EDT (Sat, 12 May 2012)
New Revision: 78433
URL: http://svn.boost.org/trac/boost/changeset/78433

Log:
Iostreams: Merge test fixes from trunk.

- Remove obselete filesystem code and test (jhunold).
- Fix gzip test failures for some C++0x compilers.

Properties modified: 
   branches/release/   (props changed)
   branches/release/libs/   (props changed)
   branches/release/libs/iostreams/   (props changed)
Text files modified: 
   branches/release/libs/iostreams/test/Jamfile.v2           |     7 +------                                 
   branches/release/libs/iostreams/test/detail/temp_file.hpp |     4 ++--                                    
   branches/release/libs/iostreams/test/gzip_test.cpp        |     6 +++---                                  
   3 files changed, 6 insertions(+), 11 deletions(-)

Modified: branches/release/libs/iostreams/test/Jamfile.v2
==============================================================================
--- branches/release/libs/iostreams/test/Jamfile.v2	(original)
+++ branches/release/libs/iostreams/test/Jamfile.v2	2012-05-12 04:18:14 EDT (Sat, 12 May 2012)
@@ -87,12 +87,7 @@
           [ test-iostreams line_filter_test.cpp ]
           [ test-iostreams mapped_file_test.cpp 
                 ../build//boost_iostreams ]
-          [ test-iostreams path_test.cpp
-                : <define>BOOST_FILESYSTEM_VERSION=2
-                : path_test_filesystem2 ]
-          [ test-iostreams path_test.cpp
-                : <define>BOOST_FILESYSTEM_VERSION=3
-                : path_test_filesystem3 ]
+          [ test-iostreams path_test.cpp ]
           [ test-iostreams newline_test.cpp ]
           [ test-iostreams null_test.cpp ]
           [ test-iostreams operation_sequence_test.cpp ]

Modified: branches/release/libs/iostreams/test/detail/temp_file.hpp
==============================================================================
--- branches/release/libs/iostreams/test/detail/temp_file.hpp	(original)
+++ branches/release/libs/iostreams/test/detail/temp_file.hpp	2012-05-12 04:18:14 EDT (Sat, 12 May 2012)
@@ -13,7 +13,7 @@
 #include <cstdlib>                            // rand, toupper, tolower (VC6)
 #include <fstream>
 #include <string>
-#include <boost/filesystem/v3/operations.hpp>
+#include <boost/filesystem/operations.hpp>
 #include "./constants.hpp"
 
 #ifdef BOOST_NO_STDC_NAMESPACE
@@ -39,7 +39,7 @@
     operator const ::std::string() const { return name_; }
 private:
     void set_name() {
-        name_ = boost::filesystem3::unique_path().string();
+        name_ = boost::filesystem::unique_path().string();
     }
 
     ::std::string name_;

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-05-12 04:18:14 EDT (Sat, 12 May 2012)
@@ -120,11 +120,11 @@
     // 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,
+        static_cast<char>(gzip::magic::id1),
+        static_cast<char>(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)
+        '\x22', '\x9c', '\xf3', '\x4e', // 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)