diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-09-12 21:24:31 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-09-12 22:47:50 +0200 |
| commit | d996328cd5f46eeed2df0cbd510eda28e2f7cef9 (patch) | |
| tree | d7d28521d7eee431cbbef8501d2a9fac99017d3a /sal/qa/rtl/math | |
| parent | 52b32f617521fd160b043754f77f3a549fddc926 (diff) | |
sb140: #i113503# mixing system CppUnit and OOo STLport does not work, backed out a6913c9677c2
For LibO, that just means replacing sal/cppunit.h with sal/precppunit.hxx.
Diffstat (limited to 'sal/qa/rtl/math')
| -rw-r--r-- | sal/qa/rtl/math/rtl_math.cxx | 3 | ||||
| -rw-r--r-- | sal/qa/rtl/math/test-rtl-math.cxx | 6 | ||||
| -rw-r--r-- | sal/qa/rtl/math/test_rtl_math.cxx | 9 |
3 files changed, 15 insertions, 3 deletions
diff --git a/sal/qa/rtl/math/rtl_math.cxx b/sal/qa/rtl/math/rtl_math.cxx index 9fe5c82ae116..41e55d64709c 100644 --- a/sal/qa/rtl/math/rtl_math.cxx +++ b/sal/qa/rtl/math/rtl_math.cxx @@ -29,6 +29,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sal.hxx" +#include "sal/config.h" +#include "sal/precppunit.hxx" + #ifdef WIN32 // LLA: take a look into Microsofts math.h implementation, why this define is need #define _USE_MATH_DEFINES diff --git a/sal/qa/rtl/math/test-rtl-math.cxx b/sal/qa/rtl/math/test-rtl-math.cxx index 41b4ea21138d..eb62fa430fa6 100644 --- a/sal/qa/rtl/math/test-rtl-math.cxx +++ b/sal/qa/rtl/math/test-rtl-math.cxx @@ -26,8 +26,12 @@ ************************************************************************/ #include "sal/config.h" +#include "sal/precppunit.hxx" -#include <sal/cppunit.h> +#include "cppunit/TestAssert.h" +#include "cppunit/TestFixture.h" +#include "cppunit/extensions/HelperMacros.h" +#include "cppunit/plugin/TestPlugIn.h" #include "rtl/math.hxx" #include "rtl/ustring.h" #include "rtl/ustring.hxx" diff --git a/sal/qa/rtl/math/test_rtl_math.cxx b/sal/qa/rtl/math/test_rtl_math.cxx index a5061ac80549..3848c01a115a 100644 --- a/sal/qa/rtl/math/test_rtl_math.cxx +++ b/sal/qa/rtl/math/test_rtl_math.cxx @@ -26,6 +26,13 @@ * ************************************************************************/ +#include "sal/config.h" +#include "sal/precppunit.hxx" + +#include "cppunit/TestAssert.h" +#include "cppunit/TestFixture.h" +#include "cppunit/extensions/HelperMacros.h" +#include "cppunit/plugin/TestPlugIn.h" #include "rtl/math.h" #include "rtl/math.hxx" #include "rtl/strbuf.hxx" @@ -38,8 +45,6 @@ #include <stdlib.h> -#include <sal/cppunit.h> - namespace { struct FloatTraits |