diff options
| author | Michael Stahl <mst@openoffice.org> | 2010-10-04 18:09:56 +0200 |
|---|---|---|
| committer | Michael Stahl <mst@openoffice.org> | 2010-10-04 18:09:56 +0200 |
| commit | 62a803cc1aec63b9a6b0f665f1d5ecfe2ad27349 (patch) | |
| tree | 8f42d40df84e97cf3f15be2a9ae4982047d832f6 /o3tl | |
| parent | be6d65ae721090df56376ac75946f8645815a8ff (diff) | |
| parent | 525de6f8eeac6e357167467da0f9a9448433bb25 (diff) | |
merge DEV300_m89
Diffstat (limited to 'o3tl')
| -rw-r--r-- | o3tl/qa/makefile.mk | 7 | ||||
| -rw-r--r-- | o3tl/qa/test-cow_wrapper.cxx | 2 | ||||
| -rw-r--r-- | o3tl/qa/test-heap_ptr.cxx | 2 | ||||
| -rw-r--r-- | o3tl/qa/test-range.cxx | 2 | ||||
| -rw-r--r-- | o3tl/qa/test-vector_pool.cxx | 2 |
5 files changed, 15 insertions, 0 deletions
diff --git a/o3tl/qa/makefile.mk b/o3tl/qa/makefile.mk index 3475aeeca9bb..0c6ecd88e56b 100644 --- a/o3tl/qa/makefile.mk +++ b/o3tl/qa/makefile.mk @@ -36,6 +36,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) .IF "$(L10N_framework)"=="" diff --git a/o3tl/qa/test-cow_wrapper.cxx b/o3tl/qa/test-cow_wrapper.cxx index 84d615fca3db..cd69ab1c5e3d 100644 --- a/o3tl/qa/test-cow_wrapper.cxx +++ b/o3tl/qa/test-cow_wrapper.cxx @@ -1,9 +1,11 @@ // autogenerated file with codegen.pl +#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 "cow_wrapper_clients.hxx" diff --git a/o3tl/qa/test-heap_ptr.cxx b/o3tl/qa/test-heap_ptr.cxx index fe2f78eec8af..63ec692efe5c 100644 --- a/o3tl/qa/test-heap_ptr.cxx +++ b/o3tl/qa/test-heap_ptr.cxx @@ -25,9 +25,11 @@ * ************************************************************************/ +#include "preextstl.h" #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" +#include "postextstl.h" #include <o3tl/heap_ptr.hxx> diff --git a/o3tl/qa/test-range.cxx b/o3tl/qa/test-range.cxx index 31cf2aec7c10..634b04de9122 100644 --- a/o3tl/qa/test-range.cxx +++ b/o3tl/qa/test-range.cxx @@ -25,9 +25,11 @@ * ************************************************************************/ +#include "preextstl.h" #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" +#include "postextstl.h" #include <o3tl/range.hxx> #include <vector> diff --git a/o3tl/qa/test-vector_pool.cxx b/o3tl/qa/test-vector_pool.cxx index 4efaebdd3414..ab301752532e 100644 --- a/o3tl/qa/test-vector_pool.cxx +++ b/o3tl/qa/test-vector_pool.cxx @@ -1,8 +1,10 @@ // autogenerated file with codegen.pl +#include "preextstl.h" #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" +#include "postextstl.h" #include <o3tl/vector_pool.hxx> |