|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r52405 - branches/release/boost/bind
From: fmhess_at_[hidden]
Date: 2009-04-15 09:01:17
Author: fmhess
Date: 2009-04-15 09:01:15 EDT (Wed, 15 Apr 2009)
New Revision: 52405
URL: http://svn.boost.org/trac/boost/changeset/52405
Log:
Merged [52384] from trunk.
Text files modified:
branches/release/boost/bind/placeholders.hpp | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
Modified: branches/release/boost/bind/placeholders.hpp
==============================================================================
--- branches/release/boost/bind/placeholders.hpp (original)
+++ branches/release/boost/bind/placeholders.hpp 2009-04-15 09:01:15 EDT (Wed, 15 Apr 2009)
@@ -25,7 +25,7 @@
namespace
{
-#if defined(__BORLANDC__) || defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ <= 400)
+#if defined(__BORLANDC__) || defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ < 400)
static inline boost::arg<1> _1() { return boost::arg<1>(); }
static inline boost::arg<2> _2() { return boost::arg<2>(); }
@@ -37,7 +37,8 @@
static inline boost::arg<8> _8() { return boost::arg<8>(); }
static inline boost::arg<9> _9() { return boost::arg<9>(); }
-#elif defined(BOOST_MSVC) || (defined(__DECCXX_VER) && __DECCXX_VER <= 60590031) || defined(__MWERKS__)
+#elif defined(BOOST_MSVC) || (defined(__DECCXX_VER) && __DECCXX_VER <= 60590031) || defined(__MWERKS__) || \
+ defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ == 400)
static boost::arg<1> _1;
static boost::arg<2> _2;
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