diff options
| author | Jelle van der Waa <jelle@vdwaa.nl> | 2013-12-16 20:28:45 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-12-16 20:52:39 +0000 |
| commit | 66397a4fd222757a8bd651c0c297615319eac4a5 (patch) | |
| tree | f84d3cc35ccf23bdcf148cc86835bbb9932350e6 /include/com | |
| parent | b1d65c9f1535c9ef283d2a91a225359e5983f747 (diff) | |
fdo#72598 Remove SunStudio cruft from code base
Change-Id: I5150eec33228e18e274a8ae4effd3f185851b7f4
Reviewed-on: https://gerrit.libreoffice.org/7103
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'include/com')
| -rw-r--r-- | include/com/sun/star/uno/Any.hxx | 3 | ||||
| -rw-r--r-- | include/com/sun/star/uno/Sequence.hxx | 6 |
2 files changed, 1 insertions, 8 deletions
diff --git a/include/com/sun/star/uno/Any.hxx b/include/com/sun/star/uno/Any.hxx index 986b045d5f29..1c02e5d58eef 100644 --- a/include/com/sun/star/uno/Any.hxx +++ b/include/com/sun/star/uno/Any.hxx @@ -157,11 +157,10 @@ inline bool Any::has() const (uno_QueryInterfaceFunc) cpp_queryInterface, (uno_ReleaseFunc) cpp_release ); } -#if ! defined(__SUNPRO_CC) + // not impl: forbid use with ambiguous type (sal_Unicode, sal_uInt16) template <> bool Any::has<sal_uInt16>() const; -#endif // ! defined(__SUNPRO_CC) //__________________________________________________________________________________________________ inline sal_Bool Any::operator == ( const Any & rAny ) const SAL_THROW(()) diff --git a/include/com/sun/star/uno/Sequence.hxx b/include/com/sun/star/uno/Sequence.hxx index 7f0a78df56ce..00e66fc7c6d1 100644 --- a/include/com/sun/star/uno/Sequence.hxx +++ b/include/com/sun/star/uno/Sequence.hxx @@ -259,17 +259,11 @@ SAL_CALL getCppuSequenceType( const ::com::sun::star::uno::Type & rElementType ) & ::com::sun::star::uno::Sequence< E >::s_pType ); } -#if (defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500)) -static typelib_TypeDescriptionReference * s_pType_com_sun_star_uno_Sequence_Char = 0; -#endif - // char sequence inline const ::com::sun::star::uno::Type & SAL_CALL getCharSequenceCppuType() SAL_THROW(()) { -#if !( defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500)) static typelib_TypeDescriptionReference * s_pType_com_sun_star_uno_Sequence_Char = 0; -#endif if (! s_pType_com_sun_star_uno_Sequence_Char) { const ::com::sun::star::uno::Type & rElementType = ::getCharCppuType(); |