[Boost-commit] svn:boost r58637 - in trunk: boost/iostreams/detail boost/iostreams/filter libs/iostreams/src

Subject: [Boost-commit] svn:boost r58637 - in trunk: boost/iostreams/detail boost/iostreams/filter libs/iostreams/src
From: daniel_james_at_[hidden]
Date: 2010-01-02 07:47:58

Author: danieljames
Date: 2010-01-02 07:47:57 EST (Sat, 02 Jan 2010)
New Revision: 58637
URL: http://svn.boost.org/trac/boost/changeset/58637

Log:
Prevent some apple macro substitutions.
Text files modified: 
   trunk/boost/iostreams/detail/is_dereferenceable.hpp |     6 +++---                                  
   trunk/boost/iostreams/filter/bzip2.hpp              |     6 +++---                                  
   trunk/boost/iostreams/filter/zlib.hpp               |     6 +++---                                  
   trunk/libs/iostreams/src/bzip2.cpp                  |     6 +++---                                  
   trunk/libs/iostreams/src/zlib.cpp                   |     6 +++---                                  
   5 files changed, 15 insertions(+), 15 deletions(-)

Modified: trunk/boost/iostreams/detail/is_dereferenceable.hpp
==============================================================================
--- trunk/boost/iostreams/detail/is_dereferenceable.hpp	(original)
+++ trunk/boost/iostreams/detail/is_dereferenceable.hpp	2010-01-02 07:47:57 EST (Sat, 02 Jan 2010)
@@ -49,10 +49,10 @@
 # endif 
   
   // two check overloads help us identify which operator++ was picked
-  char (& check(tag) )[2];
+  char (& check BOOST_PREVENT_MACRO_SUBSTITUTION(tag) )[2];
   
   template <class T>
-  char check(T const&);
+  char check BOOST_PREVENT_MACRO_SUBSTITUTION(T const&);
   
   template <class T>
   struct impl
@@ -61,7 +61,7 @@
 
       BOOST_STATIC_CONSTANT(
           bool
-        , value = sizeof(is_dereferenceable_::check(BOOST_comma(*x,0))) == 1
+        , value = sizeof(is_dereferenceable_::check BOOST_PREVENT_MACRO_SUBSTITUTION(BOOST_comma(*x,0))) == 1
       );
   };
 }

Modified: trunk/boost/iostreams/filter/bzip2.hpp
==============================================================================
--- trunk/boost/iostreams/filter/bzip2.hpp	(original)
+++ trunk/boost/iostreams/filter/bzip2.hpp	2010-01-02 07:47:57 EST (Sat, 02 Jan 2010)
@@ -113,7 +113,7 @@
 public:
     explicit bzip2_error(int error);
     int error() const { return error_; }
-    static void check(int error);
+    static void check BOOST_PREVENT_MACRO_SUBSTITUTION(int error);
 private:
     int error_;
 };
@@ -316,7 +316,7 @@
     before(src_begin, src_end, dest_begin, dest_end);
     int result = compress(flush ? bzip2::finish : bzip2::run);
     after(src_begin, dest_begin);
-    bzip2_error::check(result);
+    bzip2_error::check BOOST_PREVENT_MACRO_SUBSTITUTION(result);
     return result != bzip2::stream_end;
 }
 
@@ -348,7 +348,7 @@
     before(src_begin, src_end, dest_begin, dest_end);
     int result = decompress();
     after(src_begin, dest_begin);
-    bzip2_error::check(result);
+    bzip2_error::check BOOST_PREVENT_MACRO_SUBSTITUTION(result);
     return !(eof_ = result == bzip2::stream_end); 
 }
 

Modified: trunk/boost/iostreams/filter/zlib.hpp
==============================================================================
--- trunk/boost/iostreams/filter/zlib.hpp	(original)
+++ trunk/boost/iostreams/filter/zlib.hpp	2010-01-02 07:47:57 EST (Sat, 02 Jan 2010)
@@ -139,7 +139,7 @@
 public:
     explicit zlib_error(int error);
     int error() const { return error_; }
-    static void check(int error);
+    static void check BOOST_PREVENT_MACRO_SUBSTITUTION(int error);
 private:
     int error_;
 };
@@ -345,7 +345,7 @@
     before(src_begin, src_end, dest_begin, dest_end);
     int result = xdeflate(flush ? zlib::finish : zlib::no_flush);
     after(src_begin, dest_begin, true);
-    zlib_error::check(result);
+    zlib_error::check BOOST_PREVENT_MACRO_SUBSTITUTION(result);
     return result != zlib::stream_end; 
 }
 
@@ -378,7 +378,7 @@
     before(src_begin, src_end, dest_begin, dest_end);
     int result = xinflate(zlib::sync_flush);
     after(src_begin, dest_begin, false);
-    zlib_error::check(result);
+    zlib_error::check BOOST_PREVENT_MACRO_SUBSTITUTION(result);
     return result != zlib::stream_end;
 }
 

Modified: trunk/libs/iostreams/src/bzip2.cpp
==============================================================================
--- trunk/libs/iostreams/src/bzip2.cpp	(original)
+++ trunk/libs/iostreams/src/bzip2.cpp	2010-01-02 07:47:57 EST (Sat, 02 Jan 2010)
@@ -56,7 +56,7 @@
     : BOOST_IOSTREAMS_FAILURE("bzip2 error"), error_(error) 
     { }
 
-void bzip2_error::check(int error)
+void bzip2_error::check BOOST_PREVENT_MACRO_SUBSTITUTION(int error)
 {
     switch (error) {
     case BZ_OK: 
@@ -103,7 +103,7 @@
 {
     ready_ = false;
     bz_stream* s = static_cast<bz_stream*>(stream_);
-    bzip2_error::check(
+    bzip2_error::check BOOST_PREVENT_MACRO_SUBSTITUTION(
         compress ?
             BZ2_bzCompressEnd(s) : 
             BZ2_bzDecompressEnd(s)
@@ -140,7 +140,7 @@
         s->bzfree = 0;
     //#endif
     s->opaque = derived;
-    bzip2_error::check( 
+    bzip2_error::check BOOST_PREVENT_MACRO_SUBSTITUTION( 
         compress ?
             BZ2_bzCompressInit( s,
                                 params_.block_size, 

Modified: trunk/libs/iostreams/src/zlib.cpp
==============================================================================
--- trunk/libs/iostreams/src/zlib.cpp	(original)
+++ trunk/libs/iostreams/src/zlib.cpp	2010-01-02 07:47:57 EST (Sat, 02 Jan 2010)
@@ -71,7 +71,7 @@
     : BOOST_IOSTREAMS_FAILURE("zlib error"), error_(error) 
     { }
 
-void zlib_error::check(int error)
+void zlib_error::check BOOST_PREVENT_MACRO_SUBSTITUTION(int error)
 {
     switch (error) {
     case Z_OK: 
@@ -144,7 +144,7 @@
     z_stream* s = static_cast<z_stream*>(stream_);
     // Undiagnosed bug:
     // deflateReset(), etc., return Z_DATA_ERROR
-    //zlib_error::check(
+    //zlib_error::check BOOST_PREVENT_MACRO_SUBSTITUTION(
         realloc ?
             (compress ? deflateReset(s) : inflateReset(s)) :
             (compress ? deflateEnd(s) : inflateEnd(s))
@@ -173,7 +173,7 @@
     //#endif
     s->opaque = derived;
     int window_bits = p.noheader? -p.window_bits : p.window_bits;
-    zlib_error::check(
+    zlib_error::check BOOST_PREVENT_MACRO_SUBSTITUTION(
         compress ?
             deflateInit2( s, 
                           p.level,