[Libreoffice-commits] .: bridges/source

[Libreoffice Gerrit user]

 bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit dccddcc20b0b873ca182983506d97b500edfe4f1
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Wed Sep 26 16:55:37 2012 +0200

    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.

diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.cxx
index 34f261a..56612d2 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;