diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-02-14 00:17:06 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-02-16 22:32:52 +0100 |
| commit | 6b3aa0fe4094e87290bd33a30bd6cd99ee78ce38 (patch) | |
| tree | 43f1bb7ba872a8c486186746c6ecd7c0488f5d95 /include | |
| parent | ddadc1ee95c09eaadb0a1d01e234952b8581694c (diff) | |
tdf#78174: toolkit: work around GCC 4.9 -Os link failure
A build with gcc (GCC) 4.9.2 20141101 (Red Hat 4.9.2-1) for 32-bit x86
fails because of these undefined symbols:
> nm --demangle workdir/CxxObject/svx/source/fmcomp/fmgridif.o | grep
\\bWindowListenerMultiplexer::acquire
U non-virtual thunk to WindowListenerMultiplexer::acquire()
They should probably be generated inline. Work around by out-lining the
definition of the methods.
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64812
Change-Id: I318f7c39bdf1243be385bc6dc0a47862b22e92c5
Diffstat (limited to 'include')
| -rw-r--r-- | include/toolkit/helper/macros.hxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/include/toolkit/helper/macros.hxx b/include/toolkit/helper/macros.hxx index 43ef27a8483b..85474c8cf777 100644 --- a/include/toolkit/helper/macros.hxx +++ b/include/toolkit/helper/macros.hxx @@ -112,8 +112,8 @@ class ClassName : public ListenerMultiplexerBase, public InterfaceName \ public: \ ClassName( ::cppu::OWeakObject& rSource ); \ ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; \ - void SAL_CALL acquire() throw() SAL_OVERRIDE { ListenerMultiplexerBase::acquire(); } \ - void SAL_CALL release() throw() SAL_OVERRIDE { ListenerMultiplexerBase::release(); } \ + void SAL_CALL acquire() throw() SAL_OVERRIDE; \ + void SAL_CALL release() throw() SAL_OVERRIDE; \ void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -124,8 +124,8 @@ class TOOLKIT_DLLPUBLIC ClassName : public ListenerMultiplexerBase, public Inter public: \ ClassName( ::cppu::OWeakObject& rSource ); \ ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; \ - void SAL_CALL acquire() throw() SAL_OVERRIDE { ListenerMultiplexerBase::acquire(); } \ - void SAL_CALL release() throw() SAL_OVERRIDE { ListenerMultiplexerBase::release(); } \ + void SAL_CALL acquire() throw() SAL_OVERRIDE; \ + void SAL_CALL release() throw() SAL_OVERRIDE; \ void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -140,6 +140,8 @@ ClassName::ClassName( ::cppu::OWeakObject& rSource ) \ : ListenerMultiplexerBase( rSource ) \ { \ } \ +void SAL_CALL ClassName::acquire() throw() { ListenerMultiplexerBase::acquire(); } \ +void SAL_CALL ClassName::release() throw() { ListenerMultiplexerBase::release(); } \ ::com::sun::star::uno::Any ClassName::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) \ { \ ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, \ |