[Libreoffice-commits] .: 2 commits - smoketestoo_native/makefile.mk smoketestoo_native/smoketest.cxx test/source

[Fridrich Strba]

 smoketestoo_native/makefile.mk       |    7 -------
 smoketestoo_native/smoketest.cxx     |    4 ++--
 test/source/cpp/makefile.mk          |    7 -------
 test/source/cpp/officeconnection.cxx |    4 ++--
 4 files changed, 4 insertions(+), 18 deletions(-)

New commits:
commit c0de9978e5a5e0a4003f25467610dcff17bd6627
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Wed Feb 9 16:20:26 2011 +0100

    Trying to remove the stlport mention from the code

diff --git a/smoketestoo_native/makefile.mk b/smoketestoo_native/makefile.mk
index 75ebd95..fa01730 100644
--- a/smoketestoo_native/makefile.mk
+++ b/smoketestoo_native/makefile.mk
@@ -33,13 +33,6 @@ ENABLE_EXCEPTIONS = TRUE
 
 CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
-#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
-
 SLOFILES = $(SHL1OBJS)
 
 SHL1TARGET = smoketest
diff --git a/test/source/cpp/makefile.mk b/test/source/cpp/makefile.mk
index 04eedea..8494bd4 100644
--- a/test/source/cpp/makefile.mk
+++ b/test/source/cpp/makefile.mk
@@ -35,13 +35,6 @@ VISIBILITY_HIDDEN = TRUE
 CDEFS += -DOOO_DLLIMPLEMENTATION_TEST
 CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
-#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
-
 SLOFILES = \
     $(SLO)/getargument.obj \
     $(SLO)/officeconnection.obj \
commit bdb1e23e6c3d55acc63056c17983f6cd99f1254f
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Wed Feb 9 10:51:07 2011 +0100

    Removing the ext_std masterpiece

diff --git a/smoketestoo_native/smoketest.cxx b/smoketestoo_native/smoketest.cxx
index 1f429b5..f218957 100644
--- a/smoketestoo_native/smoketest.cxx
+++ b/smoketestoo_native/smoketest.cxx
@@ -48,13 +48,13 @@
 #include "com/sun/star/uno/RuntimeException.hpp"
 #include "com/sun/star/uno/Sequence.hxx"
 #include "com/sun/star/util/URL.hpp"
-#include <preextstl.h>
+
 #include "cppuhelper/implbase1.hxx"
 #include "cppunit/TestAssert.h"
 #include "cppunit/TestFixture.h"
 #include "cppunit/extensions/HelperMacros.h"
 #include "cppunit/plugin/TestPlugIn.h"
-#include <postextstl.h>
+
 #include "osl/conditn.hxx"
 #include "osl/diagnose.h"
 #include "rtl/ustring.h"
diff --git a/test/source/cpp/officeconnection.cxx b/test/source/cpp/officeconnection.cxx
index 93de7f7..e8403d3 100644
--- a/test/source/cpp/officeconnection.cxx
+++ b/test/source/cpp/officeconnection.cxx
@@ -34,9 +34,9 @@
 #include "com/sun/star/lang/XMultiServiceFactory.hpp"
 #include "com/sun/star/uno/Reference.hxx"
 #include "cppuhelper/bootstrap.hxx"
-#include <preextstl.h>
+
 #include "cppunit/TestAssert.h"
-#include <postextstl.h>
+
 #include "osl/process.h"
 #include "osl/time.h"
 #include "sal/types.h"