aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Kosnik <bkoz@redhat.com>2009-05-22 07:19:37 +0000
committerBenjamin Kosnik <bkoz@gcc.gnu.org>2009-05-22 07:19:37 +0000
commite4c29fbc9e0c826fac5586555d54db657d7b2382 (patch)
tree8dfad1495f163a4a502d7bf3fd91c6a402ba8381
parenteebc710d2e45b220f462f0f439db7336ec6b4b9d (diff)
downloadgcc-e4c29fbc9e0c826fac5586555d54db657d7b2382.zip
gcc-e4c29fbc9e0c826fac5586555d54db657d7b2382.tar.gz
gcc-e4c29fbc9e0c826fac5586555d54db657d7b2382.tar.bz2
re PR bootstrap/40221 (Powerpc bootstrap is broken in building libstdc++)
2009-05-21 Benjamin Kosnik <bkoz@redhat.com> PR libstdc++/40221 * include/tr1_impl/functional: Add explicit cast. From-SVN: r147794
-rw-r--r--libstdc++-v3/ChangeLog7
-rw-r--r--libstdc++-v3/include/tr1_impl/functional2
2 files changed, 7 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index b52f1a8..73bc136 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,10 @@
+2009-05-21 Benjamin Kosnik <bkoz@redhat.com>
+
+ PR libstdc++/40221
+ * include/tr1_impl/functional: Add explicit cast.
+
2009-05-21 Paolo Carlini <paolo.carlini@oracle.com>
-
+
PR libstdc++/40094
Revert:
2009-05-07 Paolo Carlini <paolo.carlini@oracle.com>
diff --git a/libstdc++-v3/include/tr1_impl/functional b/libstdc++-v3/include/tr1_impl/functional
index 75a6fdf..980061d 100644
--- a/libstdc++-v3/include/tr1_impl/functional
+++ b/libstdc++-v3/include/tr1_impl/functional
@@ -1989,7 +1989,7 @@ _GLIBCXX_BEGIN_NAMESPACE_TR1
function(const function& __x)
: _Function_base()
{
- if (__x)
+ if (static_cast<bool>(__x))
{
_M_invoker = __x._M_invoker;
_M_manager = __x._M_manager;