cppu/qa/test_unotype.cxx | 18 ------------------
cppu/source/uno/data.cxx | 2 +-
cppuhelper/test/testcmp/TestComponent.hxx | 5 -----
include/com/sun/star/uno/Any.hxx | 3 +--
include/com/sun/star/uno/Sequence.hxx | 6 ------
include/comphelper/implbase_var.hxx | 3 ---
include/cppuhelper/compbase1.hxx | 10 ----------
include/cppuhelper/compbase10.hxx | 10 ----------
include/cppuhelper/compbase11.hxx | 10 ----------
include/cppuhelper/compbase12.hxx | 10 ----------
include/cppuhelper/compbase2.hxx | 10 ----------
include/cppuhelper/compbase3.hxx | 10 ----------
include/cppuhelper/compbase4.hxx | 10 ----------
include/cppuhelper/compbase5.hxx | 10 ----------
include/cppuhelper/compbase6.hxx | 10 ----------
include/cppuhelper/compbase7.hxx | 10 ----------
include/cppuhelper/compbase8.hxx | 10 ----------
include/cppuhelper/compbase9.hxx | 10 ----------
include/cppuhelper/implbase1.hxx | 5 -----
include/o3tl/heap_ptr.hxx | 22 ----------------------
include/sal/types.h | 16 ++--------------
l10ntools/source/cfglex.l | 2 --
l10ntools/source/srclex.l | 2 --
l10ntools/source/xrmlex.l | 2 --
rsc/source/parser/rscyacc.y | 2 --
sal/rtl/alloc_cache.cxx | 15 ---------------
26 files changed, 4 insertions(+), 219 deletions(-)
New commits:
commit 66397a4fd222757a8bd651c0c297615319eac4a5
Author: Jelle van der Waa <je...@vdwaa.nl>
Date: Mon Dec 16 20:28:45 2013 +0100
fdo#72598 Remove SunStudio cruft from code base
Change-Id: I5150eec33228e18e274a8ae4effd3f185851b7f4
Reviewed-on: https://gerrit.libreoffice.org/7103
Reviewed-by: Michael Stahl <mst...@redhat.com>
Tested-by: Michael Stahl <mst...@redhat.com>
diff --git a/cppu/qa/test_unotype.cxx b/cppu/qa/test_unotype.cxx
index 474e5c9..7ec88cc 100644
--- a/cppu/qa/test_unotype.cxx
+++ b/cppu/qa/test_unotype.cxx
@@ -224,9 +224,7 @@ void Test::testUnoType() {
::rtl::OUString(
"com.sun.star.beans.PropertyChangeEvent"),
t.getTypeName());
-#if !(defined __SUNPRO_CC && __SUNPRO_CC <= 0x550) // erroneous ambiguity
stated
CPPUNIT_ASSERT(::cppu::UnoType< DerivedStruct2 >::get() == t);
-#endif
t = ::cppu::UnoType< css::beans::Optional< ::sal_Int8 > >::get();
CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_STRUCT, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
@@ -243,9 +241,7 @@ void Test::testUnoType() {
CPPUNIT_ASSERT_EQUAL(
::rtl::OUString("com.sun.star.uno.RuntimeException"),
t.getTypeName());
-#if !(defined __SUNPRO_CC && __SUNPRO_CC <= 0x550) // erroneous ambiguity
stated
CPPUNIT_ASSERT(::cppu::UnoType< DerivedException2 >::get() == t);
-#endif
t = ::cppu::UnoType< css::uno::XInterface >::get();
CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_INTERFACE, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
@@ -266,12 +262,10 @@ void Test::testUnoType() {
CPPUNIT_ASSERT(
::cppu::UnoType<
css::uno::Reference< css::uno::XComponentContext > >::get() == t);
-#if !(defined __SUNPRO_CC && __SUNPRO_CC <= 0x550) // erroneous ambiguity
stated
CPPUNIT_ASSERT(::cppu::UnoType< DerivedInterface2 >::get() == t);
CPPUNIT_ASSERT(
::cppu::UnoType< css::uno::Reference< DerivedInterface2 > >::get() ==
t);
-#endif
}
void Test::testGetTypeFavourUnsigned() {
@@ -467,14 +461,12 @@ void Test::testGetTypeFavourUnsigned() {
::cppu::getTypeFavourUnsigned(
static_cast< css::beans::PropertyChangeEvent * >(0)) ==
::getCppuType(static_cast< css::beans::PropertyChangeEvent * >(0)));
-#if !(defined __SUNPRO_CC && __SUNPRO_CC <= 0x550) // erroneous ambiguity
stated
CPPUNIT_ASSERT(
::cppu::getTypeFavourUnsigned(static_cast< DerivedStruct2 * >(0)) ==
::cppu::UnoType< css::beans::PropertyChangeEvent >::get());
CPPUNIT_ASSERT(
::cppu::getTypeFavourUnsigned(static_cast< DerivedStruct2 * >(0)) ==
::getCppuType(static_cast< DerivedStruct2 * >(0)));
-#endif
CPPUNIT_ASSERT(
::cppu::getTypeFavourUnsigned(
static_cast< css::beans::Optional< ::sal_Int8 > * >(0)) ==
@@ -505,14 +497,12 @@ void Test::testGetTypeFavourUnsigned() {
::cppu::getTypeFavourUnsigned(
static_cast< css::uno::RuntimeException * >(0)) ==
::getCppuType(static_cast< css::uno::RuntimeException * >(0)));
-#if !(defined __SUNPRO_CC && __SUNPRO_CC <= 0x550) // erroneous ambiguity
stated
CPPUNIT_ASSERT(
::cppu::getTypeFavourUnsigned(static_cast< DerivedException2 * >(0)) ==
::cppu::UnoType< css::uno::RuntimeException >::get());
CPPUNIT_ASSERT(
::cppu::getTypeFavourUnsigned(static_cast< DerivedException2 * >(0)) ==
::getCppuType(static_cast< DerivedException2 * >(0)));
-#endif
CPPUNIT_ASSERT(
::cppu::getTypeFavourUnsigned(
static_cast< css::uno::XInterface * >(0)) ==
@@ -549,7 +539,6 @@ void Test::testGetTypeFavourUnsigned() {
::getCppuType(
static_cast<
css::uno::Reference< css::uno::XComponentContext > * >(0)));
-#if !(defined __SUNPRO_CC && __SUNPRO_CC <= 0x550) // erroneous ambiguity
stated
CPPUNIT_ASSERT(
::cppu::getTypeFavourUnsigned(static_cast< DerivedInterface2 * >(0)) ==
::cppu::UnoType< css::uno::XComponentContext >::get());
@@ -557,7 +546,6 @@ void Test::testGetTypeFavourUnsigned() {
::cppu::getTypeFavourUnsigned(
static_cast< css::uno::Reference< DerivedInterface2 > * >(0)) ==
::cppu::UnoType< css::uno::XComponentContext >::get());
-#endif
}
void Test::testGetTypeFavourChar() {
@@ -723,14 +711,12 @@ void Test::testGetTypeFavourChar() {
::cppu::getTypeFavourChar(
static_cast< css::beans::PropertyChangeEvent * >(0)) ==
::getCppuType< css::beans::PropertyChangeEvent >());
-#if !(defined __SUNPRO_CC && __SUNPRO_CC <= 0x550) // erroneous ambiguity
stated
CPPUNIT_ASSERT(
::cppu::getTypeFavourChar(static_cast< DerivedStruct2 * >(0)) ==
::cppu::UnoType< css::beans::PropertyChangeEvent >::get());
CPPUNIT_ASSERT(
::cppu::getTypeFavourChar(static_cast< DerivedStruct2 * >(0)) ==
::getCppuType< DerivedStruct2 >());
-#endif
CPPUNIT_ASSERT(
::cppu::getTypeFavourChar(
static_cast< css::beans::Optional< ::sal_Int8 > * >(0)) ==
@@ -759,14 +745,12 @@ void Test::testGetTypeFavourChar() {
::cppu::getTypeFavourChar(
static_cast< css::uno::RuntimeException * >(0)) ==
::getCppuType< css::uno::RuntimeException >());
-#if !(defined __SUNPRO_CC && __SUNPRO_CC <= 0x550) // erroneous ambiguity
stated
CPPUNIT_ASSERT(
::cppu::getTypeFavourChar(static_cast< DerivedException2 * >(0)) ==
::cppu::UnoType< css::uno::RuntimeException >::get());
CPPUNIT_ASSERT(
::cppu::getTypeFavourChar(static_cast< DerivedException2 * >(0)) ==
::getCppuType< DerivedException2 >());
-#endif
CPPUNIT_ASSERT(
::cppu::getTypeFavourChar(
static_cast< css::uno::XInterface * >(0)) ==
@@ -800,7 +784,6 @@ void Test::testGetTypeFavourChar() {
static_cast<
css::uno::Reference< css::uno::XComponentContext > * >(0)) ==
::getCppuType< css::uno::Reference< css::uno::XComponentContext > >());
-#if !(defined __SUNPRO_CC && __SUNPRO_CC <= 0x550) // erroneous ambiguity
stated
CPPUNIT_ASSERT(
::cppu::getTypeFavourChar(static_cast< DerivedInterface2 * >(0)) ==
::cppu::UnoType< css::uno::XComponentContext >::get());
@@ -808,7 +791,6 @@ void Test::testGetTypeFavourChar() {
::cppu::getTypeFavourChar(
static_cast< css::uno::Reference< DerivedInterface2 > * >(0)) ==
::cppu::UnoType< css::uno::XComponentContext >::get());
-#endif
}
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
diff --git a/cppu/source/uno/data.cxx b/cppu/source/uno/data.cxx
index f6f7b1e..b6b4a05 100644
--- a/cppu/source/uno/data.cxx
+++ b/cppu/source/uno/data.cxx
@@ -351,7 +351,7 @@ CPPU_DLLPUBLIC sal_Bool SAL_CALL
uno_type_isAssignableFromData(
#if (defined(INTEL) \
&& (defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD) ||
defined(NETBSD) || defined(OPENBSD)) \
- || defined(MACOSX) || defined(DRAGONFLY) || (defined(__SUNPRO_CC) &&
defined(SOLARIS)))) \
+ || defined(MACOSX) || defined(DRAGONFLY) || )) \
|| defined(IOS)
#define MAX_ALIGNMENT_4
#endif
diff --git a/cppuhelper/test/testcmp/TestComponent.hxx
b/cppuhelper/test/testcmp/TestComponent.hxx
index c2dc7be..9e50189 100644
--- a/cppuhelper/test/testcmp/TestComponent.hxx
+++ b/cppuhelper/test/testcmp/TestComponent.hxx
@@ -32,11 +32,6 @@
#elif defined(__GNUC__) && defined(HAVE_GCC_VISIBILITY_FEATURE)
# define CPPUHELPER_TEST_COMPONENT_EXPORT extern __attribute__ ((weak))
-#elif defined(__SUNPRO_CC)
-# define CPPUHELPER_TEST_COMPONENT_EXPORT extern
- extern rtl::OUString g_envDcp;
-# pragma weak g_envDcp
-
#else
# define CPPUHELPER_TEST_COMPONENT_EXPORT SAL_DLLPUBLIC_IMPORT
diff --git a/include/com/sun/star/uno/Any.hxx b/include/com/sun/star/uno/Any.hxx
index 986b045..1c02e5d 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 7f0a78d..00e66fc 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();
diff --git a/include/comphelper/implbase_var.hxx
b/include/comphelper/implbase_var.hxx
index bb02de5..10ef5f2 100644
--- a/include/comphelper/implbase_var.hxx
+++ b/include/comphelper/implbase_var.hxx
@@ -77,9 +77,6 @@ namespace comphelper {
// Suppress warnings about hidden functions in case any of the IfcN has
// functions named dispose, addEventListener, or removeEventListener:
-#if defined __SUNPRO_CC
-#pragma disable_warn
-#endif
namespace detail {
diff --git a/include/cppuhelper/compbase1.hxx b/include/cppuhelper/compbase1.hxx
index 636547b..01413ec 100644
--- a/include/cppuhelper/compbase1.hxx
+++ b/include/cppuhelper/compbase1.hxx
@@ -25,12 +25,6 @@
namespace cppu
{
-// Suppress warnings about hidden functions in case any of the IfcN has
-// functions named dispose, addEventListener, or removeEventListener:
-#if defined __SUNPRO_CC
-#pragma disable_warn
-#endif
-
/** Implementation helper supporting com::sun::star::lang::XTypeProvider
and
com::sun::star::lang::XComponent.
@@ -74,10 +68,6 @@ namespace cppu
{ return ImplHelper_getImplementationId( cd::get() ); }
};
-#if defined __SUNPRO_CC
-#pragma enable_warn
-#endif
-
/** Same as WeakComponentImplHelper1, except doesn't implement
addEventListener, removeEventListener and dispose.
diff --git a/include/cppuhelper/compbase10.hxx
b/include/cppuhelper/compbase10.hxx
index 408c23d..f265fa7 100644
--- a/include/cppuhelper/compbase10.hxx
+++ b/include/cppuhelper/compbase10.hxx
@@ -25,12 +25,6 @@
namespace cppu
{
-// Suppress warnings about hidden functions in case any of the IfcN has
-// functions named dispose, addEventListener, or removeEventListener:
-#if defined __SUNPRO_CC
-#pragma disable_warn
-#endif
-
/** Implementation helper supporting com::sun::star::lang::XTypeProvider
and
com::sun::star::lang::XComponent.
@@ -74,10 +68,6 @@ namespace cppu
{ return ImplHelper_getImplementationId( cd::get() ); }
};
-#if defined __SUNPRO_CC
-#pragma enable_warn
-#endif
-
/** Same as WeakComponentImplHelper10, except doesn't implement
addEventListener, removeEventListener and dispose.
diff --git a/include/cppuhelper/compbase11.hxx
b/include/cppuhelper/compbase11.hxx
index 84685bc..f06dfad 100644
--- a/include/cppuhelper/compbase11.hxx
+++ b/include/cppuhelper/compbase11.hxx
@@ -25,12 +25,6 @@
namespace cppu
{
-// Suppress warnings about hidden functions in case any of the IfcN has
-// functions named dispose, addEventListener, or removeEventListener:
-#if defined __SUNPRO_CC
-#pragma disable_warn
-#endif
-
/** Implementation helper supporting com::sun::star::lang::XTypeProvider
and
com::sun::star::lang::XComponent.
@@ -74,10 +68,6 @@ namespace cppu
{ return ImplHelper_getImplementationId( cd::get() ); }
};
-#if defined __SUNPRO_CC
-#pragma enable_warn
-#endif
-
/** Same as WeakComponentImplHelper11, except doesn't implement
addEventListener, removeEventListener and dispose.
diff --git a/include/cppuhelper/compbase12.hxx
b/include/cppuhelper/compbase12.hxx
index 07adea4..85e3d32 100644
--- a/include/cppuhelper/compbase12.hxx
+++ b/include/cppuhelper/compbase12.hxx
@@ -25,12 +25,6 @@
namespace cppu
{
-// Suppress warnings about hidden functions in case any of the IfcN has
-// functions named dispose, addEventListener, or removeEventListener:
-#if defined __SUNPRO_CC
-#pragma disable_warn
-#endif
-
/** Implementation helper supporting com::sun::star::lang::XTypeProvider
and
com::sun::star::lang::XComponent.
@@ -74,10 +68,6 @@ namespace cppu
{ return ImplHelper_getImplementationId( cd::get() ); }
};
-#if defined __SUNPRO_CC
-#pragma enable_warn
-#endif
-
/** Same as WeakComponentImplHelper12, except doesn't implement
addEventListener, removeEventListener and dispose.
diff --git a/include/cppuhelper/compbase2.hxx b/include/cppuhelper/compbase2.hxx
index f848b33..082ff36 100644
--- a/include/cppuhelper/compbase2.hxx
+++ b/include/cppuhelper/compbase2.hxx
@@ -25,12 +25,6 @@
namespace cppu
{
-// Suppress warnings about hidden functions in case any of the IfcN has
-// functions named dispose, addEventListener, or removeEventListener:
-#if defined __SUNPRO_CC
-#pragma disable_warn
-#endif
-
/** Implementation helper supporting com::sun::star::lang::XTypeProvider
and
com::sun::star::lang::XComponent.
@@ -74,10 +68,6 @@ namespace cppu
{ return ImplHelper_getImplementationId( cd::get() ); }
};
-#if defined __SUNPRO_CC
-#pragma enable_warn
-#endif
-
/** Same as WeakComponentImplHelper2, except doesn't implement
addEventListener, removeEventListener and dispose.
diff --git a/include/cppuhelper/compbase3.hxx b/include/cppuhelper/compbase3.hxx
index c51b46c..dba9a35 100644
--- a/include/cppuhelper/compbase3.hxx
+++ b/include/cppuhelper/compbase3.hxx
@@ -25,12 +25,6 @@
namespace cppu
{
-// Suppress warnings about hidden functions in case any of the IfcN has
-// functions named dispose, addEventListener, or removeEventListener:
-#if defined __SUNPRO_CC
-#pragma disable_warn
-#endif
-
/** Implementation helper supporting com::sun::star::lang::XTypeProvider
and
com::sun::star::lang::XComponent.
@@ -74,10 +68,6 @@ namespace cppu
{ return ImplHelper_getImplementationId( cd::get() ); }
};
-#if defined __SUNPRO_CC
-#pragma enable_warn
-#endif
-
/** Same as WeakComponentImplHelper3, except doesn't implement
addEventListener, removeEventListener and dispose.
diff --git a/include/cppuhelper/compbase4.hxx b/include/cppuhelper/compbase4.hxx
index 60c5059..50bcc65 100644
--- a/include/cppuhelper/compbase4.hxx
+++ b/include/cppuhelper/compbase4.hxx
@@ -25,12 +25,6 @@
namespace cppu
{
-// Suppress warnings about hidden functions in case any of the IfcN has
-// functions named dispose, addEventListener, or removeEventListener:
-#if defined __SUNPRO_CC
-#pragma disable_warn
-#endif
-
/** Implementation helper supporting com::sun::star::lang::XTypeProvider
and
com::sun::star::lang::XComponent.
@@ -74,10 +68,6 @@ namespace cppu
{ return ImplHelper_getImplementationId( cd::get() ); }
};
-#if defined __SUNPRO_CC
-#pragma enable_warn
-#endif
-
/** Same as WeakComponentImplHelper4, except doesn't implement
addEventListener, removeEventListener and dispose.
diff --git a/include/cppuhelper/compbase5.hxx b/include/cppuhelper/compbase5.hxx
index 82aa7c1..60ed314 100644
--- a/include/cppuhelper/compbase5.hxx
+++ b/include/cppuhelper/compbase5.hxx
@@ -25,12 +25,6 @@
namespace cppu
{
-// Suppress warnings about hidden functions in case any of the IfcN has
-// functions named dispose, addEventListener, or removeEventListener:
-#if defined __SUNPRO_CC
-#pragma disable_warn
-#endif
-
/** Implementation helper supporting com::sun::star::lang::XTypeProvider
and
com::sun::star::lang::XComponent.
@@ -74,10 +68,6 @@ namespace cppu
{ return ImplHelper_getImplementationId( cd::get() ); }
};
-#if defined __SUNPRO_CC
-#pragma enable_warn
-#endif
-
/** Same as WeakComponentImplHelper5, except doesn't implement
addEventListener, removeEventListener and dispose.
diff --git a/include/cppuhelper/compbase6.hxx b/include/cppuhelper/compbase6.hxx
index 77168e1..233f474 100644
--- a/include/cppuhelper/compbase6.hxx
+++ b/include/cppuhelper/compbase6.hxx
@@ -25,12 +25,6 @@
namespace cppu
{
-// Suppress warnings about hidden functions in case any of the IfcN has
-// functions named dispose, addEventListener, or removeEventListener:
-#if defined __SUNPRO_CC
-#pragma disable_warn
-#endif
-
/** Implementation helper supporting com::sun::star::lang::XTypeProvider
and
com::sun::star::lang::XComponent.
@@ -74,10 +68,6 @@ namespace cppu
{ return ImplHelper_getImplementationId( cd::get() ); }
};
-#if defined __SUNPRO_CC
-#pragma enable_warn
-#endif
-
/** Same as WeakComponentImplHelper6, except doesn't implement
addEventListener, removeEventListener and dispose.
diff --git a/include/cppuhelper/compbase7.hxx b/include/cppuhelper/compbase7.hxx
index a069cfe..391b15d 100644
--- a/include/cppuhelper/compbase7.hxx
+++ b/include/cppuhelper/compbase7.hxx
@@ -25,12 +25,6 @@
namespace cppu
{
-// Suppress warnings about hidden functions in case any of the IfcN has
-// functions named dispose, addEventListener, or removeEventListener:
-#if defined __SUNPRO_CC
-#pragma disable_warn
-#endif
-
/** Implementation helper supporting com::sun::star::lang::XTypeProvider
and
com::sun::star::lang::XComponent.
@@ -74,10 +68,6 @@ namespace cppu
{ return ImplHelper_getImplementationId( cd::get() ); }
};
-#if defined __SUNPRO_CC
-#pragma enable_warn
-#endif
-
/** Same as WeakComponentImplHelper7, except doesn't implement
addEventListener, removeEventListener and dispose.
diff --git a/include/cppuhelper/compbase8.hxx b/include/cppuhelper/compbase8.hxx
index 989b8d4..c4ccd28 100644
--- a/include/cppuhelper/compbase8.hxx
+++ b/include/cppuhelper/compbase8.hxx
@@ -25,12 +25,6 @@
namespace cppu
{
-// Suppress warnings about hidden functions in case any of the IfcN has
-// functions named dispose, addEventListener, or removeEventListener:
-#if defined __SUNPRO_CC
-#pragma disable_warn
-#endif
-
/** Implementation helper supporting com::sun::star::lang::XTypeProvider
and
com::sun::star::lang::XComponent.
@@ -74,10 +68,6 @@ namespace cppu
{ return ImplHelper_getImplementationId( cd::get() ); }
};
-#if defined __SUNPRO_CC
-#pragma enable_warn
-#endif
-
/** Same as WeakComponentImplHelper8, except doesn't implement
addEventListener, removeEventListener and dispose.
diff --git a/include/cppuhelper/compbase9.hxx b/include/cppuhelper/compbase9.hxx
index 0fac12c..6c4203c 100644
--- a/include/cppuhelper/compbase9.hxx
+++ b/include/cppuhelper/compbase9.hxx
@@ -25,12 +25,6 @@
namespace cppu
{
-// Suppress warnings about hidden functions in case any of the IfcN has
-// functions named dispose, addEventListener, or removeEventListener:
-#if defined __SUNPRO_CC
-#pragma disable_warn
-#endif
-
/** Implementation helper supporting com::sun::star::lang::XTypeProvider
and
com::sun::star::lang::XComponent.
@@ -74,10 +68,6 @@ namespace cppu
{ return ImplHelper_getImplementationId( cd::get() ); }
};
-#if defined __SUNPRO_CC
-#pragma enable_warn
-#endif
-
/** Same as WeakComponentImplHelper9, except doesn't implement
addEventListener, removeEventListener and dispose.
diff --git a/include/cppuhelper/implbase1.hxx b/include/cppuhelper/implbase1.hxx
index b0c1b0b..4ff99af 100644
--- a/include/cppuhelper/implbase1.hxx
+++ b/include/cppuhelper/implbase1.hxx
@@ -170,11 +170,6 @@ namespace cppu
{
struct cd : public rtl::StaticAggregate< class_data, ImplClassData1<
Ifc1, ImplInheritanceHelper1< BaseClass, Ifc1 > > > {};
protected:
-#if (defined __SUNPRO_CC && __SUNPRO_CC <= 0x550)
- // Hack, to get comphelper::service_decl to work for non-trivial impl
classes
- ImplInheritanceHelper1(
com::sun::star::uno::Sequence<com::sun::star::uno::Any> const& args,
-
com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&
xContext ) : BaseClass(args,xContext) {}
-#endif
template< typename T1 >
explicit ImplInheritanceHelper1(T1 const & arg1): BaseClass(arg1) {}
template< typename T1, typename T2 >
diff --git a/include/o3tl/heap_ptr.hxx b/include/o3tl/heap_ptr.hxx
index 713aa21..d094c25 100644
--- a/include/o3tl/heap_ptr.hxx
+++ b/include/o3tl/heap_ptr.hxx
@@ -78,9 +78,7 @@ class heap_ptr
typedef T element_type; /// Provided for generic
programming.
typedef heap_ptr<T> self;
-#ifndef __SUNPRO_CC
typedef T * (self::* safe_bool )();
-#endif
/// Now, pass_heapObject is owned by this.
explicit heap_ptr(
@@ -98,13 +96,7 @@ class heap_ptr
const T * operator->() const;
T * operator->();
- /// True, if pHeapObject != 0.
-#ifndef __SUNPRO_CC
operator safe_bool() const;
-#else // workaround opt bug of Sun C++ compiler, when compiling with -xO3
- operator bool() const;
-#endif
-
/** This deletes any prevoiusly existing ->pHeapObject.
Now, pass_heapObject, if != 0, is owned by this.
@@ -224,8 +216,6 @@ heap_ptr<T>::operator->()
return pHeapObject;
}
-#ifndef __SUNPRO_CC
-
template <class T>
inline
heap_ptr<T>::operator typename heap_ptr<T>::safe_bool() const
@@ -235,18 +225,6 @@ heap_ptr<T>::operator typename heap_ptr<T>::safe_bool()
const
: safe_bool(0);
}
-#else
-
-template <class T>
-inline heap_ptr<T>::operator bool() const
-{
- return is();
-}
-
-#endif // !defined(__SUNPRO_CC)
-
-
-
template <class T>
void
heap_ptr<T>::reset(T * pass_heapObject)
diff --git a/include/sal/types.h b/include/sal/types.h
index 5778914..cc04246 100644
--- a/include/sal/types.h
+++ b/include/sal/types.h
@@ -88,7 +88,7 @@ typedef unsigned char sal_uInt8;
#define SAL_PRIuUINT64 "I64u"
#define SAL_PRIxUINT64 "I64x"
#define SAL_PRIXUINT64 "I64X"
-#elif defined(__SUNPRO_CC) || defined(__SUNPRO_C) || defined (__GNUC__) ||
defined (sgi)
+#elif defined (__GNUC__) || defined (sgi)
#if SAL_TYPES_SIZEOFLONG == 8
typedef signed long int sal_Int64;
typedef unsigned long int sal_uInt64;
@@ -250,19 +250,7 @@ typedef void * sal_Handle;
# define SAL_CALL __cdecl
# define SAL_CALL_ELLIPSE __cdecl
#elif defined SAL_UNX
-# if defined(__SUNPRO_CC) && (__SUNPRO_CC >= 0x550)
-# define SAL_DLLPUBLIC_EXPORT __global
-# define SAL_JNI_EXPORT __global
-# define SAL_DLLPUBLIC_IMPORT
-# define SAL_DLLPRIVATE __hidden
-# define SAL_DLLPUBLIC_TEMPLATE
-# elif defined(__SUNPRO_C ) && (__SUNPRO_C >= 0x550)
-# define SAL_DLLPUBLIC_EXPORT __global
-# define SAL_JNI_EXPORT __global
-# define SAL_DLLPUBLIC_IMPORT
-# define SAL_DLLPRIVATE __hidden
-# define SAL_DLLPUBLIC_TEMPLATE
-# elif defined(__GNUC__) && defined(HAVE_GCC_VISIBILITY_FEATURE)
+# if defined(__GNUC__) && defined(HAVE_GCC_VISIBILITY_FEATURE)
# if defined(DISABLE_DYNLOADING)
# define SAL_DLLPUBLIC_EXPORT __attribute__ ((visibility("hidden")))
# define SAL_JNI_EXPORT __attribute__ ((visibility("default")))
diff --git a/l10ntools/source/cfglex.l b/l10ntools/source/cfglex.l
index 501debd..7313527 100644
--- a/l10ntools/source/cfglex.l
+++ b/l10ntools/source/cfglex.l
@@ -48,8 +48,6 @@
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
#endif
-#elif defined __SUNPRO_CC
-#pragma disable_warn
#elif defined _MSC_VER
#pragma warning(push, 1)
#endif
diff --git a/l10ntools/source/srclex.l b/l10ntools/source/srclex.l
index 91742a1..048d1f1 100644
--- a/l10ntools/source/srclex.l
+++ b/l10ntools/source/srclex.l
@@ -49,8 +49,6 @@
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
#endif
-#elif defined __SUNPRO_CC
-#pragma disable_warn
#elif defined _MSC_VER
#pragma warning(push, 1)
#endif
diff --git a/l10ntools/source/xrmlex.l b/l10ntools/source/xrmlex.l
index 73e3bab..3017a7f 100644
--- a/l10ntools/source/xrmlex.l
+++ b/l10ntools/source/xrmlex.l
@@ -48,8 +48,6 @@
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
#endif
-#elif defined __SUNPRO_CC
-#pragma disable_warn
#elif defined _MSC_VER
#pragma warning(push, 1)
#endif
diff --git a/rsc/source/parser/rscyacc.y b/rsc/source/parser/rscyacc.y
index c0a68e8..6a7ad43 100644
--- a/rsc/source/parser/rscyacc.y
+++ b/rsc/source/parser/rscyacc.y
@@ -259,8 +259,6 @@ RSCINST GetFirstTupelEle( const RSCINST & rTop )
#endif
#if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY
#pragma GCC diagnostic ignored "-Wwrite-strings"
-#elif defined __SUNPRO_CC
-#pragma disable_warn
#endif
%}
diff --git a/sal/rtl/alloc_cache.cxx b/sal/rtl/alloc_cache.cxx
index 561880f..252fa07 100644
--- a/sal/rtl/alloc_cache.cxx
+++ b/sal/rtl/alloc_cache.cxx
@@ -617,11 +617,6 @@ rtl_cache_depot_enqueue (
depot->m_mag_count++;
}
-#if defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-#pragma inline(rtl_cache_depot_enqueue)
-#endif /* __SUNPRO_C */
-
-
/** rtl_cache_depot_dequeue()
*
* @precond cache->m_depot_lock acquired.
@@ -651,11 +646,6 @@ rtl_cache_depot_dequeue (
return (mag);
}
-#if defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-#pragma inline(rtl_cache_depot_dequeue)
-#endif /* __SUNPRO_C */
-
-
/** rtl_cache_depot_exchange_alloc()
*
* @precond cache->m_depot_lock acquired.
@@ -710,11 +700,6 @@ rtl_cache_depot_exchange_free (
return (empty);
}
-#if defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-#pragma inline(rtl_cache_depot_exchange_free)
-#endif /* __SUNPRO_C */
-
-
/** rtl_cache_depot_populate()
*
* @precond cache->m_depot_lock acquired.
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
