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

Subject: [Boost-commit] svn:boost r84624 - in branches/release: boost/iostreams boost/iostreams/detail libs/iostreams libs/iostreams/test
From: dnljms_at_[hidden]
Date: 2013-06-03 16:43:05

Author: danieljames
Date: 2013-06-03 16:43:04 EDT (Mon, 03 Jun 2013)
New Revision: 84624
URL: http://svn.boost.org/trac/boost/changeset/84624

Log:
Merge iostreams to release.

Remove some tabs, and fix a test on C++11 compilers.

Properties modified: 
   branches/release/boost/iostreams/   (props changed)
   branches/release/libs/iostreams/   (props changed)
Text files modified: 
   branches/release/boost/iostreams/detail/path.hpp             |     4 ++--                                    
   branches/release/libs/iostreams/test/array_test.cpp          |     4 ++--                                    
   branches/release/libs/iostreams/test/direct_adapter_test.cpp |     2 +-                                      
   branches/release/libs/iostreams/test/path_test.cpp           |     6 +++---                                  
   4 files changed, 8 insertions(+), 8 deletions(-)

Modified: branches/release/boost/iostreams/detail/path.hpp
==============================================================================
--- branches/release/boost/iostreams/detail/path.hpp	(original)
+++ branches/release/boost/iostreams/detail/path.hpp	2013-06-03 16:43:04 EDT (Mon, 03 Jun 2013)
@@ -106,7 +106,7 @@
     // worth working around).
     template<typename Path>
     typename sfinae<typename Path::external_string_type, path&>::type
-    	operator=(const Path& p)
+        operator=(const Path& p)
     {
         init(p.external_file_string());
         return *this;
@@ -116,7 +116,7 @@
     // Assignment operator taking a boost::filesystem3::path
     template<typename Path>
     typename sfinae<typename Path::codecvt_type, path&>::type
-    	operator=(const Path& p)
+        operator=(const Path& p)
     {
         init(p.native());
         return *this;

Modified: branches/release/libs/iostreams/test/array_test.cpp
==============================================================================
--- branches/release/libs/iostreams/test/array_test.cpp	(original)
+++ branches/release/libs/iostreams/test/array_test.cpp	2013-06-03 16:43:04 EDT (Mon, 03 Jun 2013)
@@ -74,7 +74,7 @@
 
     {
         vector<char> first(data_reps * data_length(), '?');
-        stream<array> io(&first[0], &first[0] + first.size());
+        stream<boost::iostreams::array> io(&first[0], &first[0] + first.size());
         BOOST_CHECK_MESSAGE(
             test_seekable_in_chars(io),
             "failed seeking within stream<array>, in chars"
@@ -83,7 +83,7 @@
 
     {
         vector<char> first(data_reps * data_length(), '?');
-        stream<array> io(&first[0], &first[0] + first.size());
+        stream<boost::iostreams::array> io(&first[0], &first[0] + first.size());
         BOOST_CHECK_MESSAGE(
             test_seekable_in_chars(io),
             "failed seeking within stream<array>, in chunks"

Modified: branches/release/libs/iostreams/test/direct_adapter_test.cpp
==============================================================================
--- branches/release/libs/iostreams/test/direct_adapter_test.cpp	(original)
+++ branches/release/libs/iostreams/test/direct_adapter_test.cpp	2013-06-03 16:43:04 EDT (Mon, 03 Jun 2013)
@@ -28,7 +28,7 @@
             indirect_array_source;
     typedef boost::iostreams::detail::direct_adapter<array_sink> 
             indirect_array_sink;
-    typedef boost::iostreams::detail::direct_adapter<array> 
+    typedef boost::iostreams::detail::direct_adapter<boost::iostreams::array> 
             indirect_array;
     typedef stream<indirect_array_source>
             indirect_array_istream;

Modified: branches/release/libs/iostreams/test/path_test.cpp
==============================================================================
--- branches/release/libs/iostreams/test/path_test.cpp	(original)
+++ branches/release/libs/iostreams/test/path_test.cpp	2013-06-03 16:43:04 EDT (Mon, 03 Jun 2013)
@@ -12,9 +12,9 @@
 
 void path_test()
 {
-	boost::filesystem::path orig("a/b");
-	boost::iostreams::detail::path p(orig);
-	p = orig;
+    boost::filesystem::path orig("a/b");
+    boost::iostreams::detail::path p(orig);
+    p = orig;
 }
 
 boost::unit_test::test_suite* init_unit_test_suite(int, char* [])