2009-05-21 Benjamin Kosnik <bkoz@redhat.com>

	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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index b52f1a8..73bc136 100644 (file)
--- 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 (file)
--- 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;