[Libreoffice-commits] core.git: include/com

Caolán McNamara caolanm at redhat.com
Wed Sep 24 00:17:59 PDT 2014


 include/com/sun/star/uno/Any.hxx |    8 --------
 1 file changed, 8 deletions(-)

New commits:
commit c09a0d8516b7a53e8e9dd802ba63c17ba6ee20d3
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Sep 23 20:53:31 2014 +0100

    fix build with coverity 7.0.2 and gcc 4.8.3
    
    these "forbid use with ambiguous type" things already appear with deleted
    markup in Any.h which is included by Any.hxx
    
    WARNING: cov-emit returned with code 2
    
    "coverity/include/com/sun/star/uno/Any.hxx", line 163: error #1810:
              function
              "com::sun::star::uno::Any::has<T>() const [with T=sal_uInt16]"
              (declared at line 244 of
              "coverity/include/com/sun/star/uno/Any.h")
              cannot be specialized because it is deleted
      bool Any::has<sal_uInt16>() const;
                ^
    
    "coverity/include/com/sun/star/uno/Any.hxx", line 604: error #1810:
              function
              "com::sun::star::uno::Any::get<T>() const [with T=sal_uInt16]"
              (declared at line 243 of
              "coverity/include/com/sun/star/uno/Any.h")
              cannot be specialized because it is deleted
      sal_uInt16 Any::get<sal_uInt16>() const;
    
    Change-Id: I7d8b8ee1015c3e598143a2240297ce81a9e36987
    Reviewed-on: https://gerrit.libreoffice.org/11611
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
    Tested-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/include/com/sun/star/uno/Any.hxx b/include/com/sun/star/uno/Any.hxx
index edb0da4..8d5b7dd 100644
--- a/include/com/sun/star/uno/Any.hxx
+++ b/include/com/sun/star/uno/Any.hxx
@@ -158,11 +158,6 @@ inline bool Any::has() const
         (uno_ReleaseFunc) cpp_release );
 }
 
-// not impl: forbid use with ambiguous type (sal_Unicode, sal_uInt16)
-template <>
-bool Any::has<sal_uInt16>() const;
-
-
 inline bool Any::operator == ( const Any & rAny ) const
 {
     return ::uno_type_equalData(
@@ -599,9 +594,6 @@ T Any::get() const
     }
     return value;
 }
-// not impl: forbid use with ambiguous type (sal_Unicode, sal_uInt16)
-template <>
-sal_uInt16 Any::get<sal_uInt16>() const;
 
 /**
    Support for Any in std::ostream (and thus in CPPUNIT_ASSERT or SAL_INFO


More information about the Libreoffice-commits mailing list