From 5c5e8b76f27f45a660455c236496513201afd911 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Tue, 8 Feb 2011 09:11:58 +0100 Subject: add (pre|post)extstl.h around cppunit includes --- sal/qa/osl/condition/makefile.mk | 7 +++++++ sal/qa/osl/file/makefile.mk | 7 +++++++ sal/qa/osl/file/osl_File.cxx | 2 ++ sal/qa/osl/file/osl_old_test_file.cxx | 2 ++ sal/qa/osl/file/test_cpy_wrt_file.cxx | 2 ++ sal/qa/osl/module/makefile.mk | 7 +++++++ sal/qa/osl/mutex/makefile.mk | 7 +++++++ sal/qa/osl/mutex/osl_Mutex.cxx | 2 ++ sal/qa/osl/profile/makefile.mk | 7 +++++++ sal/qa/osl/profile/osl_old_testprofile.cxx | 2 ++ sal/qa/osl/thread/makefile.mk | 9 ++++++++- sal/qa/osl/thread/test_thread.cxx | 2 ++ 12 files changed, 55 insertions(+), 1 deletion(-) (limited to 'sal/qa') diff --git a/sal/qa/osl/condition/makefile.mk b/sal/qa/osl/condition/makefile.mk index b822ba575..4cb1ac0fd 100644 --- a/sal/qa/osl/condition/makefile.mk +++ b/sal/qa/osl/condition/makefile.mk @@ -36,6 +36,13 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk +# 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 + CFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS) diff --git a/sal/qa/osl/file/makefile.mk b/sal/qa/osl/file/makefile.mk index e13de9f5d..17746d9c2 100644 --- a/sal/qa/osl/file/makefile.mk +++ b/sal/qa/osl/file/makefile.mk @@ -36,6 +36,13 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk +# 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 + CFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS) diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx index 41040ba20..82ef43d71 100644 --- a/sal/qa/osl/file/osl_File.cxx +++ b/sal/qa/osl/file/osl_File.cxx @@ -42,9 +42,11 @@ #include #include +#include "preextstl.h" #include #include #include +#include "postextstl.h" // #ifdef WNT // # define UNICODE diff --git a/sal/qa/osl/file/osl_old_test_file.cxx b/sal/qa/osl/file/osl_old_test_file.cxx index 51140c379..234fe34dc 100644 --- a/sal/qa/osl/file/osl_old_test_file.cxx +++ b/sal/qa/osl/file/osl_old_test_file.cxx @@ -49,9 +49,11 @@ #define TEST_VOLUME "c:/" #endif +#include "preextstl.h" #include #include #include +#include "postextstl.h" namespace osl_test_file { diff --git a/sal/qa/osl/file/test_cpy_wrt_file.cxx b/sal/qa/osl/file/test_cpy_wrt_file.cxx index 28402ecaa..d75b1eff0 100644 --- a/sal/qa/osl/file/test_cpy_wrt_file.cxx +++ b/sal/qa/osl/file/test_cpy_wrt_file.cxx @@ -29,9 +29,11 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sal.hxx" +#include "preextstl.h" #include #include #include +#include "postextstl.h" #include #include #include diff --git a/sal/qa/osl/module/makefile.mk b/sal/qa/osl/module/makefile.mk index c2550019e..724862fb8 100644 --- a/sal/qa/osl/module/makefile.mk +++ b/sal/qa/osl/module/makefile.mk @@ -36,6 +36,13 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk +# 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 + CFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS) diff --git a/sal/qa/osl/mutex/makefile.mk b/sal/qa/osl/mutex/makefile.mk index de4121e3a..e5b53711f 100755 --- a/sal/qa/osl/mutex/makefile.mk +++ b/sal/qa/osl/mutex/makefile.mk @@ -40,6 +40,13 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk +# 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 + CFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS) diff --git a/sal/qa/osl/mutex/osl_Mutex.cxx b/sal/qa/osl/mutex/osl_Mutex.cxx index c7aedcee6..295c3b973 100644 --- a/sal/qa/osl/mutex/osl_Mutex.cxx +++ b/sal/qa/osl/mutex/osl_Mutex.cxx @@ -32,10 +32,12 @@ //------------------------------------------------------------------------ // include files //------------------------------------------------------------------------ +#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 using namespace osl; diff --git a/sal/qa/osl/profile/makefile.mk b/sal/qa/osl/profile/makefile.mk index a95db211c..8b6339e19 100644 --- a/sal/qa/osl/profile/makefile.mk +++ b/sal/qa/osl/profile/makefile.mk @@ -41,6 +41,13 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk +# 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 + CFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS) diff --git a/sal/qa/osl/profile/osl_old_testprofile.cxx b/sal/qa/osl/profile/osl_old_testprofile.cxx index c85f4816b..0cf06fd6b 100644 --- a/sal/qa/osl/profile/osl_old_testprofile.cxx +++ b/sal/qa/osl/profile/osl_old_testprofile.cxx @@ -38,10 +38,12 @@ #include #include +#include "preextstl.h" #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" #include "cppunit/plugin/TestPlugIn.h" +#include "postextstl.h" //================================================================================================== // ----------------------------------------------------------------------------- diff --git a/sal/qa/osl/thread/makefile.mk b/sal/qa/osl/thread/makefile.mk index b40cb7bee..972d589a0 100644 --- a/sal/qa/osl/thread/makefile.mk +++ b/sal/qa/osl/thread/makefile.mk @@ -33,6 +33,13 @@ ENABLE_EXCEPTIONS := TRUE .INCLUDE: settings.mk +# 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 + DLLPRE = # no leading "lib" on .so files SHL1TARGET = $(TARGET) @@ -46,4 +53,4 @@ SLOFILES = $(SHL1OBJS) .INCLUDE: target.mk -.INCLUDE: _cppunit.mk \ No newline at end of file +.INCLUDE: _cppunit.mk diff --git a/sal/qa/osl/thread/test_thread.cxx b/sal/qa/osl/thread/test_thread.cxx index 78baa4a64..150a83b61 100644 --- a/sal/qa/osl/thread/test_thread.cxx +++ b/sal/qa/osl/thread/test_thread.cxx @@ -31,9 +31,11 @@ #include "sal/config.h" +#include "preextstl.h" #include #include #include +#include "postextstl.h" #include "osl/conditn.hxx" #include "osl/thread.hxx" #include "osl/time.h" -- cgit v1.2.3