[Libreoffice-commits] core.git: testtools/source

Michael Stahl mstahl at redhat.com
Fri Feb 27 07:38:06 PST 2015


 testtools/source/bridgetest/currentcontextchecker.hxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0ee5a79a280dcacc326aafffb0a109ee63016c59
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Feb 27 16:27:41 2015 +0100

    testtools: mark CurrentContextChecker as DLLPRIVATE
    
    The problem is that currentcontextchecker.cxx is linked statically into 2
    dynamic libraries, and with clang now using -fvisibility-ms-compat since
    commit f0aa1a78fb209310e8baef53c02f365fca518d11 the ASAN complains about
    ODR violation in testttols uno_test:
    
    ==1818==ERROR: AddressSanitizer: odr-violation (0x2aef08e9c600):
      [1] size=192 'vtable for testtools::bridgetest::CurrentContextChecker'
      testtools/source/bridgetest/currentcontextchecker.cxx
      [2] size=192 'vtable for testtools::bridgetest::CurrentContextChecker'
      testtools/source/bridgetest/currentcontextchecker.cxx
    
    Change-Id: Ie705788dbf035f7a9f64878c6dcf3cec9b7e7ba1

diff --git a/testtools/source/bridgetest/currentcontextchecker.hxx b/testtools/source/bridgetest/currentcontextchecker.hxx
index cd4feef..3c728c9 100644
--- a/testtools/source/bridgetest/currentcontextchecker.hxx
+++ b/testtools/source/bridgetest/currentcontextchecker.hxx
@@ -30,7 +30,7 @@
 
 namespace testtools { namespace bridgetest {
 
-class CurrentContextChecker:
+class SAL_DLLPRIVATE CurrentContextChecker :
     public ::osl::DebugBase< CurrentContextChecker >,
     public ::cppu::WeakImplHelper1<
         ::test::testtools::bridgetest::XCurrentContextChecker >


More information about the Libreoffice-commits mailing list