summaryrefslogtreecommitdiff
path: root/stlport
diff options
context:
space:
mode:
Diffstat (limited to 'stlport')
-rw-r--r--stlport/STLport-4.0.patch17
-rw-r--r--stlport/STLport-4.5-0119.patch22
-rw-r--r--stlport/STLport-4.5-cxx0x.patch17
-rw-r--r--stlport/STLport-4.5.patch38
-rw-r--r--stlport/makefile.mk40
-rw-r--r--stlport/prj/build.lst2
-rw-r--r--stlport/prj/d.lst21
-rw-r--r--stlport/systemstl/functional62
-rw-r--r--stlport/systemstl/hash_map81
-rw-r--r--stlport/systemstl/hash_set52
-rw-r--r--stlport/systemstl/numeric53
-rw-r--r--stlport/systemstl/rope48
-rw-r--r--stlport/systemstl/slist45
-rw-r--r--stlport/systemstl/vector49
-rw-r--r--stlport/systemstlguards/postextstl.h1
15 files changed, 84 insertions, 464 deletions
diff --git a/stlport/STLport-4.0.patch b/stlport/STLport-4.0.patch
index 0d262b5455cf..ea21ff93105a 100644
--- a/stlport/STLport-4.0.patch
+++ b/stlport/STLport-4.0.patch
@@ -3321,6 +3321,23 @@
inline char* _FILE_I_next(const FILE& __f) { return (char*) __f._ptr; }
inline char* _FILE_I_end(const FILE& __f)
***************
+*** 92,98 ****
+ typedef unsigned char* _File_ptr_type;
+ #endif
+
+! inline int _FILE_fd(const FILE& __f) { return __f._file; }
+ inline char* _FILE_I_begin(const FILE& __f) { return (char*) __f._base; }
+ inline char* _FILE_I_next(const FILE& __f) { return (char*) __f._ptr; }
+ inline char* _FILE_I_end(const FILE& __f)
+--- 92,98 ----
+ typedef unsigned char* _File_ptr_type;
+ #endif
+
+! inline int _FILE_fd(const FILE& __f) { return fileno(__CONST_CAST(FILE*,&__f)); }
+ inline char* _FILE_I_begin(const FILE& __f) { return (char*) __f._base; }
+ inline char* _FILE_I_next(const FILE& __f) { return (char*) __f._ptr; }
+ inline char* _FILE_I_end(const FILE& __f)
+***************
*** 377,382 ****
--- 380,388 ----
# endif
diff --git a/stlport/STLport-4.5-0119.patch b/stlport/STLport-4.5-0119.patch
index db2c62b22ad3..bb17a11a6bdb 100644
--- a/stlport/STLport-4.5-0119.patch
+++ b/stlport/STLport-4.5-0119.patch
@@ -38,7 +38,7 @@
MKDIR=-mkdir
LINK_OUT=/out:
-@@ -51,7 +51,7 @@
+@@ -51,15 +51,15 @@
#
# FLAGS_COMMON =/nologo /c /W3 /GR /GX /D "WIN32" /D "_WINDOWS" /I "$(STLPORT_DIR)" $(EXTRA_COMMON_FLAGS)
@@ -47,6 +47,15 @@
FLAGS_COMMON_static = $(FLAGS_COMMON) /FD /D "_STLP_NO_FORCE_INSTANTIATE"
FLAGS_COMMON_dynamic = $(FLAGS_COMMON)
+ FLAGS_DEBUG=/Gm /Od /D_DEBUG $(EXTRA_DEBUG_FLAGS)
+ # FLAGS_DEBUG=/Zi /Gm /Od /D_DEBUG $(EXTRA_DEBUG_FLAGS)
+ FLAGS_NDEBUG=/O2 /DNDEBUG $(EXTRA_NDEBUG_FLAGS)
+
+-LDFLAGS_COMMON=/nologo /machine:I386 /debugtype:cv
++LDFLAGS_COMMON=/nologo
+ LDFLAGS_DEBUG=/debug
+ LDFLAGS_RELEASE=/opt:ref
+
--- misc/STLport-4.5-0119/stlport/config/_epilog.h Thu Sep 6 00:11:36 2001
+++ misc/build/STLport-4.5-0119/stlport/config/_epilog.h Mon Jun 2 10:32:02 2008
@@ -4,6 +4,7 @@
@@ -1326,3 +1335,14 @@
explicit _DBG_vector(size_type __n)
: _STLP_DBG_VECTOR_BASE(__n), _M_iter_list((const _Base*)this) {}
+--- misc/build/STLport-4.5-0119/stlport/stl/_threads.h
++++ misc/build/STLport-4.5-0119/stlport/stl/_threads.h
+@@ -99,7 +99,7 @@
+ # else
+ // This section serves as a replacement for windows.h header for Visual C++
+ extern "C" {
+-# if (defined(_M_MRX000) || defined(_M_ALPHA) \
++# if (defined(_M_MRX000) || defined(_M_ALPHA) || defined(_M_AMD64) \
+ || (defined(_M_PPC) && (_MSC_VER >= 1000))) && !defined(RC_INVOKED)
+ # define InterlockedIncrement _InterlockedIncrement
+ # define InterlockedDecrement _InterlockedDecrement
diff --git a/stlport/STLport-4.5-cxx0x.patch b/stlport/STLport-4.5-cxx0x.patch
new file mode 100644
index 000000000000..88d96d0df6e6
--- /dev/null
+++ b/stlport/STLport-4.5-cxx0x.patch
@@ -0,0 +1,17 @@
+--- misc/STLport-4.5/stlport/config/stl_gcc.h
++++ misc/build/STLport-4.5/stlport/config/stl_gcc.h
+@@ -239,10 +239,10 @@
+
+
+ /* strict ANSI prohibits "long long" ( gcc) */
+-# if defined ( __STRICT_ANSI__ )
+-# undef _STLP_LONG_LONG
+-// # define _STLP_STRICT_ANSI 1
+-# endif
++//# if defined ( __STRICT_ANSI__ )
++//# undef _STLP_LONG_LONG
++//// # define _STLP_STRICT_ANSI 1
++//# endif
+
+ //# if !defined (__STRICT_ANSI__) || defined (__BUILDING_STLPORT)
+ //# define _STLP_USE_TEMPLATE_EXPORT
diff --git a/stlport/STLport-4.5.patch b/stlport/STLport-4.5.patch
index 27ff2efb8008..0a0027594ad3 100644
--- a/stlport/STLport-4.5.patch
+++ b/stlport/STLport-4.5.patch
@@ -137,7 +137,7 @@
+#
+#
+LINK=ar cr
-+DYN_LINK=${CXX} -Wl,-rpath,'$$ORIGIN' ${PTHREAD_LIBS} --fexceptions -shared -o
++DYN_LINK=${CXX} -Wl,-rpath,'$$ORIGIN' ${PTHREAD_LIBS} -fexceptions -shared -o
+
+OBJEXT=o
+DYNEXT=so
@@ -163,8 +163,8 @@
+CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g -fPIC
+CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
+
-+CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
-+CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_DEBUG_RUNTIME
++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_DEBUG_RUNTIME
+
+CFLAGS_RELEASE_static = $(CFLAGS_COMMON) -O2 -fPIC
+CFLAGS_RELEASE_dynamic = $(CFLAGS_COMMON) -O2 -fPIC
@@ -172,8 +172,8 @@
+CFLAGS_DEBUG_static = $(CFLAGS_COMMON) -g -fPIC
+CFLAGS_DEBUG_dynamic = $(CFLAGS_COMMON) -g -fPIC
+
-+CFLAGS_STLDEBUG_static = $(CFLAGS_DEBUG_static) -D_STLP_DEBUG
-+CFLAGS_STLDEBUG_dynamic = $(CFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
++CFLAGS_STLDEBUG_static = $(CFLAGS_DEBUG_static) -D_DEBUG_RUNTIME
++CFLAGS_STLDEBUG_dynamic = $(CFLAGS_DEBUG_dynamic) -D_DEBUG_RUNTIME
+
+include common_percent_rules.mak
+include common_rules.mak
@@ -210,7 +210,7 @@
+#
+#
+LINK=ar crv
-+DYN_LINK=$(CXX) --fexceptions -shared -o
++DYN_LINK=$(CXX) -fexceptions -shared -o
+
+OBJEXT=o
+DYNEXT=dll
@@ -255,8 +255,8 @@
+CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
+CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -shared -g -D_DLL -D_STLP_USE_DYNAMIC_LIB -D_STLP_DLLEXPORT_NEEDS_PREDECLARATION
+
-+CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
-+CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_DEBUG_RUNTIME
++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_DEBUG_RUNTIME
+
+CFLAGS_RELEASE_static = $(CFLAGS_COMMON) -O2
+CFLAGS_RELEASE_dynamic = $(CFLAGS_COMMON) -shared -O2 -D_DLL -D_STLP_USE_DYNAMIC_LIB -D_STLP_DLLEXPORT_NEEDS_PREDECLARATION
@@ -264,8 +264,8 @@
+CFLAGS_DEBUG_static = $(CFLAGS_COMMON) -g
+CFLAGS_DEBUG_dynamic = $(CFLAGS_COMMON) -shared -g -D_DLL -D_STLP_USE_DYNAMIC_LIB -D_STLP_DLLEXPORT_NEEDS_PREDECLARATION
+
-+CFLAGS_STLDEBUG_static = $(CFLAGS_DEBUG_static) -D_STLP_DEBUG
-+CFLAGS_STLDEBUG_dynamic = $(CFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
++CFLAGS_STLDEBUG_static = $(CFLAGS_DEBUG_static) -D_DEBUG_RUNTIME
++CFLAGS_STLDEBUG_dynamic = $(CFLAGS_DEBUG_dynamic) -D_DEBUG_RUNTIME
+
+LDLIBS_RELEASE_dynamic = ${LDLIBS_COMMON_dynamic}
+LDFLAGS_RELEASE_dynamic = ${CXXFLAGS_RELEASE_dynamic} ${LDFLAGS_COMMON_dynamic} -Wl,-Map,${OUTDIR}/${RELEASE_NAME}.map -Wl,--out-implib,${OUTDIR}/${RELEASE_NAME}.a
@@ -399,8 +399,8 @@
+CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
+CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g
+
-+CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
-+CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_DEBUG_RUNTIME
++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_DEBUG_RUNTIME
+
+CFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -DSTL_OS2_BUILDING -O3 -march=pentium -mtune=pentium4
+CFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -DSTL_OS2_BUILDING -O3 -march=pentium -mtune=pentium4
@@ -408,8 +408,8 @@
+CFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
+CFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g
+
-+CFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
-+CFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
++CFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_DEBUG_RUNTIME
++CFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_DEBUG_RUNTIME
+
+include common_percent_rules.mak
+include common_rules.mak
@@ -449,7 +449,7 @@
+#
+#
+LINK=ar cr
-+DYN_LINK=$(CXX) -Wl,-rpath,'$$ORIGIN' --fexceptions -shared -o
++DYN_LINK=$(CXX) -Wl,-rpath,'$$ORIGIN' -fexceptions -shared -o
+
+OBJEXT=o
+DYNEXT=so
@@ -475,8 +475,8 @@
+CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g -fPIC
+CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
+
-+CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
-+CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_DEBUG_RUNTIME
++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_DEBUG_RUNTIME
+
+CFLAGS_RELEASE_static = $(CFLAGS_COMMON) -O2 -fPIC
+CFLAGS_RELEASE_dynamic = $(CFLAGS_COMMON) -O2 -fPIC
@@ -484,8 +484,8 @@
+CFLAGS_DEBUG_static = $(CFLAGS_COMMON) -g -fPIC
+CFLAGS_DEBUG_dynamic = $(CFLAGS_COMMON) -g -fPIC
+
-+CFLAGS_STLDEBUG_static = $(CFLAGS_DEBUG_static) -D_STLP_DEBUG
-+CFLAGS_STLDEBUG_dynamic = $(CFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
++CFLAGS_STLDEBUG_static = $(CFLAGS_DEBUG_static) -D_DEBUG_RUNTIME
++CFLAGS_STLDEBUG_dynamic = $(CFLAGS_DEBUG_dynamic) -D_DEBUG_RUNTIME
+
+include common_percent_rules.mak
+include common_rules.mak
diff --git a/stlport/makefile.mk b/stlport/makefile.mk
index 907c0935cbe8..04ab66af2910 100644
--- a/stlport/makefile.mk
+++ b/stlport/makefile.mk
@@ -34,36 +34,22 @@ TARGET=so_stlport
.INCLUDE : settings.mk
-.IF "$(USE_SYSTEM_STL)"=="YES"
+.IF "$(WITH_STLPORT)"!="YES"
-.IF "$(OS)"=="SOLARIS" && "$(COM)"!="GCC"
-# System STL when building with SunStudio is just a version of STLport
-# which comes with the compiler
all:
@echo "Nothing to do"
-.ELSE #"$(OS)"=="SOLARIS" && "$(COM)"!="GCC"
-#
-# If you choose to build without stlport, some headers will be used to bring the
-# sgi extensions into the std namespace:
-$(INCCOM)$/stlport$/functional \
-$(INCCOM)$/stlport$/hash_map \
-$(INCCOM)$/stlport$/hash_set \
-$(INCCOM)$/stlport$/numeric \
-$(INCCOM)$/stlport$/slist \
-$(INCCOM)$/stlport$/rope \
-$(INCCOM)$/stlport$/vector: systemstl$/$$(@:f)
- $(MKDIRHIER) $(@:d)
- $(COPY) $< $@
-.ENDIF #"$(OS)"=="SOLARIS" && "$(COM)"!="GCC"
-
-.ELSE # "$(USE_SYSTEM_STL)"
+
+.ELSE # "$(WITH_STLPORT)"!="YES"
# --- Files --------------------------------------------------------
.EXPORT : CC CXX
.IF "$(COMID)"=="gcc3"
TARFILE_NAME=STLport-4.5
TARFILE_MD5=18f577b374d60b3c760a3a3350407632
- PATCH_FILES=STLport-4.5.patch STLport-4.5-gcc43_warnings.patch
+ PATCH_FILES=\
+ STLport-4.5.patch \
+ STLport-4.5-gcc43_warnings.patch \
+ STLport-4.5-cxx0x.patch
.ELIF "$(GUI)"=="WNT"
.IF "$(CCNUMVER)"<="001300000000"
TARFILE_NAME=STLport-4.0
@@ -202,16 +188,6 @@ OUT2LIB= \
# --- Targets ------------------------------------------------------
-.IF "$(STLPORT4)"!="NO_STLPORT4"
-all :
- @echo " An already available installation of STLport has been chosen in the configure process."
- @echo " Therefore the version provided here does not need to be built in addition."
-.ELIF "$(OS)"=="MACOSX"
-all:
- @echo '--with-stlport=yes is not supported on Mac OS X'
- false
-.ENDIF
-
.INCLUDE : set_ext.mk
.INCLUDE : target.mk
.INCLUDE : tg_ext.mk
@@ -243,4 +219,4 @@ $(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) : $(PACKAGE_DIR)$/win32_sdk_patch
.ENDIF "$(COM)"=="GCC"
.ENDIF # "$(GUI)"=="WNT"
-.ENDIF # "$(USE_SYSTEM_STL)"
+.ENDIF # "$(WITH_STLPORT)"!="YES"
diff --git a/stlport/prj/build.lst b/stlport/prj/build.lst
index 259feec2f6bc..2a6ec0dda681 100644
--- a/stlport/prj/build.lst
+++ b/stlport/prj/build.lst
@@ -1,2 +1,2 @@
-sl stlport : SO:so_prereq solenv NULL
+sl stlport : solenv NULL
sl stlport nmake - all sl_mkout NULL
diff --git a/stlport/prj/d.lst b/stlport/prj/d.lst
index 29848a6475e3..9f9c087885dd 100644
--- a/stlport/prj/d.lst
+++ b/stlport/prj/d.lst
@@ -1,25 +1,4 @@
-mkdir: %_DEST%\inc%_EXT%\stl
-mkdir: %_DEST%\inc%_EXT%\stl\stl
-mkdir: %_DEST%\inc%_EXT%\stl\stl\debug
-mkdir: %_DEST%\inc%_EXT%\stl\stl\wrappers
-mkdir: %_DEST%\inc%_EXT%\stl\config
-mkdir: %_DEST%\inc%_EXT%\stl\using
-mkdir: %_DEST%\inc%_EXT%\stl\using\h
-mkdir: %_DEST%\inc%_EXT%\stl\wrap_std
-mkdir: %_DEST%\inc%_EXT%\stl\wrap_std\h
-..\%__SRC%\inc\*.SUNWCCH %_DEST%\inc%_EXT%\stl\*
-..\%__SRC%\inc\stlport\* %_DEST%\inc%_EXT%\stl\*
-..\%__SRC%\inc\stlport\stl\* %_DEST%\inc%_EXT%\stl\stl\*
-..\%__SRC%\inc\stlport\stl\debug\* %_DEST%\inc%_EXT%\stl\stl\debug\*
-..\%__SRC%\inc\stlport\stl\wrappers\* %_DEST%\inc%_EXT%\stl\stl\wrappers\*
-..\%__SRC%\inc\stlport\config\* %_DEST%\inc%_EXT%\stl\config\*
-..\%__SRC%\inc\stlport\using\* %_DEST%\inc%_EXT%\stl\using\*
-..\%__SRC%\inc\stlport\using\h\* %_DEST%\inc%_EXT%\stl\using\h\*
-..\%__SRC%\inc\stlport\wrap_std\* %_DEST%\inc%_EXT%\stl\wrap_std\*
-..\%__SRC%\inc\stlport\wrap_std\h\* %_DEST%\inc%_EXT%\stl\wrap_std\h\*
..\systemstlguards\*.h %_DEST%\inc%_EXT%\stl\*.h
..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so
-..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%\lib*.a
-..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib
..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
diff --git a/stlport/systemstl/functional b/stlport/systemstl/functional
deleted file mode 100644
index 59b61f95f250..000000000000
--- a/stlport/systemstl/functional
+++ /dev/null
@@ -1,62 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef SYSTEM_STL_FUNCTIONAL
-#define SYSTEM_STL_FUNCTIONAL
-
-#ifdef GCC
-# ifdef __MINGW32__
-# define _SYSTEM_STL_MAKE_HEADER(path,header) <path/header>
-# include _SYSTEM_STL_MAKE_HEADER(GXX_INCLUDE_PATH,functional)
-# else
-# include <ext/../functional>
-# endif
-# include <ext/functional>
-
-namespace std
-{
- using __gnu_cxx::project1st;
- using __gnu_cxx::project2nd;
- using __gnu_cxx::select1st;
- using __gnu_cxx::select2nd;
- using __gnu_cxx::compose1;
- using __gnu_cxx::compose2;
- using __gnu_cxx::unary_compose;
- using __gnu_cxx::binary_compose;
-# ifndef __GXX_EXPERIMENTAL_CXX0X__
- using __gnu_cxx::identity;
- using __gnu_cxx::mem_fun1;
- using __gnu_cxx::mem_fun1_ref;
-# endif
-}
-
-#else
-# error UNSUPPORTED COMPILER
-#endif
-
-#endif
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
diff --git a/stlport/systemstl/hash_map b/stlport/systemstl/hash_map
deleted file mode 100644
index 415e39f77926..000000000000
--- a/stlport/systemstl/hash_map
+++ /dev/null
@@ -1,81 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef SYSTEM_STL_HASHMAP
-#define SYSTEM_STL_HASHMAP
-
-#ifdef GCC
-
-# include <functional>
-
-# define _BACKWARD_BACKWARD_WARNING_H 1
-# include <ext/hash_map>
-# undef _BACKWARD_BACKWARD_WARNING_H
-
-namespace __gnu_cxx
-{
- template<> struct hash < std::string >
- {
- size_t operator()(const std::string & x) const
- {
- return hash< const char* >()(x.c_str());
- }
- };
-
- template<> struct hash< long long int >
- {
- size_t operator()(long long int __x) const
- {
- return __x;
- }
- };
-
- template<> struct hash< unsigned long long int >
- {
- size_t operator()(unsigned long long int __x) const
- {
- return __x;
- }
- };
-}
-
-namespace std
-{
-# ifndef __GXX_EXPERIMENTAL_CXX0X__
- using __gnu_cxx::hash;
-# endif
- using __gnu_cxx::hash_map;
- using __gnu_cxx::hash_multimap;
-}
-
-#else
-# error UNSUPPORTED COMPILER
-#endif
-
-
-#endif
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
diff --git a/stlport/systemstl/hash_set b/stlport/systemstl/hash_set
deleted file mode 100644
index 11ac7edb5a55..000000000000
--- a/stlport/systemstl/hash_set
+++ /dev/null
@@ -1,52 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef SYSTEM_STL_HASHSET
-#define SYSTEM_STL_HASHSET
-
-#ifdef GCC
-
-# include <functional>
-
-# define _BACKWARD_BACKWARD_WARNING_H 1
-# include <ext/hash_set>
-# undef _BACKWARD_BACKWARD_WARNING_H
-
-namespace std
-{
-# ifndef __GXX_EXPERIMENTAL_CXX0X__
- using __gnu_cxx::hash;
-# endif
- using __gnu_cxx::hash_set;
- using __gnu_cxx::hash_multiset;
-}
-#else
-# error UNSUPPORTED COMPILER
-#endif
-
-#endif
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
diff --git a/stlport/systemstl/numeric b/stlport/systemstl/numeric
deleted file mode 100644
index 3510ccb5bf57..000000000000
--- a/stlport/systemstl/numeric
+++ /dev/null
@@ -1,53 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef SYSTEM_STL_NUMERIC
-#define SYSTEM_STL_NUMERIC
-
-#ifdef GCC
-# include <functional>
-# ifdef __MINGW32__
-# define _SYSTEM_STL_MAKE_HEADER(path,header) <path/header>
-# include _SYSTEM_STL_MAKE_HEADER(GXX_INCLUDE_PATH,numeric)
-# else
-# include <ext/../numeric>
-# endif
-# include <ext/numeric>
-
-# ifndef __GXX_EXPERIMENTAL_CXX0X__
-namespace std
-{
- using __gnu_cxx::iota;
-}
-# endif
-
-#else
-# error UNSUPPORTED COMPILER
-#endif
-
-#endif
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
diff --git a/stlport/systemstl/rope b/stlport/systemstl/rope
deleted file mode 100644
index 71ea13a022cf..000000000000
--- a/stlport/systemstl/rope
+++ /dev/null
@@ -1,48 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef SYSTEM_STL_ROPE
-#define SYSTEM_STL_ROPE
-
-#include <functional>
-#include <numeric>
-
-#ifdef GCC
-
-#include <ext/rope>
-
-namespace std
-{
- using __gnu_cxx::rope;
-}
-#else
-#error UNSUPPORTED COMPILER
-#endif
-
-
-#endif
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
diff --git a/stlport/systemstl/slist b/stlport/systemstl/slist
deleted file mode 100644
index 6535c545e50d..000000000000
--- a/stlport/systemstl/slist
+++ /dev/null
@@ -1,45 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef SYSTEM_STL_SLIST
-#define SYSTEM_STL_SLIST
-
-#ifdef GCC
-
-#include <ext/slist>
-
-namespace std
-{
- using __gnu_cxx::slist;
-}
-#else
-#error UNSUPPORTED COMPILER
-#endif
-
-
-#endif
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
diff --git a/stlport/systemstl/vector b/stlport/systemstl/vector
deleted file mode 100644
index f15038f9eaaf..000000000000
--- a/stlport/systemstl/vector
+++ /dev/null
@@ -1,49 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef SYSTEM_STL_VECTOR
-#define SYSTEM_STL_VECTOR
-
-#ifdef GCC
-
-#ifdef __MINGW32__
-# define _SYSTEM_STL_MAKE_HEADER(path,header) <path/header>
-# include _SYSTEM_STL_MAKE_HEADER(GXX_INCLUDE_PATH,vector)
-#else
-# include <ext/../vector>
-#endif
-
-namespace std
-{
- typedef vector<bool, std::allocator<bool> > bit_vector;
-}
-
-#else
-#error UNSUPPORTED COMPILER
-#endif
-#endif
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
diff --git a/stlport/systemstlguards/postextstl.h b/stlport/systemstlguards/postextstl.h
index 81a21e25c15b..9c37a36d91b7 100644
--- a/stlport/systemstlguards/postextstl.h
+++ b/stlport/systemstlguards/postextstl.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
generated by cgit (git 2.34.1) at 2024-07-29 16:07:08 +0000