Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r76786 - in branches/release: . boost boost/iostreams boost/iostreams/detail
From: dnljms_at_[hidden]
Date: 2012-01-29 17:49:13


Author: danieljames
Date: 2012-01-29 17:49:12 EST (Sun, 29 Jan 2012)
New Revision: 76786
URL: http://svn.boost.org/trac/boost/changeset/76786

Log:
Iostreams: Merge apple macro fix.
Properties modified:
   branches/release/ (props changed)
   branches/release/boost/ (props changed)
   branches/release/boost/iostreams/ (props changed)
Text files modified:
   branches/release/boost/iostreams/detail/is_dereferenceable.hpp | 6 +++---
   1 files changed, 3 insertions(+), 3 deletions(-)

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


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk