PR libstdc++/53578

	* include/ext/concurrence.h (__recursive_mutex::_S_destroy): Fix
	narrowing conversion.
	* include/std/mutex (__recursive_mutex_base::_S_destroy): Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch@189351 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 5fe3372..0a7519f 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2012-07-07  Jonathan Wakely  <jwakely.gcc@gmail.com>
+
+       PR libstdc++/53578
+       * include/ext/concurrence.h (__recursive_mutex::_S_destroy): Fix
+       narrowing conversion.
+       * include/std/mutex (__recursive_mutex_base::_S_destroy): Likewise.
+

 2012-07-06  Paolo Carlini  <paolo.carlini@oracle.com>
 
        PR libstdc++/53872
 2012-07-06  Paolo Carlini  <paolo.carlini@oracle.com>
 
        PR libstdc++/53872

diff --git a/libstdc++-v3/include/ext/concurrence.h b/libstdc++-v3/include/ext/concurrence.h
index fc8f63f..4719c84 100644 (file)
--- a/libstdc++-v3/include/ext/concurrence.h
+++ b/libstdc++-v3/include/ext/concurrence.h
@@ -270,7 +270,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
     // matches a gthr-win32.h recursive mutex
     template<typename _Rm>
 
     // matches a gthr-win32.h recursive mutex
     template<typename _Rm>

-      static typename __enable_if<sizeof(&_Rm::sema), void>::__type
+      static typename __enable_if<(bool)sizeof(&_Rm::sema), void>::__type

       _S_destroy(_Rm* __mx)
       {
         __gthread_mutex_t __tmp;
       _S_destroy(_Rm* __mx)
       {
         __gthread_mutex_t __tmp;


@@ -279,7 +279,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
     // matches a recursive mutex with a member 'actual'
     template<typename _Rm>
 
     // matches a recursive mutex with a member 'actual'
     template<typename _Rm>

-      static typename __enable_if<sizeof(&_Rm::actual), void>::__type
+      static typename __enable_if<(bool)sizeof(&_Rm::actual), void>::__type

       _S_destroy(_Rm* __mx)
       { __gthread_mutex_destroy(&__mx->actual); }
 
       _S_destroy(_Rm* __mx)
       { __gthread_mutex_destroy(&__mx->actual); }
 

diff --git a/libstdc++-v3/include/std/mutex b/libstdc++-v3/include/std/mutex
index a7ebace..34d64c5 100644 (file)
--- a/libstdc++-v3/include/std/mutex
+++ b/libstdc++-v3/include/std/mutex
@@ -116,13 +116,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
     // matches a recursive mutex with a member 'actual'
     template<typename _Rm>
 
     // matches a recursive mutex with a member 'actual'
     template<typename _Rm>

-      static typename enable_if<sizeof(&_Rm::actual), void>::type
+      static typename enable_if<(bool)sizeof(&_Rm::actual), void>::type

       _S_destroy(_Rm* __mx)
       { __gthread_mutex_destroy(&__mx->actual); }
 
     // matches a gthr-win32.h recursive mutex
     template<typename _Rm>
       _S_destroy(_Rm* __mx)
       { __gthread_mutex_destroy(&__mx->actual); }
 
     // matches a gthr-win32.h recursive mutex
     template<typename _Rm>

-      static typename enable_if<sizeof(&_Rm::sema), void>::type
+      static typename enable_if<(bool)sizeof(&_Rm::sema), void>::type

       _S_destroy(_Rm* __mx)
       {
         __gthread_mutex_t __tmp;
       _S_destroy(_Rm* __mx)
       {
         __gthread_mutex_t __tmp;