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/cppuhelper | |
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/cppuhelper')
-rw-r--r-- | include/cppuhelper/compbase1.hxx | 10 | ||||
-rw-r--r-- | include/cppuhelper/compbase10.hxx | 10 | ||||
-rw-r--r-- | include/cppuhelper/compbase11.hxx | 10 | ||||
-rw-r--r-- | include/cppuhelper/compbase12.hxx | 10 | ||||
-rw-r--r-- | include/cppuhelper/compbase2.hxx | 10 | ||||
-rw-r--r-- | include/cppuhelper/compbase3.hxx | 10 | ||||
-rw-r--r-- | include/cppuhelper/compbase4.hxx | 10 | ||||
-rw-r--r-- | include/cppuhelper/compbase5.hxx | 10 | ||||
-rw-r--r-- | include/cppuhelper/compbase6.hxx | 10 | ||||
-rw-r--r-- | include/cppuhelper/compbase7.hxx | 10 | ||||
-rw-r--r-- | include/cppuhelper/compbase8.hxx | 10 | ||||
-rw-r--r-- | include/cppuhelper/compbase9.hxx | 10 | ||||
-rw-r--r-- | include/cppuhelper/implbase1.hxx | 5 |
13 files changed, 0 insertions, 125 deletions
diff --git a/include/cppuhelper/compbase1.hxx b/include/cppuhelper/compbase1.hxx index 636547bc0557..01413ecb8600 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 408c23d301b8..f265fa797789 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 84685bc6cb6e..f06dfada9add 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 07adea43884a..85e3d32e6cb6 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 f848b337f012..082ff365692d 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 c51b46c56471..dba9a35b20c3 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 60c50594ac61..50bcc6547244 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 82aa7c13ac32..60ed314b5fa6 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 77168e1b3aa1..233f4743147f 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 a069cfe7ed3c..391b15ddb94c 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 989b8d43f637..c4ccd289495c 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 0fac12ce4075..6c4203c32a89 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 b0c1b0bd0893..4ff99af32c86 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 > |