From 4d4913ed971aaf95bf2498cdacb5af7065861ec0 Mon Sep 17 00:00:00 2001 From: bkoz Date: Fri, 22 May 2009 07:19:37 +0000 Subject: [PATCH] 2009-05-21 Benjamin Kosnik PR libstdc++/40221 * include/tr1_impl/functional: Add explicit cast. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@147794 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 7 ++++++- libstdc++-v3/include/tr1_impl/functional | 2 +- 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 + + PR libstdc++/40221 + * include/tr1_impl/functional: Add explicit cast. + 2009-05-21 Paolo Carlini - + PR libstdc++/40094 Revert: 2009-05-07 Paolo Carlini 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(__x)) { _M_invoker = __x._M_invoker; _M_manager = __x._M_manager; -- 2.7.4