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 | 6b16723121bffd8ebf9b8e688af5457235f687ef (patch) | |
| tree | 188606953a23111650389d3bbbe635bfc9686ef7 /basebmp | |
| parent | af820cae74c9fc08d7da6c304aec432c23cc8811 (diff) | |
cmcfixes77: #i113503# system non-stlport cppunit with OOo stlport
Diffstat (limited to 'basebmp')
| -rw-r--r-- | basebmp/test/basictest.cxx | 2 | ||||
| -rw-r--r-- | basebmp/test/bmpmasktest.cxx | 2 | ||||
| -rw-r--r-- | basebmp/test/bmptest.cxx | 2 | ||||
| -rw-r--r-- | basebmp/test/cliptest.cxx | 2 | ||||
| -rw-r--r-- | basebmp/test/filltest.cxx | 2 | ||||
| -rw-r--r-- | basebmp/test/linetest.cxx | 2 | ||||
| -rw-r--r-- | basebmp/test/makefile.mk | 7 | ||||
| -rw-r--r-- | basebmp/test/masktest.cxx | 2 | ||||
| -rw-r--r-- | basebmp/test/polytest.cxx | 2 |
9 files changed, 23 insertions, 0 deletions
diff --git a/basebmp/test/basictest.cxx b/basebmp/test/basictest.cxx index 6f96cf56f492..a9c533a3a134 100644 --- a/basebmp/test/basictest.cxx +++ b/basebmp/test/basictest.cxx @@ -27,10 +27,12 @@ // 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 <basegfx/vector/b2isize.hxx> #include <basegfx/point/b2ipoint.hxx> diff --git a/basebmp/test/bmpmasktest.cxx b/basebmp/test/bmpmasktest.cxx index 9be504819fe8..29e261423a06 100644 --- a/basebmp/test/bmpmasktest.cxx +++ b/basebmp/test/bmpmasktest.cxx @@ -27,9 +27,11 @@ // 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 <basegfx/vector/b2isize.hxx> #include <basegfx/range/b2irange.hxx> diff --git a/basebmp/test/bmptest.cxx b/basebmp/test/bmptest.cxx index 9e33f0a8d713..9d083980790b 100644 --- a/basebmp/test/bmptest.cxx +++ b/basebmp/test/bmptest.cxx @@ -27,9 +27,11 @@ // 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 <basegfx/vector/b2isize.hxx> #include <basegfx/range/b2irange.hxx> diff --git a/basebmp/test/cliptest.cxx b/basebmp/test/cliptest.cxx index 875016d878cc..b0f0b72f07e0 100644 --- a/basebmp/test/cliptest.cxx +++ b/basebmp/test/cliptest.cxx @@ -27,9 +27,11 @@ // 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 <basegfx/vector/b2isize.hxx> #include <basegfx/point/b2ipoint.hxx> diff --git a/basebmp/test/filltest.cxx b/basebmp/test/filltest.cxx index 150fa11b3a72..d03e887dbcc5 100644 --- a/basebmp/test/filltest.cxx +++ b/basebmp/test/filltest.cxx @@ -27,9 +27,11 @@ // 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 <basegfx/vector/b2isize.hxx> #include <basegfx/range/b2drange.hxx> diff --git a/basebmp/test/linetest.cxx b/basebmp/test/linetest.cxx index fcd383fccdb0..dbdbe57de0a7 100644 --- a/basebmp/test/linetest.cxx +++ b/basebmp/test/linetest.cxx @@ -27,9 +27,11 @@ // 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 <basegfx/vector/b2isize.hxx> #include <basegfx/point/b2ipoint.hxx> diff --git a/basebmp/test/makefile.mk b/basebmp/test/makefile.mk index ca77721716f7..8dc95dcea0e5 100644 --- a/basebmp/test/makefile.mk +++ b/basebmp/test/makefile.mk @@ -60,6 +60,13 @@ CDEFS+=-xalias_level=compatible .ENDIF .ENDIF +#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) # --- Common ---------------------------------------------------------- diff --git a/basebmp/test/masktest.cxx b/basebmp/test/masktest.cxx index 77cd05588d5a..63f357a314d0 100644 --- a/basebmp/test/masktest.cxx +++ b/basebmp/test/masktest.cxx @@ -27,9 +27,11 @@ // 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 <basegfx/vector/b2isize.hxx> #include <basegfx/range/b2irange.hxx> diff --git a/basebmp/test/polytest.cxx b/basebmp/test/polytest.cxx index f3b1f0018e17..2feef67774de 100644 --- a/basebmp/test/polytest.cxx +++ b/basebmp/test/polytest.cxx @@ -27,9 +27,11 @@ // 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 <basegfx/vector/b2isize.hxx> #include <basegfx/range/b2irange.hxx> |