diff options
| author | Mathias Bauer <mba@openoffice.org> | 2009-09-14 19:06:55 +0200 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2009-09-14 19:06:55 +0200 |
| commit | b8a58871dcc7e2398e95d518dff2f739712515e3 (patch) | |
| tree | 3e9e8da25856a3c600747976f6c3b9ac3b18e811 /configmgr/qa | |
| parent | e7c6e5d2c248cfb935c91882a3a1e64fea7550b4 (diff) | |
#i103496#: split cppunit in a pure external lib and a lib depending on sal -> testshl2
Diffstat (limited to 'configmgr/qa')
| -rw-r--r-- | configmgr/qa/unit/common.hxx | 2 | ||||
| -rw-r--r-- | configmgr/qa/unit/makefile.mk | 4 | ||||
| -rw-r--r-- | configmgr/qa/unit/threading.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/configmgr/qa/unit/common.hxx b/configmgr/qa/unit/common.hxx index d53d52d55ad7..7d5be659283c 100644 --- a/configmgr/qa/unit/common.hxx +++ b/configmgr/qa/unit/common.hxx @@ -44,7 +44,7 @@ #include "com/sun/star/uno/XComponentContext.hpp" #include "cppuhelper/component_context.hxx" #include "cppuhelper/servicefactory.hxx" -#include "cppunit/simpleheader.hxx" +#include "testshl/simpleheader.hxx" #include "osl/file.hxx" #include "osl/thread.h" #include "osl/process.h" diff --git a/configmgr/qa/unit/makefile.mk b/configmgr/qa/unit/makefile.mk index a6a79ebdd0ca..aededf799d4f 100644 --- a/configmgr/qa/unit/makefile.mk +++ b/configmgr/qa/unit/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ DLLPRE = # no leading "lib" on .so files SHL1TARGET = $(TARGET) SHL1OBJS = $(SLO)$/performance.obj $(SLO)$/threading.obj $(SLO)$/ubootstrap.obj -SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(CPPUNITLIB) $(SALLIB) +SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(CPPUNITLIB) $(TESTSHL2LIB) $(SALLIB) SHL1VERSIONMAP = export.map SHL1IMPLIB = i$(SHL1TARGET) DEF1NAME = $(SHL1TARGET) diff --git a/configmgr/qa/unit/threading.cxx b/configmgr/qa/unit/threading.cxx index 1531e9f49138..68baee1c6829 100644 --- a/configmgr/qa/unit/threading.cxx +++ b/configmgr/qa/unit/threading.cxx @@ -53,7 +53,7 @@ class KeyTester : public osl::Thread virtual ~KeyTester () { } - virtual void run () + virtual void SAL_CALL run () { testIteration(); while (!m_pCond->check()) |