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 /cppu | |
| 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 'cppu')
| -rw-r--r-- | cppu/qa/cppu_cppunittester_all.cxx | 2 | ||||
| -rw-r--r-- | cppu/qa/cppumaker/test_cppumaker.cxx | 2 | ||||
| -rw-r--r-- | cppu/qa/test_any.cxx | 4 | ||||
| -rw-r--r-- | cppu/qa/test_recursion.cxx | 4 | ||||
| -rw-r--r-- | cppu/qa/test_reference.cxx | 4 | ||||
| -rw-r--r-- | cppu/qa/test_unotype.cxx | 4 |
6 files changed, 11 insertions, 9 deletions
diff --git a/cppu/qa/cppu_cppunittester_all.cxx b/cppu/qa/cppu_cppunittester_all.cxx index e77c046bf8da..bf2a680e63b8 100644 --- a/cppu/qa/cppu_cppunittester_all.cxx +++ b/cppu/qa/cppu_cppunittester_all.cxx @@ -27,8 +27,8 @@ ************************************************************************/ #include "precompiled_cppu.hxx" - #include "sal/config.h" +#include "sal/precppunit.hxx" #include <cstdlib> #include <iostream> diff --git a/cppu/qa/cppumaker/test_cppumaker.cxx b/cppu/qa/cppumaker/test_cppumaker.cxx index 8e71264209fc..850eb10a904c 100644 --- a/cppu/qa/cppumaker/test_cppumaker.cxx +++ b/cppu/qa/cppumaker/test_cppumaker.cxx @@ -28,6 +28,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_cppu.hxx" +#include "sal/config.h" +#include "sal/precppunit.hxx" #include "FILE.hpp" #include "lconv.hpp" diff --git a/cppu/qa/test_any.cxx b/cppu/qa/test_any.cxx index 4c7f58d9bd43..ddee0fbc03ae 100644 --- a/cppu/qa/test_any.cxx +++ b/cppu/qa/test_any.cxx @@ -28,13 +28,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_cppu.hxx" +#include "sal/config.h" +#include "sal/precppunit.hxx" #ifdef IOS #define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_qa_cppu_any #endif -#include "sal/config.h" - #include <stdlib.h> // wntmsci10 does not like <cstdlib> #include <cppunit/TestSuite.h> diff --git a/cppu/qa/test_recursion.cxx b/cppu/qa/test_recursion.cxx index da7d389099bc..53f57cd7d323 100644 --- a/cppu/qa/test_recursion.cxx +++ b/cppu/qa/test_recursion.cxx @@ -27,13 +27,13 @@ ************************************************************************/ #include "precompiled_cppu.hxx" +#include "sal/config.h" +#include "sal/precppunit.hxx" #ifdef IOS #define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_qa_cppu_recursion #endif -#include "sal/config.h" - #include <cppunit/TestSuite.h> #include <cppunit/TestFixture.h> #include <cppunit/TestCase.h> diff --git a/cppu/qa/test_reference.cxx b/cppu/qa/test_reference.cxx index 8bc21a02ebe3..a2509bff1028 100644 --- a/cppu/qa/test_reference.cxx +++ b/cppu/qa/test_reference.cxx @@ -28,13 +28,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_cppu.hxx" +#include "sal/config.h" +#include "sal/precppunit.hxx" #ifdef IOS #define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_qa_cppu_reference #endif -#include "sal/config.h" - #include <cppunit/TestSuite.h> #include <cppunit/TestFixture.h> #include <cppunit/TestCase.h> diff --git a/cppu/qa/test_unotype.cxx b/cppu/qa/test_unotype.cxx index 4173bf8a3534..ee40c853b9b8 100644 --- a/cppu/qa/test_unotype.cxx +++ b/cppu/qa/test_unotype.cxx @@ -28,13 +28,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_cppu.hxx" +#include "sal/config.h" +#include "sal/precppunit.hxx" #ifdef IOS #define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_qa_cppu_unotype #endif -#include "sal/config.h" - #include <cppunit/TestSuite.h> #include <cppunit/TestFixture.h> #include <cppunit/TestCase.h> |