diff options
| author | thb <thb@openoffice.org> | 2010-01-18 01:10:42 +0100 |
|---|---|---|
| committer | thb <thb@openoffice.org> | 2010-01-18 01:10:42 +0100 |
| commit | ea48c18b848fed4d6504c956adeb3f24f05938ca (patch) | |
| tree | 1eccf884707ec16e4dd74f8e83c74563e1539b34 /o3tl | |
| parent | 1737f4d2fdba50a590f76631cd7ca7e762d18c35 (diff) | |
| parent | 8765a3bf9f2926a50d0f644e4263782269abe023 (diff) | |
thbfixes10: merge with DEV300 m69
Diffstat (limited to 'o3tl')
| -rw-r--r-- | o3tl/qa/makefile.mk | 3 | ||||
| -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 |
4 files changed, 5 insertions, 4 deletions
diff --git a/o3tl/qa/makefile.mk b/o3tl/qa/makefile.mk index 135428b07fb9..2a1dcd162dc2 100644 --- a/o3tl/qa/makefile.mk +++ b/o3tl/qa/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -52,6 +52,7 @@ SHL1OBJS= \ SHL1TARGET= tests SHL1STDLIBS= $(SALLIB) \ + $(TESTSHL2LIB)\ $(CPPUNITLIB) SHL1IMPLIB= i$(SHL1TARGET) diff --git a/o3tl/qa/test-cow_wrapper.cxx b/o3tl/qa/test-cow_wrapper.cxx index 6bb169e951a4..eebbb633f82b 100644 --- a/o3tl/qa/test-cow_wrapper.cxx +++ b/o3tl/qa/test-cow_wrapper.cxx @@ -1,6 +1,6 @@ // autogenerated file with codegen.pl -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> #include "cow_wrapper_clients.hxx" diff --git a/o3tl/qa/test-heap_ptr.cxx b/o3tl/qa/test-heap_ptr.cxx index 5e247a8b9abc..25f2209c94f5 100644 --- a/o3tl/qa/test-heap_ptr.cxx +++ b/o3tl/qa/test-heap_ptr.cxx @@ -28,7 +28,7 @@ * ************************************************************************/ -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> #include <o3tl/heap_ptr.hxx> diff --git a/o3tl/qa/test-range.cxx b/o3tl/qa/test-range.cxx index 626d9b6e3a90..fa956db96005 100644 --- a/o3tl/qa/test-range.cxx +++ b/o3tl/qa/test-range.cxx @@ -29,7 +29,7 @@ ************************************************************************/ -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> #include <o3tl/range.hxx> #include <vector> |