[Libreoffice-commits] .: bridges/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Mon Oct 22 04:44:10 PDT 2012


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

New commits:
commit e9a09f9e4a308052c2ca6d6435c01b000004d7bf
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Oct 22 13:41:45 2012 +0200

    dummy_can_throw_anything reportedly needed at least with GCC 4.5.1, too
    
    ...see
    <http://lists.freedesktop.org/archives/libreoffice/2012-October/039995.html>
    "RuntimeException while building"
    
    Change-Id: I038806d4ca1d7a2a2518106ba722509fbe3a7843

diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.cxx
index 56612d2..cb4b574 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.cxx
@@ -67,7 +67,7 @@ void CPPU_CURRENT_NAMESPACE::callVirtualMethod(
         // unexpected size of int
     assert(nStackLongs && pStackLongs); // no stack
 
-#ifdef __clang__
+#if defined __clang__ || __GNUC__ == 4 && __GNUC_MINOR__ <= 6
     if (! pAdjustedThisPtr) CPPU_CURRENT_NAMESPACE::dummy_can_throw_anything("xxx"); // address something
 #endif
 


More information about the Libreoffice-commits mailing list