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

Tor Lillqvist tml at collabora.com
Thu Sep 12 11:29:23 PDT 2013


 unoidl/source/sourceprovider-scanner.hxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit b302e856f3cf8c0dcea745a94a9823f3cb01cac1
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Sep 12 21:27:58 2013 +0300

    WaE: C4805: '!=' : unsafe mix of type 'bool' and type 'sal_Bool' in operation
    
    Change-Id: I3fd7508a3b9c362661ad1bfa66901be9f938b8e6

diff --git a/unoidl/source/sourceprovider-scanner.hxx b/unoidl/source/sourceprovider-scanner.hxx
index 4509361..152b9cf 100644
--- a/unoidl/source/sourceprovider-scanner.hxx
+++ b/unoidl/source/sourceprovider-scanner.hxx
@@ -59,7 +59,7 @@ public:
         rtl::Reference<unoidl::PlainStructTypeEntity> const & theBaseEntity):
         SourceProviderEntityPad(published), baseName(theBaseName),
         baseEntity(theBaseEntity)
-    { assert(theBaseName.isEmpty() != theBaseEntity.is()); }
+    { assert(theBaseName.isEmpty() != (bool) theBaseEntity.is()); }
 
     OUString const baseName;
     rtl::Reference<unoidl::PlainStructTypeEntity> const baseEntity;
@@ -91,7 +91,7 @@ public:
         rtl::Reference<unoidl::ExceptionTypeEntity> const & theBaseEntity):
         SourceProviderEntityPad(published), baseName(theBaseName),
         baseEntity(theBaseEntity)
-    { assert(theBaseName.isEmpty() != theBaseEntity.is()); }
+    { assert(theBaseName.isEmpty() != (bool) theBaseEntity.is()); }
 
     OUString const baseName;
     rtl::Reference<unoidl::ExceptionTypeEntity> const baseEntity;
@@ -122,7 +122,7 @@ public:
         SourceProviderEntityPad(published),
         singleBase(!singleBaseName.isEmpty())
     {
-        assert(singleBaseName.isEmpty() != singleBaseEntity.is());
+        assert(singleBaseName.isEmpty() != (bool) singleBaseEntity.is());
         if (singleBase) {
             mandatoryBases.push_back(
                 Base(


More information about the Libreoffice-commits mailing list