[Libreoffice-commits] core.git: sal/rtl

Stephan Bergmann sbergman at redhat.com
Thu Feb 13 10:52:24 CET 2014


 sal/rtl/locale.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2d3030b1fa3669b72731863df078c72882fe94e5
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Feb 13 10:50:35 2014 +0100

    Revert "sal: fix some clang warning about implicit bool conversion"
    
    This reverts commit 56ff07a795aca516106bfde80cb32860065690a6, the correct fix is
    d19598b56c8bec688d1944cd167f32a369344100 "Adapt ImplicitBoolConversion to 32-bit
    builds (where sal_Int32 is long)."

diff --git a/sal/rtl/locale.cxx b/sal/rtl/locale.cxx
index 642565f..d075eda 100644
--- a/sal/rtl/locale.cxx
+++ b/sal/rtl/locale.cxx
@@ -316,7 +316,7 @@ sal_Int32 SAL_CALL rtl_locale_hashCode( rtl_Locale * This )
  */
 sal_Int32 SAL_CALL rtl_locale_equals( rtl_Locale * This, rtl_Locale * obj  )
 {
-    return sal_Int32(This == obj);
+    return This == obj;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */


More information about the Libreoffice-commits mailing list