diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2010-10-06 12:15:48 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2010-10-06 12:15:48 +0100 |
| commit | c9b72802f74d76a1ce2523fe66848678846218b5 (patch) | |
| tree | c27ca9213e9a3ff0e97add1fa92a317cc4e6f0bf /sfx2 | |
| parent | 8e2ae4afca72cda9aab8cfe4a5852c4202eed5a7 (diff) | |
#i113503# cppunit stl wrapper headers
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/qa/cppunit/makefile.mk | 7 | ||||
| -rw-r--r-- | sfx2/qa/cppunit/test_metadatable.cxx | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/sfx2/qa/cppunit/makefile.mk b/sfx2/qa/cppunit/makefile.mk index 2794c2ae92bb..dce0b86a0619 100644 --- a/sfx2/qa/cppunit/makefile.mk +++ b/sfx2/qa/cppunit/makefile.mk @@ -35,6 +35,13 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk +#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 + CFLAGSCXX += $(CPPUNIT_CFLAGS) DLLPRE = # no leading "lib" on .so files diff --git a/sfx2/qa/cppunit/test_metadatable.cxx b/sfx2/qa/cppunit/test_metadatable.cxx index 903be6920327..6a0be13a9c53 100644 --- a/sfx2/qa/cppunit/test_metadatable.cxx +++ b/sfx2/qa/cppunit/test_metadatable.cxx @@ -27,10 +27,12 @@ #include "precompiled_sfx2.hxx" +#include "preextstl.h" #include <cppunit/TestAssert.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> +#include "postextstl.h" #include <rtl/ustrbuf.hxx> |