[Boost-commit] svn:boost r53055 - in branches/release: . boost

Subject: [Boost-commit] svn:boost r53055 - in branches/release: . boost
From: eric_at_[hidden]
Date: 2009-05-16 14:24:04

Author: eric_niebler
Date: 2009-05-16 14:24:03 EDT (Sat, 16 May 2009)
New Revision: 53055
URL: http://svn.boost.org/trac/boost/changeset/53055

Log:
Merged revisions 52836 via svnmerge from 
https://svn.boost.org/svn/boost/trunk

........
  r52836 | eric_niebler | 2009-05-07 10:16:46 -0700 (Thu, 07 May 2009) | 1 line
  
  work around conflict with python headers
........

Properties modified: 
   branches/release/   (props changed)
Text files modified: 
   branches/release/boost/foreach.hpp |     4 ++--                                    
   1 files changed, 2 insertions(+), 2 deletions(-)

Modified: branches/release/boost/foreach.hpp
==============================================================================
--- branches/release/boost/foreach.hpp	(original)
+++ branches/release/boost/foreach.hpp	2009-05-16 14:24:03 EDT (Sat, 16 May 2009)
@@ -218,8 +218,8 @@
 template<typename Bool1, typename Bool2, typename Bool3>
 inline boost::mpl::or_<Bool1, Bool2, Bool3> *or_(Bool1 *, Bool2 *, Bool3 *) { return 0; }
 
-template<typename Bool>
-inline boost::mpl::not_<Bool> *not_(Bool *) { return 0; }
+template<typename Bool1>
+inline boost::mpl::not_<Bool1> *not_(Bool1 *) { return 0; }
 
 template<typename T>
 inline boost::mpl::false_ *is_rvalue_(T &, int) { return 0; }