[Boost-commit] svn:boost r84508 - in branches/release: boost/iostreams libs/iostreams libs/iostreams/build

Subject: [Boost-commit] svn:boost r84508 - in branches/release: boost/iostreams libs/iostreams libs/iostreams/build
From: dnljms_at_[hidden]
Date: 2013-05-26 10:13:59

Author: danieljames
Date: 2013-05-26 10:13:58 EDT (Sun, 26 May 2013)
New Revision: 84508
URL: http://svn.boost.org/trac/boost/changeset/84508

Log:
Merge iostreams to release.

Might as well merge now that the dependencies (BOOST_FALLTHROUGH support
and the new version of Boost.Build) are in release.

Properties modified: 
   branches/release/boost/iostreams/   (props changed)
   branches/release/libs/iostreams/   (props changed)
Text files modified: 
   branches/release/boost/iostreams/code_converter.hpp |     3 ++-                                     
   branches/release/libs/iostreams/build/Jamfile.v2    |    25 +++++++++++++++----------               
   2 files changed, 17 insertions(+), 11 deletions(-)

Modified: branches/release/boost/iostreams/code_converter.hpp
==============================================================================
--- branches/release/boost/iostreams/code_converter.hpp	(original)
+++ branches/release/boost/iostreams/code_converter.hpp	2013-05-26 10:13:58 EDT (Sun, 26 May 2013)
@@ -393,7 +393,8 @@
 
         switch (result) {
         case std::codecvt_base::partial:
-            partial = true; // Fall through.
+            partial = true;
+            BOOST_FALLTHROUGH;
         case std::codecvt_base::ok:
             total = static_cast<std::streamsize>(nint - s);
             break;

Modified: branches/release/libs/iostreams/build/Jamfile.v2
==============================================================================
--- branches/release/libs/iostreams/build/Jamfile.v2	(original)
+++ branches/release/libs/iostreams/build/Jamfile.v2	2013-05-26 10:13:58 EDT (Sun, 26 May 2013)
@@ -20,6 +20,7 @@
 import modules ;
 import os ;
 import path ;
+import ac ;
 local debug = [ MATCH (--debug-configuration) : [ modules.peek : ARGV ] ] ;
 
 for local v in NO_COMPRESSION 
@@ -29,6 +30,18 @@
     $(v) = [ modules.peek : $(v) ] ;
 }
 
+if $(NO_COMPRESSION) != 1 && $(NO_ZLIB) != 1
+{
+    using zlib : : <build-name>boost_zlib <tag>@tag : : true ;
+}
+else
+{
+    if $(debug)
+    {
+        ECHO "notice: iostreams: not using zlib compression " ;
+    }
+}
+
 
 # Given a name of library, either 'zlib', or 'bzip2', creates the necessary
 # main target and returns it. If compression is disabled, returns nothing.
@@ -133,16 +146,6 @@
 
 
 local sources = file_descriptor.cpp mapped_file.cpp ;
-local z = [ create-library zlib : zll z : adler32 compress 
-     crc32 deflate gzclose gzio gzlib gzread gzwrite
-     infback inffast inflate inftrees trees uncompr zutil :
-     <link>shared:<define>ZLIB_DLL ] ;
-
-if $(z)
-{
-    sources += boost_zlib zlib.cpp gzip.cpp ;
-}
-
 local bz2 = [ create-library bzip2 : libbz2 bz2 : 
     blocksort bzlib compress crctable decompress huffman randtable :
     <link>shared:<def-file>$(BZIP2_SOURCE)/libbz2.def ] ;
@@ -156,6 +159,8 @@
     : $(sources) 
     : <link>shared:<define>BOOST_IOSTREAMS_DYN_LINK=1 
       <define>BOOST_IOSTREAMS_USE_DEPRECATED
+      [ ac.check-library /zlib//zlib : <library>/zlib//zlib
+        <source>zlib.cpp <source>gzip.cpp ]
     :
     : <link>shared:<define>BOOST_IOSTREAMS_DYN_LINK=1
     ;