#i113503# cppunit stl wrapper headers

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

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"

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 \

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"