diff options
| author | Vladimir Glazunov <vg@openoffice.org> | 2010-08-25 17:13:00 +0200 |
|---|---|---|
| committer | Vladimir Glazunov <vg@openoffice.org> | 2010-08-25 17:13:00 +0200 |
| commit | 034375b2eea085506ef606b07ceeccd1c5f4e3b8 (patch) | |
| tree | 1a16f74ab80bb86798933010da8f1f36bd43eaba /smoketestoo_native | |
| parent | 2729833407da1a9982229fc68c3f6edcb43f6555 (diff) | |
| parent | 5964db25f25c85ea70607310198fc50df9e7f088 (diff) | |
CWS-TOOLING: integrate CWS cmcfixes77
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 80982856602d..e954549fdca9 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 41baeddf9edb..fd283327c738 100644 --- a/smoketestoo_native/smoketest.cxx +++ b/smoketestoo_native/smoketest.cxx @@ -47,11 +47,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" |