[Libreoffice-commits] core.git: comphelper/source

[Stephan Bergmann]

 comphelper/source/misc/types.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 930202b0b239636532bda471cc51d4750e09536f
Author: Stephan Bergmann <sberg...@redhat.com>
Date:   Wed Jan 22 15:03:13 2014 +0100

    Maybe this bool clean-up avoids false -Werror=maybe-uninitialized on Android
    
    Change-Id: Iab12cc703d190e79650f73c646a2fbb60c6685c5

diff --git a/comphelper/source/misc/types.cxx b/comphelper/source/misc/types.cxx
index fbf49f3..684f2d2 100644
--- a/comphelper/source/misc/types.cxx
+++ b/comphelper/source/misc/types.cxx
@@ -164,17 +164,17 @@ sal_Bool isAssignableFrom(const Type& _rAssignable, const 
Type& _rFrom)
 
 //------------------------------------------------------------------
 template<class TYPE>
-sal_Bool tryCompare(const void* _pData, const Any& _rValue, sal_Bool& 
_bIdentical, TYPE& _rOut)
+bool tryCompare(const void* _pData, const Any& _rValue, sal_Bool& _bIdentical, 
TYPE& _rOut)
 {
-    sal_Bool bSuccess = _rValue >>= _rOut;
+    bool bSuccess = _rValue >>= _rOut;
     _bIdentical = bSuccess && (_rOut == *reinterpret_cast<const 
TYPE*>(_pData));
     return bSuccess;
 }
 
 //------------------------------------------------------------------
-sal_Bool tryCompare(const void* _pData, const Any& _rValue, sal_Bool& 
_bIdentical, sal_Unicode& _rOut)
+bool tryCompare(const void* _pData, const Any& _rValue, sal_Bool& _bIdentical, 
sal_Unicode& _rOut)
 {
-    sal_Bool bSuccess = ( _rValue.getValueTypeClass() == TypeClass_CHAR );
+    bool bSuccess = ( _rValue.getValueTypeClass() == TypeClass_CHAR );
     if ( bSuccess )
         _rOut = *static_cast< const sal_Unicode* >( _rValue.getValue() );
     _bIdentical = bSuccess && ( _rOut == *static_cast< const sal_Unicode* >( 
_pData ) );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits