[Boost-commit] svn:boost r42670 - in trunk: boost/iostreams/detail/config libs/iostreams/test

From: technews_at_[hidden]
Date: 2008-01-10 19:02:37

Author: turkanis
Date: 2008-01-10 19:02:36 EST (Thu, 10 Jan 2008)
New Revision: 42670
URL: http://svn.boost.org/trac/boost/changeset/42670

Log:
merged changes from branches/iostreams_dev, revisions 42645=42660; fix for Intel-darwin; removed dependence of file_descriptor_test and mapped_file_test on library boost_iostreams
Text files modified: 
   trunk/boost/iostreams/detail/config/codecvt.hpp |     3 ++-                                     
   trunk/libs/iostreams/test/Jamfile.v2            |    22 +++++++++++-----------                  
   2 files changed, 13 insertions(+), 12 deletions(-)

Modified: trunk/boost/iostreams/detail/config/codecvt.hpp
==============================================================================
--- trunk/boost/iostreams/detail/config/codecvt.hpp	(original)
+++ trunk/boost/iostreams/detail/config/codecvt.hpp	2008-01-10 19:02:36 EST (Thu, 10 Jan 2008)
@@ -41,7 +41,8 @@
 //------------------Normalize codecvt::length---------------------------------//
 
 #if !defined(__MSL_CPP__) && !defined(__LIBCOMO__) && \
-    (!defined(BOOST_RWSTD_VER) || BOOST_RWSTD_VER < 0x04010300)
+    (!defined(BOOST_RWSTD_VER) || BOOST_RWSTD_VER < 0x04010300) && \
+    (!defined(__MACH__) || !defined(__INTEL_COMPILER))
     /**/
 # define BOOST_IOSTREAMS_CODECVT_CV_QUALIFIER const
 #else

Modified: trunk/libs/iostreams/test/Jamfile.v2
==============================================================================
--- trunk/libs/iostreams/test/Jamfile.v2	(original)
+++ trunk/libs/iostreams/test/Jamfile.v2	2008-01-10 19:02:36 EST (Thu, 10 Jan 2008)
@@ -38,7 +38,7 @@
           [ test-iostreams close_test.cpp ]
           [ test-iostreams 
                 code_converter_test.cpp    
-                detail/utf8_codecvt_facet.cpp ]
+                detail/utf8_codecvt_facet.cpp : <link>static ]
           [ test-iostreams combine_test.cpp ]
           [ test-iostreams compose_test.cpp ]
           [ test-iostreams component_access_test.cpp ]
@@ -48,17 +48,15 @@
           [ test-iostreams example_test.cpp ]
           [ test-iostreams execute_test.cpp ]
           [ test-iostreams file_test.cpp ]
-          [ test-iostreams 
-                file_descriptor_test.cpp 
-                ../build//boost_iostreams : <link>static ]
+          [ test-iostreams file_descriptor_test.cpp
+                ../src/file_descriptor.cpp : <link>static ]
           [ test-iostreams filtering_stream_test.cpp ]
           [ test-iostreams finite_state_filter_test.cpp ]
           [ test-iostreams flush_test.cpp ]
           [ test-iostreams invert_test.cpp ]
           [ test-iostreams line_filter_test.cpp ]
-          [ test-iostreams 
-                mapped_file_test.cpp 
-                ../build//boost_iostreams : <link>static ]
+          [ test-iostreams mapped_file_test.cpp 
+                ../src/mapped_file.cpp : <link>static ]
           [ test-iostreams newline_test.cpp ]
           [ test-iostreams null_test.cpp ]
           [ test-iostreams operation_sequence_test.cpp ]
@@ -85,18 +83,20 @@
           all-tests += 
               [ test-iostreams 
                     large_file_test.cpp 
-                    ../build//boost_iostreams 
+                    ../src/file_descriptor.cpp
+                    ../src/mapped_file.cpp
                   : <define>LARGE_FILE_KEEP=$(LARGE_FILE_KEEP)
-                    $(KEEP) ] ;
+                    <link>static ] ;
       }
       if $(LARGE_FILE_TEMP)
       {
           all-tests += 
               [ test-iostreams 
                     large_file_test.cpp 
-                    ../build//boost_iostreams 
+                    ../src/file_descriptor.cpp
+                    ../src/mapped_file.cpp
                   : <define>LARGE_FILE_TEMP=$(LARGE_FILE_TEMP)
-                    $(KEEP) ] ;
+                    <link>static ] ;
       }
       if ! $(NO_BZIP2)
       {