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 /smoketestoo_native | |
| parent | koheirowlimitperf: #i109369# #i109373# #i109384# #i109385# #i109386# #i109387... (diff) | |
| download | core-fab0859824dfdf60de2c5f0d9c7c41efe3364c31.tar.gz core-fab0859824dfdf60de2c5f0d9c7c41efe3364c31.zip | |
cmcfixes77: #i113503# system non-stlport cppunit with OOo stlport
Diffstat (limited to 'smoketestoo_native')
| -rw-r--r-- | smoketestoo_native/makefile.mk | 7 | ||||
| -rw-r--r-- | smoketestoo_native/smoketest.cxx | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/smoketestoo_native/makefile.mk b/smoketestoo_native/makefile.mk index 0337c748d914..3dccb111c24b 100644 --- a/smoketestoo_native/makefile.mk +++ b/smoketestoo_native/makefile.mk @@ -33,6 +33,13 @@ ENABLE_EXCEPTIONS = TRUE 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 = $(SHL1OBJS) SHL1TARGET = smoketest diff --git a/smoketestoo_native/smoketest.cxx b/smoketestoo_native/smoketest.cxx index e2cb51127f47..bb86cd254272 100644 --- a/smoketestoo_native/smoketest.cxx +++ b/smoketestoo_native/smoketest.cxx @@ -44,11 +44,13 @@ #include "com/sun/star/uno/RuntimeException.hpp" #include "com/sun/star/uno/Sequence.hxx" #include "com/sun/star/util/URL.hpp" +#include <preextstl.h> #include "cppuhelper/implbase1.hxx" #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" #include "cppunit/plugin/TestPlugIn.h" +#include <postextstl.h> #include "osl/conditn.hxx" #include "osl/diagnose.h" #include "rtl/ustring.h" |