diff options
author | David Tardon <dtardon@redhat.com> | 2011-02-08 09:11:58 +0100 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2011-02-08 09:11:58 +0100 |
commit | 911536bc3b20ed6e2ad8a62adf44ebde679ca7f9 (patch) | |
tree | a39fe3afd987fde2c1cc6dce80f6ea6cbbd082f5 | |
parent | 45c87b15c94fbc4f706b89082feb7c93d44c8e95 (diff) |
add (pre|post)extstl.h around cppunit includes
-rw-r--r-- | sal/qa/osl/condition/makefile.mk | 7 | ||||
-rw-r--r-- | sal/qa/osl/file/makefile.mk | 7 | ||||
-rw-r--r-- | sal/qa/osl/file/osl_File.cxx | 2 | ||||
-rw-r--r-- | sal/qa/osl/file/osl_old_test_file.cxx | 2 | ||||
-rw-r--r-- | sal/qa/osl/file/test_cpy_wrt_file.cxx | 2 | ||||
-rw-r--r-- | sal/qa/osl/module/makefile.mk | 7 | ||||
-rwxr-xr-x | sal/qa/osl/mutex/makefile.mk | 7 | ||||
-rw-r--r-- | sal/qa/osl/mutex/osl_Mutex.cxx | 2 | ||||
-rw-r--r-- | sal/qa/osl/profile/makefile.mk | 7 | ||||
-rw-r--r-- | sal/qa/osl/profile/osl_old_testprofile.cxx | 2 | ||||
-rw-r--r-- | sal/qa/osl/thread/makefile.mk | 9 | ||||
-rw-r--r-- | sal/qa/osl/thread/test_thread.cxx | 2 |
12 files changed, 55 insertions, 1 deletions
diff --git a/sal/qa/osl/condition/makefile.mk b/sal/qa/osl/condition/makefile.mk index b822ba575bb8..4cb1ac0fdf6a 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 e13de9f5d5af..17746d9c2b96 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 8639ca2b22b5..d5b25052f05f 100644 --- a/sal/qa/osl/file/osl_File.cxx +++ b/sal/qa/osl/file/osl_File.cxx @@ -42,9 +42,11 @@ #include <osl/file.hxx> #include <osl_File_Const.h> +#include "preextstl.h" #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> +#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 3cb5f01d4373..ca105b235ce9 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 <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> +#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 28402ecaad44..d75b1eff0d4c 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 <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> +#include "postextstl.h" #include <osl/file.hxx> #include <osl/thread.h> #include <rtl/ustring.hxx> diff --git a/sal/qa/osl/module/makefile.mk b/sal/qa/osl/module/makefile.mk index c2550019e846..724862fb85c0 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 de4121e3a0b9..e5b53711f1ce 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 d4c802401450..607287f6958a 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 <osl_Mutex_Const.h> using namespace osl; diff --git a/sal/qa/osl/profile/makefile.mk b/sal/qa/osl/profile/makefile.mk index a95db211c2a6..8b6339e19169 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 706ee4a8e5ac..2b9ca8f348e6 100644 --- a/sal/qa/osl/profile/osl_old_testprofile.cxx +++ b/sal/qa/osl/profile/osl_old_testprofile.cxx @@ -38,10 +38,12 @@ #include <stdio.h> #include <osl/profile.h> +#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 b40cb7beee6e..972d589a04f1 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 9dbc307907b1..150dc4d430ea 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 <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> +#include "postextstl.h" #include "osl/conditn.hxx" #include "osl/thread.hxx" #include "osl/time.h" |