This is an automated email from the ASF dual-hosted git repository. asf-gitbox-commits pushed a commit to branch STLport-cleanup in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 4dd1ce38ca30adcf81b2b4af6945351fe3ff1cdc Author: Pedro Giffuni <[email protected]> AuthorDate: Sun Nov 8 14:56:47 2026 -0500 Remove STLport compatibility wrapper infrastructure Delete main/stlport/ module entirely: wrapper headers, systemstl headers, systemstlguards (preextstl.h/postextstl.h). Remove all build-system references: - LIBSTLPORT / LIBSTLPORTST from settings.mk and 14 platform .mk files - STLPORT_VERSION defines from platform .mk files - -library=stlport4 from unxsolu4.mk CFLAGSCXX - STLEXT stlport section from windows.mk gbuild - ADAPT_EXT_STL from mysqlc/source/makefile.mk - EXT_USE_STLPORT from curl, graphite, nss makefiles and tg_ext.mk - STLPORTLIB from l10ntools; STLPORT_DEBUGFLAG from Executable_*.mk - graphite stlport check from RepositoryExternal.mk - stlport dependency from 15 prj/build.lst files Remove preextstl.h / postextstl.h guard includes from source files. Remove stlport include path from toolkit/src2xml/include.lst. Remove STLPORT4 conditional block from soltools/util/makefile.pmk. Clean up stale stlport references from comments in windows.mk and wntmsc14.mk. --- main/RepositoryExternal.mk | 6 -- main/autodoc/prj/build.lst | 2 +- main/basebmp/test/basictest.cxx | 2 - main/basebmp/test/bmpmasktest.cxx | 2 - main/basebmp/test/bmptest.cxx | 2 - main/basebmp/test/cliptest.cxx | 2 - main/basebmp/test/filltest.cxx | 2 - main/basebmp/test/linetest.cxx | 2 - main/basebmp/test/masktest.cxx | 2 - main/basebmp/test/polytest.cxx | 2 - main/basegfx/test/basegfx1d.cxx | 2 - main/basegfx/test/basegfx2d.cxx | 2 - main/basegfx/test/basegfx3d.cxx | 2 - main/basegfx/test/basegfxtools.cxx | 2 - main/basegfx/test/boxclipper.cxx | 2 - main/basegfx/test/clipstate.cxx | 2 - main/basegfx/test/genericclipper.cxx | 2 - main/binaryurp/prj/build.lst | 2 +- main/cairo/prj/build.lst | 2 +- main/configmgr/prj/build.lst | 2 +- main/curl/makefile.mk | 5 -- main/curl/prj/build.lst | 2 +- main/graphite/makefile.mk | 12 +-- main/graphite/prj/build.lst | 2 +- main/icc/prj/build.lst | 2 +- main/l10ntools/source/makefile.mk | 1 - main/libtextcat/prj/build.lst | 2 +- main/libxmlsec/prj/build.lst | 2 +- main/mysqlc/source/makefile.mk | 3 - main/mysqlc/source/mysqlc_connection.cxx | 2 - main/mysqlc/source/mysqlc_connection.hxx | 2 - main/mysqlc/source/mysqlc_databasemetadata.cxx | 2 - main/mysqlc/source/mysqlc_databasemetadata.hxx | 4 +- main/mysqlc/source/mysqlc_driver.cxx | 5 +- main/mysqlc/source/mysqlc_driver.hxx | 2 - main/mysqlc/source/mysqlc_general.hxx | 4 +- main/mysqlc/source/mysqlc_preparedstatement.hxx | 2 - main/mysqlc/source/mysqlc_resultsetmetadata.hxx | 2 - main/mysqlc/source/mysqlc_statement.hxx | 4 +- main/nss/makefile.mk | 3 - main/nss/prj/build.lst | 2 +- main/o3tl/qa/test-cow_wrapper.cxx | 2 - main/o3tl/qa/test-heap_ptr.cxx | 2 - main/o3tl/qa/test-range.cxx | 2 - main/o3tl/qa/test-vector_pool.cxx | 2 - main/redland/prj/build.lst | 2 +- main/sal/inc/rtl/ustring.hxx | 4 +- main/sal/prj/build.lst | 2 +- main/sax/qa/gtest/test_converter.cxx | 2 - .../source/win32/shlxthandler/ooofilt/makefile.mk | 4 +- main/solenv/gbuild/platform/windows.mk | 18 +--- main/solenv/inc/os2gcci.mk | 5 +- main/solenv/inc/settings.mk | 12 +-- main/solenv/inc/tg_ext.mk | 4 - main/solenv/inc/unxbsdi.mk | 10 +-- main/solenv/inc/unxbsdi2.mk | 9 +- main/solenv/inc/unxbsds.mk | 12 +-- main/solenv/inc/unxfbsd.mk | 19 +---- main/solenv/inc/unxmacx.mk | 21 ----- main/solenv/inc/unxsogi.mk | 10 +-- main/solenv/inc/unxsogs.mk | 10 +-- main/solenv/inc/unxsoli4.mk | 10 +-- main/solenv/inc/unxsols4.mk | 10 +-- main/solenv/inc/unxsolu4.mk | 12 +-- main/solenv/inc/wntgcci.mk | 5 +- main/solenv/inc/wntmsc14.mk | 12 +-- main/solenv/inc/wntmsci10.mk | 11 +-- main/solenv/inc/wntmsci11.mk | 8 -- main/solenv/inc/wntmscx.mk | 8 -- main/soltools/adjustvisibility/makefile.mk | 1 - main/soltools/mkdepend/makefile.mk | 1 - main/soltools/util/makefile.pmk | 8 -- main/stlport/makefile.mk | 44 ---------- main/stlport/prj/build.lst | 2 - main/stlport/prj/d.lst | 3 - main/stlport/systemstl/functional | 85 ------------------- main/stlport/systemstl/hash_map | 97 ---------------------- main/stlport/systemstl/hash_set | 90 -------------------- main/stlport/systemstl/list | 50 ----------- main/stlport/systemstl/map | 46 ---------- main/stlport/systemstl/numeric | 46 ---------- main/stlport/systemstl/set | 48 ----------- main/stlport/systemstl/slist | 79 ------------------ main/stlport/systemstl/vector | 70 ---------------- main/stlport/systemstlguards/postextstl.h | 32 ------- main/stlport/systemstlguards/preextstl.h | 73 ---------------- main/test/prj/build.lst | 2 +- main/test/source/cpp/officeconnection.cxx | 2 - main/toolkit/src2xml/include.lst | 1 - main/tools/Executable_so_checksum.mk | 1 - main/tools/Executable_sspretty.mk | 1 - main/vcl/inc/graphite_adaptors.hxx | 2 - main/vcl/inc/graphite_features.hxx | 2 - main/vcl/inc/graphite_layout.hxx | 2 - main/vcl/source/glyphs/graphite_cache.cxx | 4 +- main/vcl/source/glyphs/graphite_layout.cxx | 2 - main/vcl/source/glyphs/graphite_textsrc.hxx | 3 - main/xml2cmp/prj/build.lst | 2 +- main/xmlreader/prj/build.lst | 2 +- 99 files changed, 44 insertions(+), 1094 deletions(-) diff --git a/main/RepositoryExternal.mk b/main/RepositoryExternal.mk index ce340c9c1e..906271adb9 100644 --- a/main/RepositoryExternal.mk +++ b/main/RepositoryExternal.mk @@ -296,13 +296,7 @@ endif # SYSTEM_CAIRO ifeq ($(SYSTEM_GRAPHITE),YES) -#check for building with stlport, but graphite was not built with stlport define gb_LinkTarget__use_graphite -ifneq ($(USE_SYSTEM_STL),YES) -$(call gb_LinkTarget_add_defs,$(1),\ - -DADAPT_EXT_STL \ -) -endif $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ $(GRAPHITE_CFLAGS) \ diff --git a/main/autodoc/prj/build.lst b/main/autodoc/prj/build.lst index 35a91b31e6..7c0635d170 100644 --- a/main/autodoc/prj/build.lst +++ b/main/autodoc/prj/build.lst @@ -1,2 +1,2 @@ -ar autodoc : sal soltools stlport NULL +ar autodoc : sal soltools NULL ar autodoc\prj nmake - all ar_prj NULL diff --git a/main/basebmp/test/basictest.cxx b/main/basebmp/test/basictest.cxx index 9b0da0724d..d782aa5e97 100644 --- a/main/basebmp/test/basictest.cxx +++ b/main/basebmp/test/basictest.cxx @@ -23,9 +23,7 @@ // autogenerated file with codegen.pl -#include "preextstl.h" #include "gtest/gtest.h" -#include "postextstl.h" #include <basegfx/vector/b2isize.hxx> #include <basegfx/point/b2ipoint.hxx> diff --git a/main/basebmp/test/bmpmasktest.cxx b/main/basebmp/test/bmpmasktest.cxx index f5cd169a47..3b0935a069 100644 --- a/main/basebmp/test/bmpmasktest.cxx +++ b/main/basebmp/test/bmpmasktest.cxx @@ -23,9 +23,7 @@ // autogenerated file with codegen.pl -#include "preextstl.h" #include "gtest/gtest.h" -#include "postextstl.h" #include <basegfx/vector/b2isize.hxx> #include <basegfx/range/b2irange.hxx> diff --git a/main/basebmp/test/bmptest.cxx b/main/basebmp/test/bmptest.cxx index 07e37bb6cd..b338053e21 100644 --- a/main/basebmp/test/bmptest.cxx +++ b/main/basebmp/test/bmptest.cxx @@ -23,9 +23,7 @@ // autogenerated file with codegen.pl -#include "preextstl.h" #include "gtest/gtest.h" -#include "postextstl.h" #include <basegfx/vector/b2isize.hxx> #include <basegfx/range/b2irange.hxx> diff --git a/main/basebmp/test/cliptest.cxx b/main/basebmp/test/cliptest.cxx index df04b0fc79..3ab397de28 100644 --- a/main/basebmp/test/cliptest.cxx +++ b/main/basebmp/test/cliptest.cxx @@ -23,9 +23,7 @@ // autogenerated file with codegen.pl -#include "preextstl.h" #include "gtest/gtest.h" -#include "postextstl.h" #include <basegfx/vector/b2isize.hxx> #include <basegfx/point/b2ipoint.hxx> diff --git a/main/basebmp/test/filltest.cxx b/main/basebmp/test/filltest.cxx index c590b3cd9e..939bfe36eb 100644 --- a/main/basebmp/test/filltest.cxx +++ b/main/basebmp/test/filltest.cxx @@ -23,9 +23,7 @@ // autogenerated file with codegen.pl -#include "preextstl.h" #include "gtest/gtest.h" -#include "postextstl.h" #include <basegfx/vector/b2isize.hxx> #include <basegfx/range/b2drange.hxx> diff --git a/main/basebmp/test/linetest.cxx b/main/basebmp/test/linetest.cxx index 74b00712bc..fe047cf8fc 100644 --- a/main/basebmp/test/linetest.cxx +++ b/main/basebmp/test/linetest.cxx @@ -23,9 +23,7 @@ // autogenerated file with codegen.pl -#include "preextstl.h" #include "gtest/gtest.h" -#include "postextstl.h" #include <basegfx/vector/b2isize.hxx> #include <basegfx/point/b2ipoint.hxx> diff --git a/main/basebmp/test/masktest.cxx b/main/basebmp/test/masktest.cxx index 94a85b1155..60a057eb7a 100644 --- a/main/basebmp/test/masktest.cxx +++ b/main/basebmp/test/masktest.cxx @@ -23,9 +23,7 @@ // autogenerated file with codegen.pl -#include "preextstl.h" #include "gtest/gtest.h" -#include "postextstl.h" #include <basegfx/vector/b2isize.hxx> #include <basegfx/range/b2irange.hxx> diff --git a/main/basebmp/test/polytest.cxx b/main/basebmp/test/polytest.cxx index 2080bad866..a8a83d5d46 100644 --- a/main/basebmp/test/polytest.cxx +++ b/main/basebmp/test/polytest.cxx @@ -23,9 +23,7 @@ // autogenerated file with codegen.pl -#include "preextstl.h" #include "gtest/gtest.h" -#include "postextstl.h" #include <basegfx/vector/b2isize.hxx> #include <basegfx/range/b2irange.hxx> diff --git a/main/basegfx/test/basegfx1d.cxx b/main/basegfx/test/basegfx1d.cxx index fcec8cc541..5cc8e39a45 100644 --- a/main/basegfx/test/basegfx1d.cxx +++ b/main/basegfx/test/basegfx1d.cxx @@ -26,9 +26,7 @@ #include "precompiled_basegfx.hxx" // autogenerated file with codegen.pl -#include "preextstl.h" #include "gtest/gtest.h" -#include "postextstl.h" namespace basegfx1d { diff --git a/main/basegfx/test/basegfx2d.cxx b/main/basegfx/test/basegfx2d.cxx index dcc946b09f..61a6c11977 100644 --- a/main/basegfx/test/basegfx2d.cxx +++ b/main/basegfx/test/basegfx2d.cxx @@ -26,9 +26,7 @@ #include "precompiled_basegfx.hxx" // autogenerated file with codegen.pl -#include "preextstl.h" #include "gtest/gtest.h" -#include "postextstl.h" #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/polygon/b2dpolygon.hxx> diff --git a/main/basegfx/test/basegfx3d.cxx b/main/basegfx/test/basegfx3d.cxx index 644efc09ee..7c79daa93d 100644 --- a/main/basegfx/test/basegfx3d.cxx +++ b/main/basegfx/test/basegfx3d.cxx @@ -26,9 +26,7 @@ #include "precompiled_basegfx.hxx" // autogenerated file with codegen.pl -#include "preextstl.h" #include "gtest/gtest.h" -#include "postextstl.h" namespace basegfx3d { diff --git a/main/basegfx/test/basegfxtools.cxx b/main/basegfx/test/basegfxtools.cxx index 0384608d98..8539ce041f 100644 --- a/main/basegfx/test/basegfxtools.cxx +++ b/main/basegfx/test/basegfxtools.cxx @@ -26,9 +26,7 @@ #include "precompiled_basegfx.hxx" // autogenerated file with codegen.pl -#include "preextstl.h" #include "gtest/gtest.h" -#include "postextstl.h" #include <basegfx/tools/keystoplerp.hxx> #include <basegfx/numeric/ftools.hxx> diff --git a/main/basegfx/test/boxclipper.cxx b/main/basegfx/test/boxclipper.cxx index 41c85a1ced..e582b091df 100644 --- a/main/basegfx/test/boxclipper.cxx +++ b/main/basegfx/test/boxclipper.cxx @@ -26,9 +26,7 @@ #include "precompiled_basegfx.hxx" // autogenerated file with codegen.pl -#include "preextstl.h" #include "gtest/gtest.h" -#include "postextstl.h" #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/curve/b2dcubicbezier.hxx> diff --git a/main/basegfx/test/clipstate.cxx b/main/basegfx/test/clipstate.cxx index cfeaf1a122..b187e2a899 100644 --- a/main/basegfx/test/clipstate.cxx +++ b/main/basegfx/test/clipstate.cxx @@ -26,9 +26,7 @@ #include "precompiled_basegfx.hxx" // autogenerated file with codegen.pl -#include "preextstl.h" #include "gtest/gtest.h" -#include "postextstl.h" #include <basegfx/tools/b2dclipstate.hxx> #include <basegfx/range/b2dpolyrange.hxx> diff --git a/main/basegfx/test/genericclipper.cxx b/main/basegfx/test/genericclipper.cxx index d29c810f07..373e817e80 100644 --- a/main/basegfx/test/genericclipper.cxx +++ b/main/basegfx/test/genericclipper.cxx @@ -26,9 +26,7 @@ #include "precompiled_basegfx.hxx" // autogenerated file with codegen.pl -#include "preextstl.h" #include "gtest/gtest.h" -#include "postextstl.h" #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/curve/b2dcubicbezier.hxx> diff --git a/main/binaryurp/prj/build.lst b/main/binaryurp/prj/build.lst index 413b430154..eba5c27856 100644 --- a/main/binaryurp/prj/build.lst +++ b/main/binaryurp/prj/build.lst @@ -1,2 +1,2 @@ -bu binaryurp : BOOST:boost LIBXSLT:libxslt cppu cppuhelper offapi sal salhelper stlport NULL +bu binaryurp : BOOST:boost LIBXSLT:libxslt cppu cppuhelper offapi sal salhelper NULL bu binaryurp\prj nmake - all bu_prj NULL diff --git a/main/cairo/prj/build.lst b/main/cairo/prj/build.lst index b34bcb0fb2..e6e00887ea 100644 --- a/main/cairo/prj/build.lst +++ b/main/cairo/prj/build.lst @@ -1,4 +1,4 @@ -lcairo cairo : LIBPNG:libpng ZLIB:zlib soltools stlport NULL +lcairo cairo : LIBPNG:libpng ZLIB:zlib soltools NULL lcairo cairo usr1 - all lcairo_mkout NULL lcairo cairo\pixman nmake - all lcairo_pixman NULL lcairo cairo\cairo nmake - all lcairo_cairo lcairo_pixman NULL diff --git a/main/configmgr/prj/build.lst b/main/configmgr/prj/build.lst index f88cd2cd9e..3abaffe84b 100644 --- a/main/configmgr/prj/build.lst +++ b/main/configmgr/prj/build.lst @@ -1,2 +1,2 @@ -cg configmgr : BOOST:boost LIBXSLT:libxslt comphelper cppu cppuhelper offapi sal salhelper stlport xmlreader NULL +cg configmgr : BOOST:boost LIBXSLT:libxslt comphelper cppu cppuhelper offapi sal salhelper xmlreader NULL cg configmgr\prj nmake - all cg_prj NULL diff --git a/main/curl/makefile.mk b/main/curl/makefile.mk index a7003bcb5b..ddef652c82 100644 --- a/main/curl/makefile.mk +++ b/main/curl/makefile.mk @@ -121,9 +121,6 @@ BUILD_DIR=$(CONFIGURE_DIR)$/lib BUILD_ACTION=make OUT2BIN=$(BUILD_DIR)$/.libs$/libcurl*.dll OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl*.dll.a -.ELSE -# make use of stlport headerfiles -EXT_USE_STLPORT=TRUE .IF "$(CCNUMVER)" > "001399999999" EXCFLAGS="/EHa /Zc:wchar_t- /D "_CRT_SECURE_NO_DEPRECATE"" @@ -170,8 +167,6 @@ OUT2LIB=$(BUILD_DIR)$/../builds/libcurl-vc9-X64-debug-dll-ssl-dll-zlib-dll-ipv6- .ENDIF # "$(GUI)"=="WNT" .IF "$(GUI)"=="OS2" -# make use of stlport headerfiles -EXT_USE_STLPORT=TRUE BUILD_DIR=.$/lib .IF "$(debug)"=="" diff --git a/main/curl/prj/build.lst b/main/curl/prj/build.lst index 46a7d3b613..ca21e1f869 100644 --- a/main/curl/prj/build.lst +++ b/main/curl/prj/build.lst @@ -1,3 +1,3 @@ -xc curl : stlport external OPENSSL:openssl ZLIB:zlib NULL +xc curl : external OPENSSL:openssl ZLIB:zlib NULL xc curl usr1 - all xc_mkout NULL xc curl nmake - all xc_curl NULL diff --git a/main/graphite/makefile.mk b/main/graphite/makefile.mk index 644e61dc83..2aeac90d21 100644 --- a/main/graphite/makefile.mk +++ b/main/graphite/makefile.mk @@ -50,7 +50,7 @@ all: TARFILE_NAME=silgraphite-2.3.1 TARFILE_MD5=d35724900f6a4105550293686688bbb3 -PATCH_FILES=graphite-2.3.1.patch graphite-2.3.1_debug.patch graphite-2.3.1_stlportemu.patch graphite-2.3.1-CVE-2016-1521.patch +PATCH_FILES=graphite-2.3.1.patch graphite-2.3.1_debug.patch graphite-2.3.1-CVE-2016-1521.patch # convert line-endings to avoid problems when patching CONVERTFILES=\ @@ -71,10 +71,6 @@ VCNUM=7 .ELSE VCNUM=8 .ENDIF -.IF "$(USE_SYSTEM_STL)"!="YES" -# make use of stlport headerfiles -EXT_USE_STLPORT=TRUE -.ENDIF BUILD_ACTION=nmake VERBOSE=1 .IF "x$(debug)"!="x" BUILD_FLAGS= "CFG=DEBUG" @@ -102,13 +98,7 @@ GR_CONFIGURE_FLAGS= --enable-final=yes --enable-static --disable-shared .ENDIF EXTRA_GR_CXX_FLAGS=-fPIC -.IF "$(USE_SYSTEM_STL)"!="YES" -# #i112124# STLPort seems to require libstdc++ -EXTRA_GR_LD_FLAGS=$(LIBSTLPORT) -lm -lstdc++ -GR_LIB_PATH=LD_LIBRARY_PATH=$(SOLARVERSION)/$(INPATH)/lib$(UPDMINOREXT) -.ELSE GR_LIB_PATH= -.ENDIF .IF "$(OS)"=="WNT" PATCH_FILES+=graphite-2.3.1.patch.mingw diff --git a/main/graphite/prj/build.lst b/main/graphite/prj/build.lst index b409ff4da1..cefb762e68 100644 --- a/main/graphite/prj/build.lst +++ b/main/graphite/prj/build.lst @@ -1,3 +1,3 @@ -gr graphite : stlport solenv NULL +gr graphite : solenv NULL gr graphite usr1 - all gr_mkout NULL gr graphite nmake - all gr_graphite NULL diff --git a/main/icc/prj/build.lst b/main/icc/prj/build.lst index 9eace5df12..e9bf65b311 100644 --- a/main/icc/prj/build.lst +++ b/main/icc/prj/build.lst @@ -1,3 +1,3 @@ -ip icc : solenv stlport external sal NULL +ip icc : solenv external sal NULL ip icc usr1 - all ip_mkout NULL ip icc nmake - all ip_icc NULL diff --git a/main/l10ntools/source/makefile.mk b/main/l10ntools/source/makefile.mk index 128d08e476..f165229bf2 100644 --- a/main/l10ntools/source/makefile.mk +++ b/main/l10ntools/source/makefile.mk @@ -182,7 +182,6 @@ APP9STDLIBS+= \ $(VOSLIB) \ $(ICUINLIB) \ $(ICUUCLIB) \ - $(STLPORTLIB) \ $(SALLIB) DEPOBJFILES=$(APP1OBJS) $(APP2OBJS) $(APP3OBJS) $(APP4OBJS) $(APP5OBJS) $(APP6OBJS) $(APP7OBJS) $(APP8OBJS) $(APP9OBJS) diff --git a/main/libtextcat/prj/build.lst b/main/libtextcat/prj/build.lst index da155db3d2..85163759b4 100644 --- a/main/libtextcat/prj/build.lst +++ b/main/libtextcat/prj/build.lst @@ -1,3 +1,3 @@ -ltc libtextcat : stlport soltools solenv NULL +ltc libtextcat : soltools solenv NULL ltc libtextcat usr1 - all ltc_mkout NULL ltc libtextcat nmake - all ltc_libtextcat NULL diff --git a/main/libxmlsec/prj/build.lst b/main/libxmlsec/prj/build.lst index 579afce244..47d3fd9263 100644 --- a/main/libxmlsec/prj/build.lst +++ b/main/libxmlsec/prj/build.lst @@ -1,3 +1,3 @@ -ls libxmlsec : stlport soltools LIBXML2:libxml2 NSS:nss NULL +ls libxmlsec : soltools LIBXML2:libxml2 NSS:nss NULL ls libxmlsec usr1 - all ls_mkout NULL ls libxmlsec nmake - all ls_xmlsec1 NULL diff --git a/main/mysqlc/source/makefile.mk b/main/mysqlc/source/makefile.mk index 3ab03de1f2..be905842a3 100644 --- a/main/mysqlc/source/makefile.mk +++ b/main/mysqlc/source/makefile.mk @@ -110,9 +110,6 @@ CFLAGS+=-DSYSTEM_MYSQL_CPPCONN CDEFS+=-DCPPDBC_EXPORTS -DCPPCONN_LIB_BUILD .IF "$(SYSTEM_MYSQL_CPPCONN)" == "YES" CDEFS += -DCPPCONN_LIB=\"$(shell readlink /usr/lib/libmysqlcppconn.so)\" -.IF "$(USE_SYSTEM_STL)"!="YES" -CDEFS += -DADAPT_EXT_STL -.ENDIF .ENDIF # --------------- MySQL settings ------------------ diff --git a/main/mysqlc/source/mysqlc_connection.cxx b/main/mysqlc/source/mysqlc_connection.cxx index 16594a876a..3e3c50e118 100644 --- a/main/mysqlc/source/mysqlc_connection.cxx +++ b/main/mysqlc/source/mysqlc_connection.cxx @@ -28,13 +28,11 @@ #include "mysqlc_preparedstatement.hxx" #include "mysqlc_general.hxx" -#include <preextstl.h> #include <cppconn/driver.h> #include <cppconn/connection.h> #include <cppconn/statement.h> #include <cppconn/metadata.h> #include <cppconn/exception.h> -#include <postextstl.h> #include <com/sun/star/sdbc/ColumnValue.hpp> #include <com/sun/star/sdbc/XRow.hpp> diff --git a/main/mysqlc/source/mysqlc_connection.hxx b/main/mysqlc/source/mysqlc_connection.hxx index 54bf963525..80ffb76ac2 100644 --- a/main/mysqlc/source/mysqlc_connection.hxx +++ b/main/mysqlc/source/mysqlc_connection.hxx @@ -38,9 +38,7 @@ #include <com/sun/star/sdbc/XWarningsSupplier.hpp> #include <com/sun/star/util/XStringSubstitution.hpp> -#include <preextstl.h> #include <cppconn/driver.h> -#include <postextstl.h> #include <cppuhelper/compbase3.hxx> #include <cppuhelper/weakref.hxx> #include <rtl/string.hxx> diff --git a/main/mysqlc/source/mysqlc_databasemetadata.cxx b/main/mysqlc/source/mysqlc_databasemetadata.cxx index bb42148ae6..5db79174ed 100644 --- a/main/mysqlc/source/mysqlc_databasemetadata.cxx +++ b/main/mysqlc/source/mysqlc_databasemetadata.cxx @@ -46,13 +46,11 @@ using namespace com::sun::star::sdbc; using ::rtl::OUString; using mysqlc_sdbc_driver::getStringFromAny; -#include <preextstl.h> #include <cppconn/connection.h> #include <cppconn/resultset.h> #include <cppconn/metadata.h> #include <cppconn/statement.h> #include <cppconn/prepared_statement.h> -#include <postextstl.h> static ext_std::string wild("%"); diff --git a/main/mysqlc/source/mysqlc_databasemetadata.hxx b/main/mysqlc/source/mysqlc_databasemetadata.hxx index e32637f7b1..88b00bd894 100644 --- a/main/mysqlc/source/mysqlc_databasemetadata.hxx +++ b/main/mysqlc/source/mysqlc_databasemetadata.hxx @@ -31,9 +31,7 @@ #include <cppuhelper/implbase1.hxx> #endif -#include <preextstl.h> -#include <cppconn/metadata.h> -#include <postextstl.h> +#include <cppconn/driver.h> namespace connectivity { diff --git a/main/mysqlc/source/mysqlc_driver.cxx b/main/mysqlc/source/mysqlc_driver.cxx index baff0c5617..7856489b2e 100644 --- a/main/mysqlc/source/mysqlc_driver.cxx +++ b/main/mysqlc/source/mysqlc_driver.cxx @@ -30,10 +30,7 @@ using namespace connectivity::mysqlc; using ::rtl::OUString; #include <stdio.h> -#include <preextstl.h> -#include <cppconn/exception.h> -#include <mysql_driver.h> -#include <postextstl.h> +#include <cppconn/driver.h> /* {{{ MysqlCDriver::MysqlCDriver() -I- */ diff --git a/main/mysqlc/source/mysqlc_driver.hxx b/main/mysqlc/source/mysqlc_driver.hxx index b19fa07b29..5b0a5c6083 100644 --- a/main/mysqlc/source/mysqlc_driver.hxx +++ b/main/mysqlc/source/mysqlc_driver.hxx @@ -28,9 +28,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <cppuhelper/compbase2.hxx> -#include <preextstl.h> #include <cppconn/driver.h> -#include <postextstl.h> #include <osl/module.h> namespace connectivity diff --git a/main/mysqlc/source/mysqlc_general.hxx b/main/mysqlc/source/mysqlc_general.hxx index 8b4e1dcdad..d7083a9f03 100644 --- a/main/mysqlc/source/mysqlc_general.hxx +++ b/main/mysqlc/source/mysqlc_general.hxx @@ -25,9 +25,7 @@ #include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/sdbc/SQLException.hpp> -#include <preextstl.h> -#include <cppconn/exception.h> -#include <postextstl.h> +#include <cppconn/driver.h> namespace mysqlc_sdbc_driver { diff --git a/main/mysqlc/source/mysqlc_preparedstatement.hxx b/main/mysqlc/source/mysqlc_preparedstatement.hxx index 20cc7a6c43..4b1843d342 100644 --- a/main/mysqlc/source/mysqlc_preparedstatement.hxx +++ b/main/mysqlc/source/mysqlc_preparedstatement.hxx @@ -40,9 +40,7 @@ #include <com/sun/star/io/XInputStream.hpp> #endif -#include <preextstl.h> #include <cppconn/prepared_statement.h> -#include <postextstl.h> namespace connectivity { diff --git a/main/mysqlc/source/mysqlc_resultsetmetadata.hxx b/main/mysqlc/source/mysqlc_resultsetmetadata.hxx index 2d289367c2..21829dd338 100644 --- a/main/mysqlc/source/mysqlc_resultsetmetadata.hxx +++ b/main/mysqlc/source/mysqlc_resultsetmetadata.hxx @@ -27,9 +27,7 @@ #include <com/sun/star/sdbc/XResultSetMetaData.hpp> #include <cppuhelper/implbase1.hxx> -#include <preextstl.h> #include <cppconn/resultset_metadata.h> -#include <postextstl.h> namespace connectivity { diff --git a/main/mysqlc/source/mysqlc_statement.hxx b/main/mysqlc/source/mysqlc_statement.hxx index ea220dafcf..abfa6844e9 100644 --- a/main/mysqlc/source/mysqlc_statement.hxx +++ b/main/mysqlc/source/mysqlc_statement.hxx @@ -33,9 +33,7 @@ #include <com/sun/star/sdbc/XWarningsSupplier.hpp> #include <com/sun/star/util/XCancellable.hpp> -#include <preextstl.h> -#include <cppconn/statement.h> -#include <postextstl.h> +#include <cppconn/driver.h> #include <cppuhelper/compbase5.hxx> #include <list> diff --git a/main/nss/makefile.mk b/main/nss/makefile.mk index d5537521c9..b15887345c 100644 --- a/main/nss/makefile.mk +++ b/main/nss/makefile.mk @@ -139,9 +139,6 @@ OS_TARGET=WINNT #OS_TARGET=WIN95 .EXPORT : OS_TARGET -# make use of stlport headerfiles -EXT_USE_STLPORT=TRUE - # To build nss one has to call "make nss_build_all" in nss NSS_BUILD_DIR= $(subst,\,/ $(PWD)/$(MISC)/build/$(TARFILE_ROOTDIR)/nss) .IF "$(CPU)" == "I" diff --git a/main/nss/prj/build.lst b/main/nss/prj/build.lst index 1465b16be2..14963fff7c 100644 --- a/main/nss/prj/build.lst +++ b/main/nss/prj/build.lst @@ -1,3 +1,3 @@ -ns nss : solenv stlport NULL +ns nss : solenv NULL ns nss nmake - usr1 ns_mkout NULL ns nss nmake - all ns_nss NULL diff --git a/main/o3tl/qa/test-cow_wrapper.cxx b/main/o3tl/qa/test-cow_wrapper.cxx index 7d9f5a2c62..accdd52f69 100644 --- a/main/o3tl/qa/test-cow_wrapper.cxx +++ b/main/o3tl/qa/test-cow_wrapper.cxx @@ -21,9 +21,7 @@ // autogenerated file with codegen.pl -#include "preextstl.h" #include "gtest/gtest.h" -#include "postextstl.h" #include "cow_wrapper_clients.hxx" diff --git a/main/o3tl/qa/test-heap_ptr.cxx b/main/o3tl/qa/test-heap_ptr.cxx index f9e6e072d9..3d863cac03 100644 --- a/main/o3tl/qa/test-heap_ptr.cxx +++ b/main/o3tl/qa/test-heap_ptr.cxx @@ -21,9 +21,7 @@ -#include "preextstl.h" #include "gtest/gtest.h" -#include "postextstl.h" #include <o3tl/heap_ptr.hxx> diff --git a/main/o3tl/qa/test-range.cxx b/main/o3tl/qa/test-range.cxx index c3986fb6c7..a97150011d 100644 --- a/main/o3tl/qa/test-range.cxx +++ b/main/o3tl/qa/test-range.cxx @@ -21,9 +21,7 @@ -#include "preextstl.h" #include "gtest/gtest.h" -#include "postextstl.h" #include <o3tl/range.hxx> #include <vector> diff --git a/main/o3tl/qa/test-vector_pool.cxx b/main/o3tl/qa/test-vector_pool.cxx index d975aeaffb..2da61ed4c6 100644 --- a/main/o3tl/qa/test-vector_pool.cxx +++ b/main/o3tl/qa/test-vector_pool.cxx @@ -21,9 +21,7 @@ // autogenerated file with codegen.pl -#include "preextstl.h" #include "gtest/gtest.h" -#include "postextstl.h" #include <o3tl/vector_pool.hxx> diff --git a/main/redland/prj/build.lst b/main/redland/prj/build.lst index f6d0562d4b..c23ad527fc 100644 --- a/main/redland/prj/build.lst +++ b/main/redland/prj/build.lst @@ -1,4 +1,4 @@ -rld redland : stlport soltools LIBXML2:libxml2 LIBXSLT:libxslt OPENSSL:openssl NULL +rld redland : soltools LIBXML2:libxml2 LIBXSLT:libxslt OPENSSL:openssl NULL rld redland usr1 - all rld_mkout NULL rld redland\raptor nmake - all rld_raptor NULL rld redland\rasqal nmake - all rld_rasqal rld_raptor NULL diff --git a/main/sal/inc/rtl/ustring.hxx b/main/sal/inc/rtl/ustring.hxx index ae1f5a71c6..ba809710eb 100644 --- a/main/sal/inc/rtl/ustring.hxx +++ b/main/sal/inc/rtl/ustring.hxx @@ -741,7 +741,7 @@ public: @return a hash code value for this object. - @see rtl::OUStringHash for convenient use of STLPort's unordered_map + @see rtl::OUStringHash for convenient use of STLPort's std::unordered_map */ sal_Int32 hashCode() const SAL_THROW(()) { @@ -1472,7 +1472,7 @@ public: /** A helper to use OUStrings with hash maps. Instances of this class are unary function objects that can be used as - hash function arguments to STLPort's unordered_map and similar constructs. + hash function arguments to STLPort's std::unordered_map and similar constructs. */ struct OUStringHash { diff --git a/main/sal/prj/build.lst b/main/sal/prj/build.lst index 1ed389878a..808d55c463 100644 --- a/main/sal/prj/build.lst +++ b/main/sal/prj/build.lst @@ -1,4 +1,4 @@ -sa sal : xml2cmp stlport external BOOST:boost GTEST:gtest NULL +sa sal : xml2cmp external BOOST:boost GTEST:gtest NULL sa sal usr1 - all sa_mkout NULL sa sal\inc nmake - all sa_inc NULL sa sal\typesconfig nmake - u sa_tc sa_inc NULL diff --git a/main/sax/qa/gtest/test_converter.cxx b/main/sax/qa/gtest/test_converter.cxx index 546da3e48b..3894cd8d05 100644 --- a/main/sax/qa/gtest/test_converter.cxx +++ b/main/sax/qa/gtest/test_converter.cxx @@ -21,9 +21,7 @@ -#include "preextstl.h" #include "gtest/gtest.h" -#include "postextstl.h" #include <rtl/ustrbuf.hxx> diff --git a/main/shell/source/win32/shlxthandler/ooofilt/makefile.mk b/main/shell/source/win32/shlxthandler/ooofilt/makefile.mk index c0e2c1a8f8..ef35815705 100644 --- a/main/shell/source/win32/shlxthandler/ooofilt/makefile.mk +++ b/main/shell/source/win32/shlxthandler/ooofilt/makefile.mk @@ -80,12 +80,10 @@ SHL1STDLIBS+=msvcrt.lib .ENDIF -# $(LIBSTLPORTST) - SHL1LIBS+=$(SLB)$/util.lib\ $(SLB)$/ooofilereader.lib - SHL1DEPN= + SHL1OBJS=$(SLOFILES) SHL1DEF=$(MISC)$/$(SHL1TARGET).def DEF1NAME=$(SHL1TARGET) diff --git a/main/solenv/gbuild/platform/windows.mk b/main/solenv/gbuild/platform/windows.mk index 49390ea8f6..0fae06b50d 100644 --- a/main/solenv/gbuild/platform/windows.mk +++ b/main/solenv/gbuild/platform/windows.mk @@ -202,8 +202,7 @@ gb_MakeDepend_FILTEROUT := # reasoning behind each of these. ifeq ($(COMEX),14) -# C++14, not 17. std::tr1 -- which boost/tr1 and the stlport shims name -# directly -- is only present while _HAS_CXX17 is 0; the tree is still full of +# C++14, not 17. std::tr1 -- which boost/tr1 names directly -- is only present while _HAS_CXX17 is 0 # empty exception specifications, which C++20 removes; and <hash_map> and # <hash_set> become a hard #error under C++17. /std:c++03 is not an escape, # a modern cl rejects it outright (D9002). @@ -222,8 +221,7 @@ gb_CXXFLAGS += -std:c++14 # is called out at this length. gb_MakeDepend_FILTEROUT += -std:% -# Without this MSVC reports __cplusplus as 199711L whatever /std: says, and -# the shims in main/stlport/systemstl branch on that value. +# Without this MSVC reports __cplusplus as 199711L whatever /std: says. gb_CXXFLAGS += -Zc:__cplusplus # The two halves of the old snprintf shim are not symmetric. The UCRT @@ -635,19 +633,7 @@ gb_Library_DLLEXT := .dll gb_Library_MAJORVER := 3 gb_Library_RTEXT := MSC$(gb_Library_DLLEXT) -ifeq ($(USE_SYSTEM_STL),YES) -ifeq ($(gb_PRODUCT),$(true)) gb_Library_STLEXT := msvcprt.lib -else -gb_Library_STLEXT := msvcprt.lib -endif -else -ifeq ($(gb_PRODUCT),$(true)) -gb_Library_STLEXT := port_vc7145$(gb_Library_DLLEXT) -else -gb_Library_STLEXT := port_vc7145_stldebug$(gb_Library_DLLEXT) -endif -endif gb_Library_OOOEXT := $(gb_Library_DLLEXT) gb_Library_UNOEXT := .uno$(gb_Library_DLLEXT) diff --git a/main/solenv/inc/os2gcci.mk b/main/solenv/inc/os2gcci.mk index 805b3ba39d..367dbfe31e 100644 --- a/main/solenv/inc/os2gcci.mk +++ b/main/solenv/inc/os2gcci.mk @@ -53,7 +53,7 @@ CDEFS+=-E .ENDIF # _PTHREADS is needed for the stl -CDEFS+=-DX86 -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400 +CDEFS+=-DX86 -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 # this is a platform with JAVA support .IF "$(SOLAR_JAVA)"!="" @@ -259,9 +259,6 @@ STDLIBGUIST=$(STDLIBCPP) STDSHLGUIMT=$(STDLIBCPP) STDSHLCUIMT=$(STDLIBCPP) -LIBSTLPORT=$(DYNAMIC) -LIBSTLPORTST=$(STATIC) $(DYNAMIC) - # name of library manager LIBMGR=ar diff --git a/main/solenv/inc/settings.mk b/main/solenv/inc/settings.mk index 06d05a9669..f233bc00b2 100644 --- a/main/solenv/inc/settings.mk +++ b/main/solenv/inc/settings.mk @@ -1208,17 +1208,9 @@ STDSHL=$(STDSHLCUIMT) .EXPORT : PICSWITCH -.IF "$(USE_SYSTEM_STL)"=="YES" -.IF "$(GUI)"=="OS2" -LIBSTLPORT= -.ELSE -LIBSTLPORT="" -.ENDIF -.ENDIF - .IF "$(NO_DEFAULT_STL)"=="" -STDLIB+=$(LIBSTLPORT) -STDSHL+=$(LIBSTLPORT) +STDLIB+= +STDSHL+= .ENDIF # "$(NO_DEFAULT_STL)"=="" # fill up unresolved symbols not found else where diff --git a/main/solenv/inc/tg_ext.mk b/main/solenv/inc/tg_ext.mk index 89b4399fa1..3f4ed0e3af 100644 --- a/main/solenv/inc/tg_ext.mk +++ b/main/solenv/inc/tg_ext.mk @@ -25,11 +25,7 @@ # setup INCLUDE variable for use by VC++ .IF "$(GUI)$(COM)"=="WNTMSC" -.IF "$(EXT_USE_STLPORT)"=="" -INCLUDE!:=. $(subst,/stl, $(SOLARINC)) -.ELSE # "$(EXT_USE_STLPORT)"=="" INCLUDE!:=. $(SOLARINC) -.ENDIF # "$(EXT_USE_STLPORT)"=="" INCLUDE!:=$(INCLUDE:s/ -I/;/) .EXPORT : INCLUDE .ENDIF # "$(GUI)$(COM)"=="WNTMSC" diff --git a/main/solenv/inc/unxbsdi.mk b/main/solenv/inc/unxbsdi.mk index c88bc4d977..34b75e8c13 100644 --- a/main/solenv/inc/unxbsdi.mk +++ b/main/solenv/inc/unxbsdi.mk @@ -33,7 +33,7 @@ JAVAFLAGSDEBUG=-g #LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter" # _PTHREADS is needed for the stl -CDEFS+=-DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER) +CDEFS+=-DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 # this is a platform with JAVA support .IF "$(SOLAR_JAVA)"!="" @@ -142,14 +142,6 @@ STDLIBCUIMT=-lpthread -lm STDSHLGUIMT=-lX11 -lXext -lpthread -lm STDSHLCUIMT=-lpthread -lm -.IF "$(STLPORT_VER)" >= "500" -LIBSTLPORT=$(DYNAMIC) -lstlport -LIBSTLPORTST=$(STATIC) -lstlport $(DYNAMIC) -.ELSE -LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) -.ENDIF - # name of library manager LIBMGR=ar diff --git a/main/solenv/inc/unxbsdi2.mk b/main/solenv/inc/unxbsdi2.mk index ed5d0326b3..2654dccc75 100644 --- a/main/solenv/inc/unxbsdi2.mk +++ b/main/solenv/inc/unxbsdi2.mk @@ -33,7 +33,7 @@ JAVAFLAGSDEBUG=-g #LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter" # _PTHREADS is needed for the stl -CDEFS+= -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER) +CDEFS+= -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 # this is a platform with JAVA support .IF "$(SOLAR_JAVA)"!="" @@ -165,13 +165,6 @@ STDSHLCUIMT=-lpthread -lm LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive -.IF "$(STLPORT_VER)" >= "500" -LIBSTLPORT=$(DYNAMIC) -lstlport -lstdc++ -LIBSTLPORTST=$(STATIC) -lstlport $(DYNAMIC) -.ELSE -LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -lstdc++ -LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) -.ENDIF #FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC) diff --git a/main/solenv/inc/unxbsds.mk b/main/solenv/inc/unxbsds.mk index 5b86d1fb0c..10dcadd18a 100644 --- a/main/solenv/inc/unxbsds.mk +++ b/main/solenv/inc/unxbsds.mk @@ -33,7 +33,7 @@ JAVAFLAGSDEBUG=-g #LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter" # _PTHREADS is needed for the stl -CDEFS+=-D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER) -DOSL_USE_SYS_V_SEMAPHORE +CDEFS+=-D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DOSL_USE_SYS_V_SEMAPHORE # this is a platform with JAVA support .IF "$(SOLAR_JAVA)"!="" @@ -140,16 +140,6 @@ STDLIBCUIMT=-lpthread -lm STDSHLGUIMT=-lX11 -lXext -lpthread -lm STDSHLCUIMT=-lpthread -lm -# STLport always needs pthread. This may yield some redundant -lpthread -# but that doesn't matter. -.IF "$(STLPORT_VER)" >= "500" -LIBSTLPORT=$(DYNAMIC) -lstlport -lpthread -LIBSTLPORTST=$(STATIC) -lstlport $(DYNAMIC) -lpthread -.ELSE -LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -lpthread -LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) -lpthread -.ENDIF - # name of library manager LIBMGR=ar diff --git a/main/solenv/inc/unxfbsd.mk b/main/solenv/inc/unxfbsd.mk index 09290906ca..c7b16c0872 100644 --- a/main/solenv/inc/unxfbsd.mk +++ b/main/solenv/inc/unxfbsd.mk @@ -55,7 +55,7 @@ JAVAFLAGSDEBUG=-g #LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter" # _PTHREADS is needed for the stl -CDEFS+=$(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450 +CDEFS+=$(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 .IF "$(COM)"=="CLANG" CDEFS+=-DHAVE_STL_INCLUDE_PATH .ELSE @@ -250,23 +250,6 @@ X11LINK_DYNAMIC = -Wl,--as-needed -lXext -lX11 -Wl,--no-as-needed LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive -.IF "$(USE_STLP_DEBUG)" != "" -.IF "$(STLPORT_VER)" >= "500" -LIBSTLPORT=$(DYNAMIC) -lstlportstlg -LIBSTLPORTST=$(STATIC) -lstlportstlg $(DYNAMIC) -.ELSE -LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug -LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC) -.ENDIF -.ELSE # "$(USE_STLP_DEBUG)" != "" -.IF "$(STLPORT_VER)" >= "500" -LIBSTLPORT=$(DYNAMIC) -lstlport -LIBSTLPORTST=$(STATIC) -lstlport $(DYNAMIC) -.ELSE -LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) -.ENDIF -.ENDIF # "$(USE_STLP_DEBUG)" != "" #FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC) diff --git a/main/solenv/inc/unxmacx.mk b/main/solenv/inc/unxmacx.mk index 13dfaa9b13..ecfa9efb85 100644 --- a/main/solenv/inc/unxmacx.mk +++ b/main/solenv/inc/unxmacx.mk @@ -155,27 +155,6 @@ CDEFS+=$(EXTRA_CDEFS) STDLIBCPP=-lstdc++ -# --------------------------------- -# STLport library names -# --------------------------------- -.IF "$(USE_STLP_DEBUG)" != "" -.IF "$(STLPORT_VER)" >= "500" -LIBSTLPORT=-lstlportstlg -LIBSTLPORTST=$(STATIC) -lstlportstlg -.ELSE -LIBSTLPORT=-lstlport_gcc_stldebug -LIBSTLPORTST=$(SOLARVERSION)/$(INPATH)/lib/libstlport_gcc_stldebug.a -.ENDIF -.ELSE # "$(USE_STLP_DEBUG" != "" -.IF "$(STLPORT_VER)" >= "500" -LIBSTLPORT=-lstlport -LIBSTLPORTST=$(STATIC) -lstlport -.ELSE -LIBSTLPORT=-lstlport_gcc -LIBSTLPORTST=$(SOLARVERSION)/$(INPATH)/lib/libstlport_gcc.a -.ENDIF -.ENDIF # "$(USE_STLP_DEBUG" != "" - # --------------------------------- # Link stage flags # --------------------------------- diff --git a/main/solenv/inc/unxsogi.mk b/main/solenv/inc/unxsogi.mk index cabf16277c..eaed11ecd2 100644 --- a/main/solenv/inc/unxsogi.mk +++ b/main/solenv/inc/unxsogi.mk @@ -29,7 +29,7 @@ SOLAR_JAVA=TRUE JAVAFLAGSDEBUG=-g # _PTHREADS is needed for the stl -CDEFS+=-D_PTHREADS -D_REENTRANT -DSYSV -DSUN -DSUN4 -D_POSIX_PTHREAD_SEMANTICS -DSTLPORT_VERSION=$(STLPORT_VER) -D_USE_NAMESPACE=1 +CDEFS+=-D_PTHREADS -D_REENTRANT -DSYSV -DSUN -DSUN4 -D_POSIX_PTHREAD_SEMANTICS -D_USE_NAMESPACE=1 .IF "$(SOLAR_JAVA)"!="" @@ -108,14 +108,6 @@ STDSHLCUIMT=$(DYNAMIC) -lpthread -lthread -lm STDLIBGUIMT+=-lX11 -.IF "$(STLPORT_VER)" >= "500" -LIBSTLPORT=$(DYNAMIC) -lstlport -LIBSTLPORTST=$(STATIC) -lstlport $(DYNAMIC) -.ELSE -LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) -.ENDIF - LIBMGR=ar LIBFLAGS=-r # LIBEXT=.so diff --git a/main/solenv/inc/unxsogs.mk b/main/solenv/inc/unxsogs.mk index 1fd328c297..a82bdc7ee0 100644 --- a/main/solenv/inc/unxsogs.mk +++ b/main/solenv/inc/unxsogs.mk @@ -29,7 +29,7 @@ SOLAR_JAVA=TRUE JAVAFLAGSDEBUG=-g # _PTHREADS is needed for the stl -CDEFS+=-D_PTHREADS -D_REENTRANT -DSYSV -DSUN -DSUN4 -D_POSIX_PTHREAD_SEMANTICS -DSTLPORT_VERSION=$(STLPORT_VER) -D_USE_NAMESPACE=1 +CDEFS+=-D_PTHREADS -D_REENTRANT -DSYSV -DSUN -DSUN4 -D_POSIX_PTHREAD_SEMANTICS -D_USE_NAMESPACE=1 .IF "$(SOLAR_JAVA)"!="" @@ -107,14 +107,6 @@ STDSHLCUIMT=$(DYNAMIC) -lpthread -lthread -lm STDLIBGUIMT+=-lX11 -.IF "$(STLPORT_VER)" >= "500" -LIBSTLPORT=$(DYNAMIC) -lstlport -LIBSTLPORTST=$(STATIC) -lstlport $(DYNAMIC) -.ELSE -LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) -.ENDIF - LIBMGR=ar LIBFLAGS=-r # LIBEXT=.so diff --git a/main/solenv/inc/unxsoli4.mk b/main/solenv/inc/unxsoli4.mk index bcccd263fa..3bab60fe37 100644 --- a/main/solenv/inc/unxsoli4.mk +++ b/main/solenv/inc/unxsoli4.mk @@ -25,7 +25,7 @@ ASM=/usr/ccs/bin/as AFLAGS=-P -CDEFS+=-D_PTHREADS -DSYSV -DSUN -DSUN4 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DSTLPORT_VERSION=$(STLPORT_VER) +CDEFS+=-D_PTHREADS -DSYSV -DSUN -DSUN4 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS SOLAR_JAVA*=TRUE .IF "$(SOLAR_JAVA)"!="" @@ -201,14 +201,6 @@ X11LINK_DYNAMIC = -lXext -lX11 # LIBSALCPPRT*=-z allextract -lsalcpprt -z defaultextract LIBSALCPPRT= -.IF "$(USE_STLP_DEBUG)" != "" -LIBSTLPORT=$(DYNAMIC) -lstlport_sunpro_debug -LIBSTLPORTST=$(STATIC) -lstlport_sunpro_debug $(DYNAMIC) -.ELSE -LIBSTLPORT=$(DYNAMIC) -lstlport_sunpro -LIBSTLPORTST=$(STATIC) -lstlport_sunpro $(DYNAMIC) -.ENDIF # "$(USE_STLP_DEBUG)" != "" - LIBMGR=CC LIBFLAGS=-xar -o diff --git a/main/solenv/inc/unxsols4.mk b/main/solenv/inc/unxsols4.mk index 8848574c1a..b11ecc1fda 100644 --- a/main/solenv/inc/unxsols4.mk +++ b/main/solenv/inc/unxsols4.mk @@ -26,7 +26,7 @@ ASM=/usr/ccs/bin/as # needs -D__sparcv8plus because it's not defined by the assembler with -xarch=v8plus AFLAGS=-P -xarch=v8plus -D__sparcv8plus -CDEFS+=-D_PTHREADS -DSYSV -DSUN -DSUN4 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DSTLPORT_VERSION=$(STLPORT_VER) +CDEFS+=-D_PTHREADS -DSYSV -DSUN -DSUN4 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS SOLAR_JAVA*=TRUE .IF "$(SOLAR_JAVA)"!="" @@ -207,14 +207,6 @@ X11LINK_DYNAMIC = -lXext -lX11 # LIBSALCPPRT*=-z allextract -lsalcpprt -z defaultextract LIBSALCPPRT= -.IF "$(USE_STLP_DEBUG)" != "" -LIBSTLPORT=$(DYNAMIC) -lstlport_sunpro_debug -LIBSTLPORTST=$(STATIC) -lstlport_sunpro_debug $(DYNAMIC) -.ELSE -LIBSTLPORT=$(DYNAMIC) -lstlport_sunpro -LIBSTLPORTST=$(STATIC) -lstlport_sunpro $(DYNAMIC) -.ENDIF # "$(USE_STLP_DEBUG)" != "" - LIBMGR=CC LIBFLAGS=-xar -o diff --git a/main/solenv/inc/unxsolu4.mk b/main/solenv/inc/unxsolu4.mk index a1a4ce68a9..3d22ea5cbf 100644 --- a/main/solenv/inc/unxsolu4.mk +++ b/main/solenv/inc/unxsolu4.mk @@ -51,7 +51,7 @@ CC*=cc CFLAGS=$(PREENVCFLAGS) -c -temp=/tmp CFLAGSCC=-xCC $(ARCH_FLAGS) -CFLAGSCXX= -features=no%altspell -library=stlport4 $(ARCH_FLAGS) +CFLAGSCXX= -features=no%altspell $(ARCH_FLAGS) # flags to enable build with symbols; required for crashdump feature CFLAGSENABLESYMBOLS=-g0 -xs # was temporarily commented out, reenabled before Beta @@ -138,7 +138,7 @@ LINKFLAGSRUNPATH_OXT= LINKFLAGSRUNPATH_BOXT=-R\''$$ORIGIN'\' #LINKFLAGSRUNPATH_BOXT=-R\''$$ORIGIN/../../../basis-link/program'\' LINKFLAGSRUNPATH_NONE= -LINKFLAGS=-m64 -w -mt -z combreloc -PIC -temp=/tmp -norunpath -library=stlport4 +LINKFLAGS=-m64 -w -mt -z combreloc -PIC -temp=/tmp -norunpath LINKCFLAGS=-m64 -w -mt -z combreloc -norunpath # -z text force fatal error if non PIC code is linked into shared library. Such code @@ -199,14 +199,6 @@ STDSHLGUIMT+=-lX11 -ldl # LIBSALCPPRT*=-z allextract -lsalcpprt -z defaultextract LIBSALCPPRT= -.IF "$(USE_STLP_DEBUG)" != "" -LIBSTLPORT=$(DYNAMIC) -lstlport_sunpro_debug -LIBSTLPORTST=$(STATIC) -lstlport_sunpro_debug $(DYNAMIC) -.ELSE -LIBSTLPORT=$(DYNAMIC) -lstlport_sunpro -LIBSTLPORTST=$(STATIC) -lstlport_sunpro $(DYNAMIC) -.ENDIF # "$(USE_STLP_DEBUG)" != "" - LIBMGR=CC LIBFLAGS=-xar -o diff --git a/main/solenv/inc/wntgcci.mk b/main/solenv/inc/wntgcci.mk index 0bb1f87595..096d56d954 100644 --- a/main/solenv/inc/wntgcci.mk +++ b/main/solenv/inc/wntgcci.mk @@ -73,7 +73,7 @@ CFLAGSNOOPT=-O0 # Compiler flags for describing the output path CFLAGSOUTOBJ=-o #plattform hart setzen -CDEFS+=-DWIN32 -DWINVER=0x500 -D_WIN32_WINNT=0x500 -D_WIN32_IE=0x500 -D_M_IX86 -DSTLPORT_VERSION=450 -D_NATIVE_WCHAR_T_DEFINED -D_MSC_EXTENSIONS -D_FORCENAMELESSUNION +CDEFS+=-DWIN32 -DWINVER=0x500 -D_WIN32_WINNT=0x500 -D_WIN32_IE=0x500 -D_M_IX86 -D_NATIVE_WCHAR_T_DEFINED -D_MSC_EXTENSIONS -D_FORCENAMELESSUNION .IF "$(DYNAMIC_CRT)"!="" CDEFS+=-D_DLL .ENDIF @@ -159,9 +159,6 @@ STDLIBCUIMT+=-lmingw32 -lmoldname -lmingwex -Wl,--end-group $(UWINAPILIB) -lm -l STDSHLGUIMT+=-lmingw32 -lmoldname -lmingwex -Wl,--end-group $(UWINAPILIB) -lm -lkernel32 -luser32 -lmsvcrt STDSHLCUIMT+=-lmingw32 -lmoldname -lmingwex -Wl,--end-group $(UWINAPILIB) -lm -lkernel32 -luser32 -lmsvcrt -LIBSTLPORT=-lstlport_gcc -LIBSTLPORTST=-lstlport_gcc_static $(STDLIBCPP) - LIBMGR=ar LIBFLAGS=-rsu diff --git a/main/solenv/inc/wntmsc14.mk b/main/solenv/inc/wntmsc14.mk index 353c568eff..293327d0a5 100644 --- a/main/solenv/inc/wntmsc14.mk +++ b/main/solenv/inc/wntmsc14.mk @@ -40,8 +40,7 @@ # three say 14: # # * std::tr1. The MSVC standard library still ships it, but only while -# _HAS_CXX17 is 0 -- and boost/tr1 and the shims in main/stlport reach for -# std::tr1 by name. +# _HAS_CXX17 is 0 -- and boost/tr1 reaches for std::tr1 by name. # * the empty exception specification. throw() is deprecated in C++17 and # removed in C++20, and there are still thousands of them here; migrating # them to noexcept is a separate change. @@ -53,10 +52,7 @@ CFLAGSCXX+=-std:c++14 # Report the real __cplusplus. Without this MSVC reports 199711L whatever -# /std: says, and the shims in main/stlport/systemstl branch on -# __cplusplus >= 201103L to decide whether <hash_map> can forward to -# <unordered_map>. Left off, they take the pre-C++11 branch and reach for -# boost/tr1 instead. +# /std: says. CFLAGSCXX+=-Zc:__cplusplus # --- the CRT ------------------------------------------------------------- @@ -76,9 +72,7 @@ CFLAGSCXX+=-Zc:__cplusplus CDEFS+=-Dsnwprintf=_snwprintf # stdext::hash_map and stdext::hash_set are deprecated to the point of a hard -# #error. The tree reaches them through the stlport shims in a great many -# places; these are the stdext containers, not std::unordered_map, so -# replacing them is a refactor and not a build fix. +# #error. CDEFS+=-D_SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS # The CRT split in three when the UCRT arrived: a startup/import library, the diff --git a/main/solenv/inc/wntmsci10.mk b/main/solenv/inc/wntmsci10.mk index c918e6abbb..a1cc0bb0b0 100644 --- a/main/solenv/inc/wntmsci10.mk +++ b/main/solenv/inc/wntmsci10.mk @@ -204,7 +204,7 @@ CFLAGSWERRCC=-WX MODULES_WITH_WARNINGS := \ lingucomponent -CDEFS+=-DSTLPORT_VERSION=$(STLPORT_VER) -D_MT -DWINVER=0x0500 -D_WIN32_WINNT=0x0500 -D_WIN32_IE=0x0500 +CDEFS+=-D_MT -DWINVER=0x0500 -D_WIN32_WINNT=0x0500 -D_WIN32_IE=0x0500 COMMENTFLAG=/COMMENT:"$(PRJNAME)_$(UPD)_$(VCSID)_" @@ -273,15 +273,6 @@ STDLIBCUIMT=$(LIBCMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib psapi.l STDSHLGUIMT=$(LIBCMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib psapi.lib STDSHLCUIMT=$(LIBCMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib psapi.lib -.IF "$(USE_STLP_DEBUG)" != "" -CFLAGS+=-MTd -LIBSTLPORT=stlport_vc71_stldebug.lib -LIBSTLPORTST=stlport_vc71_stldebug_static.lib -.ELSE -LIBSTLPORT=stlport_vc71.lib -LIBSTLPORTST=stlport_vc71_static.lib -.ENDIF - ATL_INCLUDE*=$(COMPATH)/atlmfc/include ATL_LIB*=$(COMPATH)/atlmfc/lib diff --git a/main/solenv/inc/wntmsci11.mk b/main/solenv/inc/wntmsci11.mk index e926859535..2a514c35dc 100644 --- a/main/solenv/inc/wntmsci11.mk +++ b/main/solenv/inc/wntmsci11.mk @@ -322,14 +322,6 @@ LIBCMT+= libcpmt.lib .ENDIF "$(USE_STLP_DEBUG)" == "" .ENDIF # "$(DYNAMIC_CRT)"!="" .ELSE # !USE_SYSTEM_STL -.IF "$(USE_STLP_DEBUG)" != "" -LIBSTLPORT=stlport_vc71_stldebug.lib -LIBSTLPORTST=stlport_vc71_stldebug_static.lib -.ELSE -LIBSTLPORT=stlport_vc71.lib -LIBSTLPORTST=stlport_vc71_static.lib -.ENDIF -.ENDIF .IF "$(PROF_EDITION)" == "" ATL_INCLUDE*=$(COMPATH)/PlatformSDK/include/atl diff --git a/main/solenv/inc/wntmscx.mk b/main/solenv/inc/wntmscx.mk index b61b99e574..be8bdf3627 100644 --- a/main/solenv/inc/wntmscx.mk +++ b/main/solenv/inc/wntmscx.mk @@ -328,14 +328,6 @@ LIBCMT+= libcpmt.lib .ENDIF "$(USE_STLP_DEBUG)" == "" .ENDIF # "$(DYNAMIC_CRT)"!="" .ELSE # !USE_SYSTEM_STL -.IF "$(USE_STLP_DEBUG)" != "" -LIBSTLPORT=stlport_vc71_stldebug.lib -LIBSTLPORTST=stlport_vc71_stldebug_static.lib -.ELSE -LIBSTLPORT=stlport_vc71.lib -LIBSTLPORTST=stlport_vc71_static.lib -.ENDIF -.ENDIF .IF "$(PROF_EDITION)" == "" ATL_INCLUDE*=$(COMPATH)/PlatformSDK/include/atl diff --git a/main/soltools/adjustvisibility/makefile.mk b/main/soltools/adjustvisibility/makefile.mk index 9699a6387d..e92b9adfa4 100644 --- a/main/soltools/adjustvisibility/makefile.mk +++ b/main/soltools/adjustvisibility/makefile.mk @@ -45,7 +45,6 @@ DEPOBJFILES = $(APP1OBJ) APP1STDLIBS = -lelf APP1RPATH = NONE -#APP1STDLIBS+=-lstlport APP1STDLIBS+=-lCstd .ENDIF "$(OS)"=="SOLARIS" diff --git a/main/soltools/mkdepend/makefile.mk b/main/soltools/mkdepend/makefile.mk index 258535f0ce..59f04379ff 100644 --- a/main/soltools/mkdepend/makefile.mk +++ b/main/soltools/mkdepend/makefile.mk @@ -63,7 +63,6 @@ APP1STDLIBS+=msvcprt.lib .ENDIF # "$(COM)"=="MSC" .IF "$(OS)"=="SOLARIS" -#APP1STDLIBS+=-lstlport APP1STDLIBS+=-lCstd .ENDIF diff --git a/main/soltools/util/makefile.pmk b/main/soltools/util/makefile.pmk index 434a142b58..fe5e1f37ce 100644 --- a/main/soltools/util/makefile.pmk +++ b/main/soltools/util/makefile.pmk @@ -27,14 +27,6 @@ MAKEDEPEND=$(AUGMENT_LIBRARY_PATH) $(BIN)$/makedepend # find 'adjustvisibility' in own output tree ADJUSTVISIBILITY=$(AUGMENT_LIBRARY_PATH) $(BIN)$/adjustvisibility -# avoid STLPort -NO_DEFAULT_STL=TRUE -SOLARINC!:=$(subst,/stl$(SPACECHAR),dont_use_stl$(SPACECHAR) $(SOLARINC)) -.IF "$(STLPORT4)" != "" -SOLARINC!:=$(subst,$(STLPORT4)/include/stlport,dont_use_stl$(SPACECHAR) $(SOLARINC)) -SOLARINC!:=$(subst,$(STLPORT4)/stlport,dont_use_stl$(SPACECHAR) $(SOLARINC)) -.ENDIF - .IF "$(OS)"=="SOLARIS" # hack due to #i53089# .IF "$(COMPATH:+"x")" != "$(COMPATH:+"x":s/binx//)" diff --git a/main/stlport/makefile.mk b/main/stlport/makefile.mk deleted file mode 100644 index bd1cda972c..0000000000 --- a/main/stlport/makefile.mk +++ /dev/null @@ -1,44 +0,0 @@ -#************************************************************** -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -#************************************************************** - - - -PRJ=. - -PRJNAME=so_stlport -TARGET=so_stlport - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# Wrap STL headers to get them into the std namespace: -$(INCCOM)$/stlport$/functional \ -$(INCCOM)$/stlport$/hash_map \ -$(INCCOM)$/stlport$/hash_set \ -$(INCCOM)$/stlport$/numeric \ -$(INCCOM)$/stlport$/slist \ -$(INCCOM)$/stlport$/list \ -$(INCCOM)$/stlport$/map \ -$(INCCOM)$/stlport$/set \ -$(INCCOM)$/stlport$/vector: systemstl$/$$(@:f) - $(MKDIRHIER) $(@:d) - $(COPY) $< $@ diff --git a/main/stlport/prj/build.lst b/main/stlport/prj/build.lst deleted file mode 100644 index f0cd7746a4..0000000000 --- a/main/stlport/prj/build.lst +++ /dev/null @@ -1,2 +0,0 @@ -sl stlport : SO:so_prereq solenv BOOST:boost NULL -sl stlport nmake - all sl_mkout NULL diff --git a/main/stlport/prj/d.lst b/main/stlport/prj/d.lst deleted file mode 100644 index 8ae05fbd91..0000000000 --- a/main/stlport/prj/d.lst +++ /dev/null @@ -1,3 +0,0 @@ -mkdir: %_DEST%\inc%_EXT%\stl -..\%__SRC%\inc\stlport\* %_DEST%\inc%_EXT%\stl\* -..\systemstlguards\*.h %_DEST%\inc%_EXT%\stl\*.h diff --git a/main/stlport/systemstl/functional b/main/stlport/systemstl/functional deleted file mode 100644 index 36a044c199..0000000000 --- a/main/stlport/systemstl/functional +++ /dev/null @@ -1,85 +0,0 @@ -/************************************************************** - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - *************************************************************/ - -#ifndef SYSTEM_STL_FUNCTIONAL -#define SYSTEM_STL_FUNCTIONAL - -#if defined(HAVE_STL_INCLUDE_PATH) - // TODO: use computed include file name - #include_next <functional> -#elif defined(_MSC_VER) && (_MSC_VER >= 1900) - /* A modern MSVC keeps the standard headers in <toolset>/include, and this - file shadows <functional> on the include path, so the real one has to be reached - explicitly. The path below resolves against the toolset's own include - directory and against nothing else on the search path -- the same trick - the VC9 branch uses, retargeted at the layout a modern toolset has. - #include_next, used by the branches around this one, is a GCC extension - that MSVC does not have. */ - #include <../include/functional> -#elif defined(_MSC_VER) - #include <../../VC/include/functional> - namespace std { using tr1::hash; } -#if 0 // TODO: enable only when std::_Swap_adl is not available - // note: VS2008SP1 has known problems after a security update (KB971092,KB974479,KB974223) - namespace std{ template<class _T> void _Swap_adl(_T& l, _T& r) {swap(l,r);} } -#endif -#elif defined(__cplusplus) && (__cplusplus >= 201103L) - #include_next <functional> -#else // fall back to boost/tr1 - #include <boost/tr1/tr1/functional> - #include <boost/functional/hash.hpp> -#endif - - -#ifndef NO_STLPORT4_EMULATION - -namespace std -{ -// emulate SGI extensions to the STL using http://www.sgi.com/tech/stl/stl_function.h as reference -template< typename T> struct identity { typedef T argument_type; typedef T result_type; T operator()(const T& t) const { return t;} }; -template< typename T, typename U> struct project2nd { typedef T first_argument_type; typedef U second_argument_type; typedef U result_type; U operator()(const T&, const U& u) const { return u;}}; -template<typename P> struct select1st { typedef P argument_type; typedef typename P::first_type result_type; const typename P::first_type& operator()(const P& p) const { return p.first; }}; -template<typename P> struct select2nd { typedef P argument_type; typedef typename P::second_type result_type; const typename P::second_type& operator()(const P& p) const { return p.second; }}; - -#if (defined(_MSC_VER) && (_MSC_VER >= 1600)) || defined(__GXX_EXPERIMENTAL_CXX0X__) -template<typename T> inline T&& forward( typename identity<T>::type&& t) { return t; } -#endif // C++11 move semantics - -template<typename Op1, typename Op2> class unary_compose -{ -protected: - Op1 aOp1; - Op2 aOp2; -public: - typedef typename Op2::argument_type argument_type; - typedef typename Op1::result_type result_type; - unary_compose( const Op1& rOp1, const Op2& rOp2) : aOp1(rOp1), aOp2(rOp2) {} - typename Op1::result_type operator()( const typename Op2::argument_type& x) const { return aOp1(aOp2(x)); } -}; - -template<typename Op1, typename Op2> inline unary_compose<Op1,Op2> compose1( const Op1& rOp1, const Op2& rOp2) { return unary_compose<Op1,Op2>(rOp1, rOp2); } - -} // namespace std - -#endif // NO_STLPORT4_EMULATION - -#endif - diff --git a/main/stlport/systemstl/hash_map b/main/stlport/systemstl/hash_map deleted file mode 100644 index 812a51ad39..0000000000 --- a/main/stlport/systemstl/hash_map +++ /dev/null @@ -1,97 +0,0 @@ -/************************************************************** - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - *************************************************************/ - -#ifndef SYSTEM_STL_HASHMAP -#define SYSTEM_STL_HASHMAP - -#ifdef HAVE_STL_INCLUDE_PATH - // TODO: use computed include file name - #include_next <unordered_map> -#elif defined(__cplusplus) && (__cplusplus >= 201103L) - #include <unordered_map> -#elif defined(_MSC_VER) - #pragma warning(push) - #pragma warning(disable:4555) - #include <../../VC/include/unordered_map> - #pragma warning(pop) - #define STLP4_EMUBASE_NS ::std::tr1 -#else // fall back to boost/tr1 - #include <boost/tr1/tr1/unordered_map> - #define STLP4_EMUBASE_NS ::boost -#endif - - -#ifndef NO_STLPORT4_EMULATION - -namespace std -{ -#ifdef STLP4_EMUBASE_NS - using STLP4_EMUBASE_NS::hash; - using STLP4_EMUBASE_NS::unordered_map; - using STLP4_EMUBASE_NS::unordered_multimap; - #undef STLP4_EMUBASE_NS -#endif - - -template< - typename __K, - typename __T, - typename __H = hash<__K>, - typename __E = equal_to<__K> > -class hash_map -: public unordered_map<__K,__T,__H,__E> -{ -public: - typedef unordered_map<__K,__T,__H,__E> _super; - - hash_map( void) {} - hash_map( size_t n) : _super( n) {} - -private: - // setting the hasher dynamically is not supported in the emulation! - hash_map( size_t, const __H&, const __E& rE=__E()); // not implemented -}; - -template< - typename __K, - typename __T, - typename __H = hash<__K>, - typename __E = equal_to<__K> > -class hash_multimap -: public unordered_multimap<__K,__T,__H,__E> -{ -public: - typedef unordered_multimap<__K,__T,__H,__E> _super; - - hash_multimap( void) {} - hash_multimap( size_t n) : _super( n) {} - -private: - // setting the hasher dynamically is not supported in the emulation! - hash_multimap( size_t, const __H&, const __E& rE=__E()); // not implemented -}; - -} // namespace std - -#endif // NO_STLPORT4_EMULATION - -#endif - diff --git a/main/stlport/systemstl/hash_set b/main/stlport/systemstl/hash_set deleted file mode 100644 index 5435ee93b7..0000000000 --- a/main/stlport/systemstl/hash_set +++ /dev/null @@ -1,90 +0,0 @@ -/************************************************************** - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - *************************************************************/ - -#ifndef SYSTEM_STL_HASHSET -#define SYSTEM_STL_HASHSET - -#ifdef HAVE_STL_INCLUDE_PATH - // TODO: use computed include file name - #include_next <unordered_set> -#elif defined(__cplusplus) && (__cplusplus >= 201103L) - #include <unordered_set> -#elif defined(_MSC_VER) - #include <../../VC/include/unordered_set> - #define STLP4_EMUBASE_NS ::std::tr1 -#else // fall back to boost/tr1 - #include <boost/tr1/tr1/unordered_set> - #define STLP4_EMUBASE_NS ::boost -#endif - - -#ifndef NO_STLPORT4_EMULATION - -namespace std -{ -#ifdef STLP4_EMUBASE_NS - using STLP4_EMUBASE_NS::hash; - using STLP4_EMUBASE_NS::unordered_set; - using STLP4_EMUBASE_NS::unordered_multiset; - #undef STLP4_EMUBASE_NS -#endif - - -template< - typename __K, - typename __H = hash<__K>, - typename __E = equal_to<__K> > -class hash_set -: public unordered_set<__K,__H,__E> -{ - typedef unordered_set<__K,__H,__E> _super; -public: - hash_set( void) {} - hash_set( size_t n) : _super(n) {} - -private: - // setting the hasher dynamically is not supported in the emulation! - hash_set( size_t, const __H&, const __E& rE=__E()); // not implemented -}; - -template< - typename __K, - typename __H = hash<__K>, - typename __E = equal_to<__K> > -class hash_multiset -: public unordered_multiset<__K,__H,__E> -{ - typedef unordered_multiset<__K,__H,__E> _super; -public: - hash_multiset( void) {} - hash_multiset( size_t n) : _super( n) {} - -private: - // setting the hasher dynamically is not supported in the emulation! - hash_multiset( size_t, const __H&, const __E& rE=__E()); // not implemented -}; - -} // namespace std - -#endif // NO_STLPORT4_EMULATION - -#endif - diff --git a/main/stlport/systemstl/list b/main/stlport/systemstl/list deleted file mode 100644 index e56beffb49..0000000000 --- a/main/stlport/systemstl/list +++ /dev/null @@ -1,50 +0,0 @@ -/************************************************************** - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - *************************************************************/ - -#ifndef SYSTEM_STL_LIST -#define SYSTEM_STL_LIST - -#ifdef HAVE_STL_INCLUDE_PATH - // TODO: use computed include file name - #include_next <list> -#elif defined(_MSC_VER) && (_MSC_VER >= 1900) - /* A modern MSVC keeps the standard headers in <toolset>/include, and this - file shadows <list> on the include path, so the real one has to be - reached explicitly. The path below resolves against the toolset's own - include directory and against nothing else on the search path -- the - same trick the VC9 branch below uses, retargeted at the layout a modern - toolset has. #include_next, used by the branches around this one, is a - GCC extension that MSVC does not have. */ - #include <../include/list> -#elif defined(_MSC_VER) - // MSVC's list would cause a lot of expression-result-unused warnings - // unless it is compiled in iterator-debugging mode. Silence this noise temporarily. - #pragma warning(push) - #pragma warning(disable:4555) - #include <../../VC/include/list> - #pragma warning(pop) -#elif defined(__cplusplus) && (__cplusplus >= 201103L) - #include_next <list> -#else // fall back to boost/tr1 - #include <boost/tr1/tr1/list> -#endif - -#endif diff --git a/main/stlport/systemstl/map b/main/stlport/systemstl/map deleted file mode 100644 index 962361f117..0000000000 --- a/main/stlport/systemstl/map +++ /dev/null @@ -1,46 +0,0 @@ -/************************************************************** - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - *************************************************************/ - -#ifndef SYSTEM_STL_MAP -#define SYSTEM_STL_MAP - -#ifdef HAVE_STL_INCLUDE_PATH - // TODO: use computed include file name - #include_next <map> -#elif defined(_MSC_VER) && (_MSC_VER >= 1900) - /* A modern MSVC keeps the standard headers in <toolset>/include, and this - file shadows <map> on the include path, so the real one has to be - reached explicitly. The path below resolves against the toolset's own - include directory and against nothing else on the search path -- the - same trick the VC9 branch below uses, retargeted at the layout a modern - toolset has. #include_next, used by the branches around this one, is a - GCC extension that MSVC does not have. */ - #include <../include/map> -#elif defined(__cplusplus) && (__cplusplus >= 201103L) - #include_next <map> -#elif defined(_MSC_VER) - #include <../../VC/include/map> -#else // fall back to boost/tr1 - #include <boost/tr1/tr1/map> -#endif - -#endif - diff --git a/main/stlport/systemstl/numeric b/main/stlport/systemstl/numeric deleted file mode 100644 index d68dd30e5e..0000000000 --- a/main/stlport/systemstl/numeric +++ /dev/null @@ -1,46 +0,0 @@ -/************************************************************** - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - *************************************************************/ - -#ifndef SYSTEM_STL_NUMERIC -#define SYSTEM_STL_NUMERIC - -#ifdef HAVE_STL_INCLUDE_PATH - // TODO: use computed include file name - #include_next <numeric> -#elif defined(_MSC_VER) && (_MSC_VER >= 1900) - /* A modern MSVC keeps the standard headers in <toolset>/include, and this - file shadows <numeric> on the include path, so the real one has to be - reached explicitly. The path below resolves against the toolset's own - include directory and against nothing else on the search path -- the - same trick the VC9 branch below uses, retargeted at the layout a modern - toolset has. #include_next, used by the branches around this one, is a - GCC extension that MSVC does not have. */ - #include <../include/numeric> -#elif defined(__cplusplus) && (__cplusplus >= 201103L) - #include_next <numeric> -#elif defined(_MSC_VER) - #include <../../VC/include/numeric> -#else // fall back to boost/tr1 - #include <boost/tr1/tr1/numeric> -#endif - -#endif - diff --git a/main/stlport/systemstl/set b/main/stlport/systemstl/set deleted file mode 100644 index bb1b2c42b4..0000000000 --- a/main/stlport/systemstl/set +++ /dev/null @@ -1,48 +0,0 @@ -/************************************************************** - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - *************************************************************/ - -#ifndef SYSTEM_STL_SET -#define SYSTEM_STL_SET - -#if defined(HAVE_STL_INCLUDE_PATH) - namespace std { class type_info; }; - // TODO: use computed include file name - #include "utility" - #include_next <set> -#elif defined(_MSC_VER) && (_MSC_VER >= 1900) - /* A modern MSVC keeps the standard headers in <toolset>/include, and this - file shadows <set> on the include path, so the real one has to be - reached explicitly. The path below resolves against the toolset's own - include directory and against nothing else on the search path -- the - same trick the VC9 branch below uses, retargeted at the layout a modern - toolset has. #include_next, used by the branches around this one, is a - GCC extension that MSVC does not have. */ - #include <../include/set> -#elif defined(__cplusplus) && (__cplusplus >= 201103L) - #include_next <set> -#elif defined(_MSC_VER) - #include <../../VC/include/set> -#else // fall back to boost/tr1 - #include <boost/tr1/tr1/set> -#endif - -#endif - diff --git a/main/stlport/systemstl/slist b/main/stlport/systemstl/slist deleted file mode 100644 index 4ff1514f2c..0000000000 --- a/main/stlport/systemstl/slist +++ /dev/null @@ -1,79 +0,0 @@ -/************************************************************** - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - *************************************************************/ - -#ifndef SYSTEM_STL_SLIST -#define SYSTEM_STL_SLIST - -#ifdef HAVE_STL_INCLUDE_PATH - // TODO: use computed include file name - #include_next <forward_list> -#elif defined(__cplusplus) && (__cplusplus >= 201103L) - #include <forward_list> -#elif defined(_MSC_VER) - #include <../../VC/include/list> - #define STLP4_SLIST_WITH_LIST - // MSVC's list would cause a lot of expression-result-unused warnings - // unless it is compiled in iterator-debugging mode. Silence this noise - #pragma warning(disable:4555) -#else // fall back to boost/tr1 (forward_list or plain list) - #include <boost/config.hpp> - #ifndef BOOST_NO_0X_HDR_FORWARD_LIST - #include <boost/tr1/tr1/forward_list> - #else // fall back to the classic list - #include <boost/tr1/tr1/list> - #define STLP4_SLIST_WITH_LIST - #endif -#endif - - -#ifndef NO_STLPORT4_EMULATION - -#ifndef STLP4_SLIST_WITH_LIST - #define STLP4_SLIST_EMUBASE std::forward_list -#else - #define STLP4_SLIST_EMUBASE std::list -#endif - -namespace std -{ -using STLP4_SLIST_EMUBASE; - -// lame emulation of the pre-C++11 slist using the std::forward_list (or std::list) -template< typename T > -class slist : public STLP4_SLIST_EMUBASE<T> -{ -public: - typedef typename STLP4_SLIST_EMUBASE<T> _super; - typedef typename _super::iterator slist_mit; - typedef typename _super::const_iterator slist_cit; - -private: // prevent the use of methods not available in forward_list - // signatures are intentionally mismatched to catch invocations - size_t size() const; - void insert( void) const; -}; - -} - -#endif // NO_STLPORT4_EMULATION - -#endif - diff --git a/main/stlport/systemstl/vector b/main/stlport/systemstl/vector deleted file mode 100644 index f1c4cd3168..0000000000 --- a/main/stlport/systemstl/vector +++ /dev/null @@ -1,70 +0,0 @@ -/************************************************************** - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - *************************************************************/ - -#ifndef SYSTEM_STL_VECTOR -#define SYSTEM_STL_VECTOR - -#ifdef HAVE_STL_INCLUDE_PATH - // TODO: use computed include file name - #include_next <vector> -#elif defined(_MSC_VER) && (_MSC_VER >= 1900) - /* A modern MSVC keeps the standard headers in <toolset>/include, and this - file shadows <vector> on the include path, so the real one has to be reached - explicitly. The path below resolves against the toolset's own include - directory and against nothing else on the search path -- the same trick - the VC9 branch uses, retargeted at the layout a modern toolset has. - #include_next, used by the branches around this one, is a GCC extension - that MSVC does not have. */ - #include <../include/vector> -#elif defined(__cplusplus) && (__cplusplus >= 201103L) - #include_next <vector> -#elif defined(_MSC_VER) - #include <../../VC/include/vector> -#else // fall back to boost/tr1 - #include <boost/tr1/tr1/vector> -#endif - - -#ifndef NO_STLPORT4_EMULATION - -namespace std -{ - typedef vector<bool> bit_vector; -} - -// workaround some STL implementations having problems with their vector<bool>::count() specialization -inline int std_bitset_count( std::bit_vector::const_iterator it, std::bit_vector::const_iterator itEnd, bool bValue) -{ -#if 0 && defined(_LIBCPP___BIT_REFERENCE) // TODO: reenable for libc++ >= r156543/r156546/etc. - int nCount = std::count( it, itEnd, bValue); -#else - int nCount = 0; - for(; it != itEnd; ++it) - if( *it == bValue) - ++nCount; -#endif - return nCount; -} - -#endif // NO_STLPORT4_EMULATION - -#endif - diff --git a/main/stlport/systemstlguards/postextstl.h b/main/stlport/systemstlguards/postextstl.h deleted file mode 100644 index e123c7b83d..0000000000 --- a/main/stlport/systemstlguards/postextstl.h +++ /dev/null @@ -1,32 +0,0 @@ -/************************************************************** - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - *************************************************************/ - - - -#ifdef std_was_redefined_as_stlport -// put things back the way they were -# define std std_was_redefined_as_stlport -# undef _STLP_OUTERMOST_HEADER_ID -// force config to be re-read -# undef _STLP_NOTHROW_INHERENTLY -# undef _STLP_CONFIG_H -# include <stddef.h> -#endif diff --git a/main/stlport/systemstlguards/preextstl.h b/main/stlport/systemstlguards/preextstl.h deleted file mode 100644 index 9cdcb4de99..0000000000 --- a/main/stlport/systemstlguards/preextstl.h +++ /dev/null @@ -1,73 +0,0 @@ -/************************************************************** - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - *************************************************************/ - - -//1. Force inclusion of a std:: using header to ensure the stlport define -//of std as "stlport" -#include <algorithm> -#if defined(ADAPT_EXT_STL) -//2. Force inclusion of stlport headers to get their stlport:: definitions -# include <ostream> -# include <istream> -# include <fstream> -# include <iostream> -# include <sstream> -# include <vector> -# include <deque> -# include <set> -# include <list> -# include <map> -//3. Now force inclusion of native headers to get their std:: definitions -# if defined(std) -# define std_was_redefined_as_stlport std -# undef std -# define _STLP_OUTERMOST_HEADER_ID 0xdeadbeaf -# if defined(_GNUC__) -# pragma GCC visibility push(default) -# endif -# include _STLP_NATIVE_HEADER(exception_defines.h) -# include _STLP_NATIVE_HEADER(limits) -# include _STLP_NATIVE_HEADER(memory) -# include _STLP_NATIVE_HEADER(exception) -# include _STLP_NATIVE_HEADER(iosfwd) -# include _STLP_NATIVE_HEADER(algorithm) -# include _STLP_NATIVE_HEADER(string) -# include _STLP_NATIVE_HEADER(streambuf) -# include _STLP_NATIVE_HEADER(ios) -# include _STLP_NATIVE_HEADER(locale) -# include _STLP_NATIVE_HEADER(stdexcept) -# include _STLP_NATIVE_HEADER(ostream) -# include _STLP_NATIVE_HEADER(istream) -# include _STLP_NATIVE_HEADER(iostream) -# include _STLP_NATIVE_HEADER(sstream) -# include _STLP_NATIVE_HEADER(vector) -# include _STLP_NATIVE_HEADER(deque) -# include _STLP_NATIVE_HEADER(set) -# include _STLP_NATIVE_HEADER(list) -# include _STLP_NATIVE_HEADER(map) -# if defined(_GNUC__) -# pragma GCC visibility pop -# endif -# endif -#endif -//ext_std resolves to the std that external c++ libs, e.g. Graphite were built -//against regardless of whether that is stlport or system stl -namespace ext_std = std; diff --git a/main/test/prj/build.lst b/main/test/prj/build.lst index b56c5aacbd..d5fcc419d3 100644 --- a/main/test/prj/build.lst +++ b/main/test/prj/build.lst @@ -1,2 +1,2 @@ -te test : BOOST:boost cppu cppuhelper javaunohelper ridljar sal solenv stlport unoil NULL +te test : BOOST:boost cppu cppuhelper javaunohelper ridljar sal solenv unoil NULL te test\prj nmake - all test_prj NULL diff --git a/main/test/source/cpp/officeconnection.cxx b/main/test/source/cpp/officeconnection.cxx index eb6f50c2aa..a275ad9996 100644 --- a/main/test/source/cpp/officeconnection.cxx +++ b/main/test/source/cpp/officeconnection.cxx @@ -31,9 +31,7 @@ #include "com/sun/star/uno/Reference.hxx" #include "com/sun/star/uno/XComponentContext.hpp" #include "cppuhelper/bootstrap.hxx" -#include <preextstl.h> #include "gtest/gtest.h" -#include <postextstl.h> #include "osl/process.h" #include "osl/time.h" #include "sal/types.h" diff --git a/main/toolkit/src2xml/include.lst b/main/toolkit/src2xml/include.lst index ed00fcd800..42562cf495 100644 --- a/main/toolkit/src2xml/include.lst +++ b/main/toolkit/src2xml/include.lst @@ -159,7 +159,6 @@ ../../basctl/source/inc ../../basctl/unxlngi6.pro/inc ../../cpputools/unxlngi6.pro/inc -../../stlport/unxlngi6.pro/inc ../../canvas/inc ../../canvas/unxlngi6.pro/inc ../../embeddedobj/inc diff --git a/main/tools/Executable_so_checksum.mk b/main/tools/Executable_so_checksum.mk index 355d28a2a0..b2bed10c8c 100644 --- a/main/tools/Executable_so_checksum.mk +++ b/main/tools/Executable_so_checksum.mk @@ -32,7 +32,6 @@ $(eval $(call gb_Executable_set_include,so_checksum,\ $(eval $(call gb_Executable_add_defs,so_checksum,\ -D_TOOLS_STRINGLIST \ - $(STLPORT_DEBUGFLAG) \ )) $(eval $(call gb_Executable_add_linked_libs,so_checksum,\ diff --git a/main/tools/Executable_sspretty.mk b/main/tools/Executable_sspretty.mk index e11e49ef57..4a1e8770da 100644 --- a/main/tools/Executable_sspretty.mk +++ b/main/tools/Executable_sspretty.mk @@ -32,7 +32,6 @@ $(eval $(call gb_Executable_set_include,sspretty,\ $(eval $(call gb_Executable_add_defs,sspretty,\ -D_TOOLS_STRINGLIST \ - $(STLPORT_DEBUGFLAG) \ )) $(eval $(call gb_Executable_add_linked_libs,sspretty,\ diff --git a/main/vcl/inc/graphite_adaptors.hxx b/main/vcl/inc/graphite_adaptors.hxx index 8842517566..3d1d1c1b44 100644 --- a/main/vcl/inc/graphite_adaptors.hxx +++ b/main/vcl/inc/graphite_adaptors.hxx @@ -51,11 +51,9 @@ #include "vcl/dllapi.h" // Libraries -#include <preextstl.h> #include <graphite/GrClient.h> #include <graphite/Font.h> #include <graphite/ITextSource.h> -#include <postextstl.h> // Module type definitions and forward declarations. // diff --git a/main/vcl/inc/graphite_features.hxx b/main/vcl/inc/graphite_features.hxx index 4ae46cb5a7..3f4cfb6ca5 100644 --- a/main/vcl/inc/graphite_features.hxx +++ b/main/vcl/inc/graphite_features.hxx @@ -25,11 +25,9 @@ // Parse a string of features specified as ; separated pairs. // e.g. // 1001=1&2002=2&fav1=0 -#include <preextstl.h> #include <graphite/GrClient.h> #include <graphite/Font.h> #include <graphite/GrFeature.h> -#include <postextstl.h> namespace grutils { diff --git a/main/vcl/inc/graphite_layout.hxx b/main/vcl/inc/graphite_layout.hxx index 44e686a927..c6c625dbee 100644 --- a/main/vcl/inc/graphite_layout.hxx +++ b/main/vcl/inc/graphite_layout.hxx @@ -36,13 +36,11 @@ #include <vector> #include <utility> // Libraries -#include <preextstl.h> #include <graphite/GrClient.h> #include <graphite/Font.h> #include <graphite/GrConstants.h> #include <graphite/GrAppData.h> #include <graphite/SegmentAux.h> -#include <postextstl.h> // Platform #include <sallayout.hxx> #include <vcl/dllapi.h> diff --git a/main/vcl/source/glyphs/graphite_cache.cxx b/main/vcl/source/glyphs/graphite_cache.cxx index 484379831b..73e76fd56b 100644 --- a/main/vcl/source/glyphs/graphite_cache.cxx +++ b/main/vcl/source/glyphs/graphite_cache.cxx @@ -32,10 +32,8 @@ #include <tools/debug.hxx> #include <sallayout.hxx> -#include <preextstl.h> #include <graphite/GrClient.h> -#include <graphite/Segment.h> -#include <postextstl.h> +#include <graphite/Font.h> #include <rtl/ustring.hxx> #include <graphite_layout.hxx> diff --git a/main/vcl/source/glyphs/graphite_layout.cxx b/main/vcl/source/glyphs/graphite_layout.cxx index 4994994b74..57a16bb842 100644 --- a/main/vcl/source/glyphs/graphite_layout.cxx +++ b/main/vcl/source/glyphs/graphite_layout.cxx @@ -63,13 +63,11 @@ #include <unicode/uscript.h> // Graphite Libraries (must be after vcl headers on windows) -#include <preextstl.h> #include <graphite/GrClient.h> #include <graphite/Font.h> #include <graphite/ITextSource.h> #include <graphite/Segment.h> #include <graphite/SegmentPainter.h> -#include <postextstl.h> #include <graphite_layout.hxx> #include <graphite_features.hxx> diff --git a/main/vcl/source/glyphs/graphite_textsrc.hxx b/main/vcl/source/glyphs/graphite_textsrc.hxx index 2952213d78..13f1bf241e 100644 --- a/main/vcl/source/glyphs/graphite_textsrc.hxx +++ b/main/vcl/source/glyphs/graphite_textsrc.hxx @@ -47,11 +47,8 @@ #include "vcl/dllapi.h" // Libraries -#include <preextstl.h> #include <graphite/GrClient.h> #include <graphite/Font.h> -#include <graphite/ITextSource.h> -#include <postextstl.h> // Module type definitions and forward declarations. // diff --git a/main/xml2cmp/prj/build.lst b/main/xml2cmp/prj/build.lst index 83baf03b99..80a968a9f6 100644 --- a/main/xml2cmp/prj/build.lst +++ b/main/xml2cmp/prj/build.lst @@ -1,2 +1,2 @@ -xc xml2cmp : soltools stlport NULL +xc xml2cmp : soltools NULL xc xml2cmp\prj nmake - all xc_prj NULL diff --git a/main/xmlreader/prj/build.lst b/main/xmlreader/prj/build.lst index 59b71b87d0..b8bd50977b 100644 --- a/main/xmlreader/prj/build.lst +++ b/main/xmlreader/prj/build.lst @@ -1,2 +1,2 @@ -xr xmlreader : BOOST:boost cppu offapi sal stlport NULL +xr xmlreader : BOOST:boost cppu offapi sal NULL xr xmlreader\prj nmake - all xr_prj NULL
