diff options
| author | Caolán McNamara <cmc@openoffice.org> | 2010-08-03 10:01:07 +0100 |
|---|---|---|
| committer | Caolán McNamara <cmc@openoffice.org> | 2010-08-03 10:01:07 +0100 |
| commit | fab0859824dfdf60de2c5f0d9c7c41efe3364c31 (patch) | |
| tree | 71ed2f87d5fff40779767bd2b3b2ed34be8a2137 /test | |
| parent | d57ac99460bae6dd3b85e803367fa82073819770 (diff) | |
cmcfixes77: #i113503# system non-stlport cppunit with OOo stlport
Diffstat (limited to 'test')
| -rw-r--r-- | test/source/cpp/makefile.mk | 7 | ||||
| -rw-r--r-- | test/source/cpp/officeconnection.cxx | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/test/source/cpp/makefile.mk b/test/source/cpp/makefile.mk index 8494bd4aaa05..04eedea3c670 100644 --- a/test/source/cpp/makefile.mk +++ b/test/source/cpp/makefile.mk @@ -35,6 +35,13 @@ VISIBILITY_HIDDEN = TRUE CDEFS += -DOOO_DLLIMPLEMENTATION_TEST CFLAGSCXX += $(CPPUNIT_CFLAGS) +#building with stlport, but cppunit was not built with stlport +.IF "$(USE_SYSTEM_STL)"!="YES" +.IF "$(SYSTEM_CPPUNIT)"=="YES" +CFLAGSCXX+=-DADAPT_EXT_STL +.ENDIF +.ENDIF + SLOFILES = \ $(SLO)/getargument.obj \ $(SLO)/officeconnection.obj \ diff --git a/test/source/cpp/officeconnection.cxx b/test/source/cpp/officeconnection.cxx index ccfd2cd0a069..b77fb59e4fff 100644 --- a/test/source/cpp/officeconnection.cxx +++ b/test/source/cpp/officeconnection.cxx @@ -33,7 +33,9 @@ #include "com/sun/star/lang/XMultiServiceFactory.hpp" #include "com/sun/star/uno/Reference.hxx" #include "cppuhelper/bootstrap.hxx" +#include <preextstl.h> #include "cppunit/TestAssert.h" +#include <postextstl.h> #include "osl/process.h" #include "osl/time.h" #include "sal/types.h" |