diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2012-09-26 16:55:37 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2012-09-26 16:55:37 +0200 |
| commit | dccddcc20b0b873ca182983506d97b500edfe4f1 (patch) | |
| tree | 3d8578332a3b2aa53d660dc9633589a367527afe /bridges | |
| parent | 7372bbced8d99d6fd479a464095e4f827c39422e (diff) | |
make gcc-uno bridge work with both gcc-4.7 and clang
It seems b0515ea5fa6c29faebed616ae3e0213c72d24904 and e2b7e28c12bb836fd7ab1dcbfc2460f807dd27f6
conflict, clang requires the extra call, gcc-4.7 crashes with it.
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.cxx index 34f261a7fc34..56612d2f6d3a 100644 --- a/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.cxx @@ -67,7 +67,9 @@ void CPPU_CURRENT_NAMESPACE::callVirtualMethod( // unexpected size of int assert(nStackLongs && pStackLongs); // no stack +#ifdef __clang__ if (! pAdjustedThisPtr) CPPU_CURRENT_NAMESPACE::dummy_can_throw_anything("xxx"); // address something +#endif volatile long edx = 0, eax = 0; // for register returns void * stackptr; |