summaryrefslogtreecommitdiff
path: root/binaryurp
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2011-09-12 21:24:31 +0200
committerStephan Bergmann <sbergman@redhat.com>2011-09-12 22:47:50 +0200
commitd996328cd5f46eeed2df0cbd510eda28e2f7cef9 (patch)
treed7d28521d7eee431cbbef8501d2a9fac99017d3a /binaryurp
parent52b32f617521fd160b043754f77f3a549fddc926 (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 'binaryurp')
-rw-r--r--binaryurp/qa/binaryurp_cppunittester_all.cxx1
-rw-r--r--binaryurp/qa/test-cache.cxx5
-rw-r--r--binaryurp/qa/test-unmarshal.cxx5
3 files changed, 7 insertions, 4 deletions
diff --git a/binaryurp/qa/binaryurp_cppunittester_all.cxx b/binaryurp/qa/binaryurp_cppunittester_all.cxx
index 31e82e454c78..d88d5ab5e84d 100644
--- a/binaryurp/qa/binaryurp_cppunittester_all.cxx
+++ b/binaryurp/qa/binaryurp_cppunittester_all.cxx
@@ -27,6 +27,7 @@
************************************************************************/
#include "sal/config.h"
+#include "sal/precppunit.hxx"
#include <cstdlib>
#include <iostream>
diff --git a/binaryurp/qa/test-cache.cxx b/binaryurp/qa/test-cache.cxx
index c47f6f7e6042..a831f4d7e1fb 100644
--- a/binaryurp/qa/test-cache.cxx
+++ b/binaryurp/qa/test-cache.cxx
@@ -26,12 +26,13 @@
*
************************************************************************/
+#include "sal/config.h"
+#include "sal/precppunit.hxx"
+
#ifdef IOS
#define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_binaryurp_cache
#endif
-#include "sal/config.h"
-
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
diff --git a/binaryurp/qa/test-unmarshal.cxx b/binaryurp/qa/test-unmarshal.cxx
index 5c4940ddb634..74ee12c81624 100644
--- a/binaryurp/qa/test-unmarshal.cxx
+++ b/binaryurp/qa/test-unmarshal.cxx
@@ -26,12 +26,13 @@
*
************************************************************************/
+#include "sal/config.h"
+#include "sal/precppunit.hxx"
+
#ifdef IOS
#define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_binaryurp_unmarshal
#endif
-#include "sal/config.h"
-
#include "com/sun/star/io/IOException.hpp"
#include "com/sun/star/uno/Sequence.hxx"
#include "cppu/unotype.hxx"