[Libreoffice-commits] core.git: Branch 'aoo/trunk' - autodoc/source basebmp/test basegfx/source basegfx/test configmgr/source configure.in connectivity/source cosv/source cpputools/source desktop/source editeng/source external_deps.lst LICENSE nss/nss.patch odk/examples odk/pack odk/util postprocess/rebase RepositoryFixes.mk sal/cppunittester sal/inc sal/rtl sal/util sax/qa scp2/inc scp2/source set_soenv.in setup_native/source slideshow/source solenv/doc solenv/gbuild solenv/inc stlport/dos_lineends.patch stlport/makefile.mk stlport/prj stlport/STLport-4.0.patch stlport/STLport-4.0-sunstudio12u1.patch stlport/STLport-4.5-0119.patch stlport/STLport-4.5-gcc43_warnings.patch stlport/STLport-4.5.patch stlport/systemstlguards stlport/win32_custom.sh stlport/win32_sdk.sh tools/Executable_mkunroll.mk tools/Executable_rscdep.mk tools/Executable_so_checksum.mk tools/Executable_sspretty.mk ure/source vcl/Library_vcl.mk
Herbert Dürr
hdu at apache.org
Mon Nov 18 10:08:18 PST 2013
LICENSE | 66
RepositoryFixes.mk | 30
autodoc/source/exes/adc_uni/makefile.mk | 4
basebmp/test/makefile.mk | 7
basegfx/source/workbench/Makefile | 2
basegfx/test/makefile.mk | 9
configmgr/source/partial.hxx | 2
configure.in | 130
connectivity/source/commontools/dbtools.cxx | 6
cosv/source/unittest/makefile.mk | 21
cpputools/source/unoexe/makefile.mk | 2
desktop/source/pagein/makefile.mk | 8
editeng/source/uno/unoipset.cxx | 2
external_deps.lst | 18
nss/nss.patch | 4
odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile | 4
odk/examples/DevelopersGuide/Components/CppComponent/Makefile | 8
odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile | 4
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/unix/Makefile | 2
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile | 4
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile | 4
odk/examples/DevelopersGuide/ProfUNO/CppBinding/Makefile | 4
odk/examples/DevelopersGuide/ProfUNO/Lifetime/Makefile | 4
odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/Makefile | 4
odk/pack/copying/makefile.mk | 7
odk/util/odk_rules.pmk | 4
postprocess/rebase/coffbase.txt | 2
sal/cppunittester/makefile.mk | 7
sal/inc/rtl/string.hxx | 4
sal/rtl/source/bootstrap.cxx | 2
sal/util/makefile.mk | 14
sax/qa/cppunit/makefile.mk | 7
scp2/inc/macros.inc | 5
scp2/source/ooo/makefile.mk | 4
scp2/source/ooo/module_hidden_ooo.scp | 2
scp2/source/ooo/ure.scp | 41
scp2/source/winexplorerext/makefile.mk | 4
set_soenv.in | 57
setup_native/source/win32/customactions/languagepacks/makefile.mk | 8
setup_native/source/win32/customactions/patch/makefile.mk | 8
setup_native/source/win32/customactions/quickstarter/makefile.mk | 8
setup_native/source/win32/customactions/rebase/makefile.mk | 8
setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk | 7
setup_native/source/win32/customactions/reg4msdoc/makefile.mk | 7
setup_native/source/win32/customactions/reg64/makefile.mk | 4
setup_native/source/win32/customactions/regactivex/makefile.mk | 5
setup_native/source/win32/customactions/relnotes/makefile.mk | 7
setup_native/source/win32/customactions/shellextensions/makefile.mk | 8
setup_native/source/win32/customactions/tools/makefile.mk | 8
slideshow/source/engine/animationfactory.cxx | 4
solenv/doc/gbuild/solenv/gbuild/gbuild.mk | 1
solenv/gbuild/gbuild.mk | 6
solenv/gbuild/platform/macosx.mk | 12
solenv/inc/unxlng.mk | 21
solenv/inc/unxmacx.mk | 11
solenv/inc/wntmsci11.mk | 2
stlport/STLport-4.0-sunstudio12u1.patch | 21
stlport/STLport-4.0.patch | 4926 ----------
stlport/STLport-4.5-0119.patch | 1328 --
stlport/STLport-4.5-gcc43_warnings.patch | 113
stlport/STLport-4.5.patch | 964 -
stlport/dos_lineends.patch | 60
stlport/makefile.mk | 164
stlport/prj/d.lst | 21
stlport/systemstlguards/postextstl.h | 32
stlport/systemstlguards/preextstl.h | 73
stlport/win32_custom.sh | 29
stlport/win32_sdk.sh | 29
tools/Executable_mkunroll.mk | 8
tools/Executable_rscdep.mk | 8
tools/Executable_so_checksum.mk | 7
tools/Executable_sspretty.mk | 7
ure/source/uretest/Makefile | 2
ure/source/uretest/Makefile.pln | 8
vcl/Library_vcl.mk | 10
75 files changed, 67 insertions(+), 8387 deletions(-)
New commits:
commit a7bc1f5a489cc599919e4f0cad5e9e72fb3a7506
Author: Herbert Dürr <hdu at apache.org>
Date: Mon Nov 18 16:26:19 2013 +0000
#i122362# remove stlport4-build support
but keep the --without-stlport configure option for now
it is the new default anyway
diff --git a/LICENSE b/LICENSE
index 7823118..8773de7 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1835,72 +1835,6 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
____
-For STLport - build in main/stlport/:
-
-Boris Fomitchev grants Licensee a non-exclusive, non-transferable,
-royalty-free license to use STLport and its documentation without fee.
-
-By downloading, using, or copying STLport or any portion thereof,
-Licensee agrees to abide by the intellectual property laws and all other
-applicable laws of the United States of America, and to all of the terms
-and conditions of this Agreement.
-
-Licensee shall maintain the following copyright and permission notices on
-STLport sources and its documentation unchanged:
-
-Copyright 1999, 2000 Boris Fomitchev
-
-This material is provided "as is", with absolutely no warranty expressed
-or implied. Any use is at your own risk. Permission to use or copy this
-software for any purpose is hereby granted without fee, provided the
-above notices are retained on all copies. Permission to modify the code
-and to distribute modified code is granted, provided the above notices
-are retained, and a notice that the code was modified is included with
-the above copyright notice.
-
-The Licensee may distribute binaries compiled with STLport (whether
-original or modified) without any royalties or restrictions.
-
-The Licensee may distribute original or modified STLport sources,
-provided that:
-
- - The conditions indicated in the above permission notice are met;
-
- - The following copyright notices are retained when present, and
- conditions provided in accompanying permission notices are met:
-
- Copyright 1994 Hewlett-Packard Company
-
- Permission to use, copy, modify, distribute and sell this software and
- its documentation for any purpose is hereby granted without fee, provided
- that the above copyright notice appear in all copies and that both that
- copyright notice and this permission notice appear in supporting
- documentation. Hewlett-Packard Company makes no representations about
- the suitability of this software for any purpose. It is provided "as is"
- without express or implied warranty.
-
- Copyright 1996,97 Silicon Graphics Computer Systems, Inc.
-
- Permission to use, copy, modify, distribute and sell this software and
- its documentation for any purpose is hereby granted without fee, provided
- that the above copyright notice appear in all copies and that both that
- copyright notice and this permission notice appear in supporting
- documentation. Silicon Graphics makes no representations about
- the suitability of this software for any purpose. It is provided "as is"
- without express or implied warranty.
-
- Copyright 1997 Moscow Center for SPARC Technology.
-
- Permission to use, copy, modify, distribute and sell this software and its
- documentation for any purpose is hereby granted without fee, provided that
- the above copyright notice appear in all copies and that both that
- copyright notice and this permission notice appear in supporting
- documentation. Moscow Center for SPARC Technology makes no representations
- about the suitability of this software for any purpose. It is provided
- "as is" without express or implied warranty.
-
-____
-
For C preprocessor - built in main/ucpp/:
- BSD license
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 4d8ec80..eaee8c7 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -34,10 +34,8 @@ gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salh
gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
-ifeq ($(USE_SYSTEM_STL),YES)
gb_Library_FILENAMES := $(patsubst stl:%,stl:libstdc++.so,$(gb_Library_FILENAMES))
gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
-endif
endif
@@ -49,10 +47,12 @@ gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_
gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
-ifeq ($(USE_SYSTEM_STL),YES)
+ifneq ($(MACOSX_DEPLOYMENT_TARGET),10.4) # default to use libc++
+gb_Library_FILENAMES := $(patsubst stl:%,stl:libc++.dylib,$(gb_Library_FILENAMES))
+else # use libstdc++ instead on ancient MacOSX targets
gb_Library_FILENAMES := $(patsubst stl:%,stl:libstdc++.dylib,$(gb_Library_FILENAMES))
-gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
endif
+gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
endif
@@ -75,15 +75,7 @@ gb_Library_FILENAMES := $(patsubst xslt:ixslt%,xslt:libxslt.dll$(gb_Library_IARC
gb_Library_FILENAMES := $(patsubst rdf:irdf%,rdf:librdf.dll$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_FILENAMES))
-ifeq ($(USE_SYSTEM_STL),YES)
gb_Library_FILENAMES := $(patsubst stl:istl%,stl:msvcprt%,$(gb_Library_FILENAMES))
-else
-ifeq ($(gb_PRODUCT),$(true))
-gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71%,$(gb_Library_FILENAMES))
-else
-gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71_stldebug%,$(gb_Library_FILENAMES))
-endif
-endif
gb_Library_NOILIBFILENAMES:=\
icule \
@@ -108,10 +100,8 @@ gb_Library_DLLFILENAMES := $(patsubst jvmaccess:jvmaccess%,jvmaccess:jvmaccess$(
gb_Library_DLLFILENAMES := $(patsubst ucbhelper:ucbhelper%,ucbhelper:ucbhelper4%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES))
-ifeq ($(USE_SYSTEM_STL),YES)
gb_Library_FILENAMES := $(patsubst stl:%,stl:$(gb_Library_IARCSYSPRE)stdc++_s$(gb_Library_IARCSYSPRE),$(gb_Library_FILENAMES))
gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
-endif
else
gb_Library_FILENAMES := $(patsubst comphelper:icomphelper%,comphelper:icomphelp%,$(gb_Library_FILENAMES))
@@ -131,15 +121,7 @@ gb_Library_FILENAMES := $(patsubst rdf:irdf%,rdf:librdf%,$(gb_Library_FILENAMES)
gb_Library_FILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_FILENAMES))
gb_StaticLibrary_FILENAMES := $(patsubst graphite:graphite%,graphite:graphite_dll%,$(gb_StaticLibrary_FILENAMES))
-ifeq ($(USE_SYSTEM_STL),YES)
gb_Library_FILENAMES := $(patsubst stl:istl%,stl:msvcprt%,$(gb_Library_FILENAMES))
-else
-ifeq ($(gb_PRODUCT),$(true))
-gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71%,$(gb_Library_FILENAMES))
-else
-gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71_stldebug%,$(gb_Library_FILENAMES))
-endif
-endif
gb_Library_NOILIBFILENAMES:=\
advapi32 \
@@ -248,18 +230,14 @@ gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salh
gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
-ifeq ($(USE_SYSTEM_STL),YES)
gb_Library_FILENAMES := $(patsubst stl:%,stl:libstdc++.so,$(gb_Library_FILENAMES))
gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
-endif
endif
# we do not require a known rule for these, when using system libs
-ifeq ($(USE_SYSTEM_STL),YES)
gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
-endif
ifeq ($(SYSTEM_LIBXML),YES)
gb_Library_TARGETS := $(filter-out xml2,$(gb_Library_TARGETS))
diff --git a/autodoc/source/exes/adc_uni/makefile.mk b/autodoc/source/exes/adc_uni/makefile.mk
index 5dd0bfb..06a507a 100644
--- a/autodoc/source/exes/adc_uni/makefile.mk
+++ b/autodoc/source/exes/adc_uni/makefile.mk
@@ -72,11 +72,11 @@ APP1OBJS= $(OBJ)$/main.obj
APP1RPATH=SDK
.IF "$(GUI)"=="WNT"
-APP1STDLIBS= $(LIBSTLPORT) $(COSVLIB) $(UDMLIB)
+APP1STDLIBS= $(COSVLIB) $(UDMLIB)
.ELSE
.IF "$(OS)"=="MACOSX"
# See <http://porting.openoffice.org/servlets/ReadMsg?list=mac&msgNo=6911>:
-APP1STDLIBS= $(LIBSTLPORT) -Wl,-all_load -ludm -lcosv
+APP1STDLIBS= -Wl,-all_load -ludm -lcosv
.ELSE
APP1STDLIBS= -lcosv -ludm
.ENDIF
diff --git a/basebmp/test/makefile.mk b/basebmp/test/makefile.mk
index ec94b28..08bcb54 100644
--- a/basebmp/test/makefile.mk
+++ b/basebmp/test/makefile.mk
@@ -63,13 +63,6 @@ CDEFS+=-xalias_level=compatible
.ENDIF
.ENDIF
-#building with stlport, but cppunit was not built with stlport
-.IF "$(USE_SYSTEM_STL)"!="YES"
-.IF "$(SYSTEM_CPPUNIT)"=="YES"
-CFLAGSCXX+=-DADAPT_EXT_STL
-.ENDIF
-.ENDIF
-
CFLAGSCXX += $(CPPUNIT_CFLAGS)
# --- Common ----------------------------------------------------------
diff --git a/basegfx/source/workbench/Makefile b/basegfx/source/workbench/Makefile
index e39f15e..34f1edb 100644
--- a/basegfx/source/workbench/Makefile
+++ b/basegfx/source/workbench/Makefile
@@ -63,7 +63,7 @@
#test : bezierclip.cxx convexhull.cxx
# g++ -Wall -g \
# -I. -I. -I../inc -I./inc -I./unx/inc -I./unxlngi4/inc -I. -I/develop4/update/SRX644/unxlngi4/inc.m4/stl -I/develop4/update/SRX644/unxlngi4/inc.m4/external -I/develop4/update/SRX644/unxlngi4/inc.m4 -I/develop4/update/SRX644/src.m4/solenv/unxlngi4/inc -I/net/grande/develop6/update/dev/gcc_3.0.1_linux_libc2.11_turbolinux/include -I/develop4/update/SRX644/src.m4/solenv/inc -I/develop4/update/SRX644/unxlngi4/inc.m4/stl -I/net/grande.germany/develop6/update/dev/gcc_3.0.1_linux_libc2.11_turbolinux/redhat60/usr/include -I/net/grande.germany/develop6/update/dev/gcc_3.0.1_linux_libc2.11_turbolinux/redhat60/usr/include/X11 -I/develop4/update/SRX644/src.m4/res -I/net/grande/develop6/update/dev/Linux_JDK_1.4.0/include -I/net/grande/develop6/update/dev/Linux_JDK_1.4.0/include/linux -I. -I./res -I. \
-# -include preinclude.h -D_USE_NAMESPACE -DGLIBC=2 -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400 -D_STLP_DEBUG \
+# -include preinclude.h -D_USE_NAMESPACE -DGLIBC=2 -D_USE_NAMESPACE=1 -D_STLP_DEBUG \
# bezierclip.cxx convexhull.cxx -o bezierclip
prog : bezierclip.cxx convexhull.cxx
diff --git a/basegfx/test/makefile.mk b/basegfx/test/makefile.mk
index 402b820..7eb234a 100644
--- a/basegfx/test/makefile.mk
+++ b/basegfx/test/makefile.mk
@@ -37,14 +37,7 @@ ENABLE_EXCEPTIONS=TRUE
@all:
@echo "cppunit disabled. nothing do do."
-.ELSE # "$(WITH_CPPUNIT)" != "YES"
-
-#building with stlport, but cppunit was not built with stlport
-.IF "$(USE_SYSTEM_STL)"!="YES"
-.IF "$(SYSTEM_CPPUNIT)"=="YES"
-CFLAGSCXX+=-DADAPT_EXT_STL
-.ENDIF
-.ENDIF
+.ELSE
CFLAGSCXX += $(CPPUNIT_CFLAGS)
diff --git a/configmgr/source/partial.hxx b/configmgr/source/partial.hxx
index 6cdb517..1d2c4df 100644
--- a/configmgr/source/partial.hxx
+++ b/configmgr/source/partial.hxx
@@ -50,7 +50,7 @@ public:
private:
struct Node {
- typedef boost::unordered_map< rtl::OUString, Node > Children;
+ typedef boost::unordered_map< rtl::OUString, Node, rtl::OUStringHash > Children;
Node(): startInclude(false) {}
void clear() { startInclude=false; children.clear(); }
diff --git a/configure.in b/configure.in
index 2fca76f..3df0746 100644
--- a/configure.in
+++ b/configure.in
@@ -643,17 +643,8 @@ AC_ARG_WITH(system-redland,
[ --with-system-redland Use redland library already on system
],,)
AC_ARG_WITH(stlport,
-[ --with-stlport The location that STLport is installed in. The STL
- header files are assumed to be in
- stlport-home/stlport and the STLPort library in
- stlport-home/lib.
-
- Usage: --with-stlport=<absolute path to stlport home>
-
- Warning: disabling using --without-stlport or
- enabling using --with-stlport on a platform that
- defaults to the opposite will break ABI compatibility
-], WITH_STLPORT=$withval , WITH_STLPORT=auto)
+[ --with-stlport Only building --without-stlport is supported.
+], WITH_STLPORT=$withval , WITH_STLPORT=NO)
AC_ARG_WITH(jdk-home,
[ --with-jdk-home if you have installed JDK 1.3 or later on your system
please supply the path here.
@@ -2417,7 +2408,7 @@ dnl ===================================================================
dnl Set the gcc/gxx include directories
dnl ===================================================================
# Removed the special FreeBSD treatment. The problem was that with_gxx_include_path
-# often contains an i386 which is expanded as a macro. Solved in stlport.
+# often contains an i386 which is expanded as a macro.
if test "$GXX" = "yes"; then
AC_MSG_CHECKING([for g++ include path])
if test -z "$with_gxx_include_path"; then
@@ -2704,115 +2695,12 @@ dnl Checks for what the default STL should be
dnl ===================================================================
AC_MSG_CHECKING([what the default STL should be])
DEFAULT_TO_STLPORT="no"
- if test "$_os" = "Linux"; then
- case "$build_cpu" in
- i?86)
- case "$build_os" in k*bsd*-gnu*)
- DEFAULT_TO_STLPORT="no"
- ;;
- *)
- DEFAULT_TO_STLPORT="yes"
- ;;
- esac
- ;;
- *)
- DEFAULT_TO_STLPORT="no"
- ;;
- esac
- elif test "$_os" = "SunOS"; then
- DEFAULT_TO_STLPORT="yes"
- elif test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes"; then
- DEFAULT_TO_STLPORT="yes"
- elif test "$_os" = "OS2"; then
- DEFAULT_TO_STLPORT="yes"
- elif test "$_os" = "FreeBSD"; then
- DEFAULT_TO_STLPORT="yes"
- fi
- if test "$DEFAULT_TO_STLPORT" = "yes"; then
- AC_MSG_RESULT([stlport])
- else
- AC_MSG_RESULT([system])
- fi
- if test "$WITH_STLPORT" = "auto"; then
- WITH_STLPORT=$DEFAULT_TO_STLPORT
- fi
-
-dnl ===================================================================
-dnl Checks for STLPORT
-dnl ===================================================================
- AC_MSG_CHECKING([for STL providing headers])
- STLPORT4=""
- USE_SYSTEM_STL=""
- if test "$WITH_STLPORT" = "yes"; then
- AC_MSG_RESULT([using internal stlport.])
- if test "$DEFAULT_TO_STLPORT" != "yes"; then
- AC_MSG_WARN([using stlport. Warning, breaks your ABI compatibility!])
- echo "using stlport. Warning: breaks your ABI compatibility!" >>warn
- fi
- elif test "$WITH_STLPORT" = "no"; then
- AC_MSG_RESULT([using system STL])
- USE_SYSTEM_STL="YES"
- if test "$DEFAULT_TO_STLPORT" != "no"; then
- AC_MSG_WARN([using system STL. Warning, breaks your ABI compatibility!])
- echo "using system STL. Warning: breaks your ABI compatibility!" >>warn
- fi
- else
- STLPORT4=$WITH_STLPORT
- if test "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes"; then
- AC_TRY_CPP($STLPORT4/stlport/hash_map, AC_MSG_RESULT([checked.]), AC_MSG_ERROR([STLport headers not found.]))
- else
- dnl AC_TRY_CPP doesn't work for MSVC because C++ preprocessor is not found by autoconf.
- if test -f "$STLPORT4/stlport/hash_map"; then
- AC_MSG_RESULT([checked.])
- else
- AC_MSG_ERROR([STLport headers not found.])
- fi
- fi
- if test "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes"; then
- AC_MSG_CHECKING([for STLport libraries])
- if test "$_os" = "SunOS"; then
- if test -f "$STLPORT4/lib/libstlport_sunpro.so"; then
- AC_MSG_RESULT([checked])
- elif test -f "$STLPORT4/lib/libstlport.so"; then
- AC_MSG_RESULT([checked])
- STLPORT_VER=500
- else
- AC_MSG_ERROR([STLport libraries not found])
- fi
- elif test "$_os" = "Darwin"; then
- if test -f "$STLPORT4/lib/libstlport_gcc.dylib"; then
- AC_MSG_RESULT([checked])
- elif test -f "$STLPORT4/lib/libstlport.dylib"; then
- AC_MSG_RESULT([checked])
- STLPORT_VER=500
- else
- AC_MSG_ERROR([STLport libraries not found])
- fi
- else
- if test -f "$STLPORT4/lib/libstlport_gcc.so"; then
- AC_MSG_RESULT([checked])
- elif test -f "$STLPORT4/lib/libstlport.so"; then
- AC_MSG_RESULT([checked])
- STLPORT_VER=500
- else
- AC_MSG_ERROR([STLport libraries not found])
- fi
- fi
- fi
- if test "$DEFAULT_TO_STLPORT" != "yes"; then
- AC_MSG_WARN([using stlport. Warning: breaks your ABI compatibility!])
- echo "using stlport. Warning: breaks your ABI compatibility!" >>warn
- fi
- fi
-
-if test -z "$STLPORT4"; then
- STLPORT4="NO_STLPORT4"
-fi
-if test -z "$STLPORT_VER"; then
- STLPORT_VER=400
+if test "$WITH_STLPORT" != "no"; then
+ AC_MSG_ERROR([Option --with-stlport is no longer available.])
+else
+ USE_SYSTEM_STL="YES"
fi
-AC_SUBST(STLPORT4)
-AC_SUBST(STLPORT_VER)
+
AC_SUBST(USE_SYSTEM_STL)
dnl ===================================================================
@@ -2883,6 +2771,7 @@ fi
dnl ===================================================================
dnl system stl sanity tests
dnl ===================================================================
+if false ; then # TODO: update TR1 compliant STLs
if test "$USE_SYSTEM_STL" = "YES"; then
AC_MSG_CHECKING([system stl sanity])
AC_LANG_PUSH([C++])
@@ -2958,6 +2847,7 @@ _ACEOF
AC_LANG_POP([C++])
fi
+fi # endof TODO: update TR1 compliant STLs
AC_SUBST(HAVE_GCC_VISIBILITY_FEATURE)
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index 076d764..72b0ace 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -1766,14 +1766,14 @@ namespace
{
if ( m_aSet.empty() )
return m_xSource->hasElements();
- return ::std::count(m_aSet.begin(),m_aSet.end(),false) != 0;
+ return (::std::find(m_aSet.begin(),m_aSet.end(),false) != m_aSet.end());
}
// ::com::sun::star::container::XIndexAccess
virtual sal_Int32 SAL_CALL getCount( ) throw(RuntimeException)
{
if ( m_aSet.empty() )
return m_xSource->getCount();
- return ::std::count(m_aSet.begin(),m_aSet.end(),false);
+ return std_bitset_count(m_aSet.begin(),m_aSet.end(),false);
}
virtual Any SAL_CALL getByIndex( sal_Int32 Index ) throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException)
{
@@ -1818,7 +1818,7 @@ void askForParameters(const Reference< XSingleSelectQueryComposer >& _xComposer,
Reference<XNameAccess> xParamsAsNames(xParamsAsIndicies, UNO_QUERY);
sal_Int32 nParamCount = xParamsAsIndicies.is() ? xParamsAsIndicies->getCount() : 0;
::std::bit_vector aNewParameterSet( _aParametersSet );
- if ( nParamCount || ::std::count(aNewParameterSet.begin(),aNewParameterSet.end(),true) != nParamCount )
+ if ( nParamCount || std_bitset_count(aNewParameterSet.begin(),aNewParameterSet.end(),true) != nParamCount )
{
static const ::rtl::OUString PROPERTY_NAME(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME));
aNewParameterSet.resize(nParamCount ,false);
diff --git a/cosv/source/unittest/makefile.mk b/cosv/source/unittest/makefile.mk
index f56b6ed..f336540 100644
--- a/cosv/source/unittest/makefile.mk
+++ b/cosv/source/unittest/makefile.mk
@@ -19,8 +19,6 @@
#
#**************************************************************
-
-
PRJ=..$/..
PRJNAME=cosv
@@ -37,40 +35,21 @@ PRJINC=$(PRJ)$/source
.INCLUDE : $(PRJ)$/source$/fullcpp.mk
-
-
-
# --- Files --------------------------------------------------------
OBJFILES= \
$(OBJ)$/file_ut.obj \
$(OBJ)$/simplestring_ut.obj
-
-
-
APP1TARGET= $(TARGET)
APP1STACK= 1000000
APP1OBJS= $(OBJ)$/ut_main.obj
-.IF "$(GUI)"=="WNT"
-APP1STDLIBS= $(LIBSTLPORT)
-.ELSE
-.IF "$(OS)"=="MACOSX"
-APP1STDLIBS= $(LIBSTLPORT)
-.ENDIF
-.ENDIF
-
-
APP1LIBS= $(LB)$/$(TARGET).lib $(LB)$/cosv.lib
-
APP1DEPN= $(LB)$/$(TARGET).lib $(LB)$/cosv.lib
-
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
-
-
diff --git a/cpputools/source/unoexe/makefile.mk b/cpputools/source/unoexe/makefile.mk
index bb2ab81..e2f33f0 100644
--- a/cpputools/source/unoexe/makefile.mk
+++ b/cpputools/source/unoexe/makefile.mk
@@ -70,7 +70,7 @@ APP1RPATH=UREBIN
# Include all relevant (see ure/source/README) dynamic libraries, so that C++
# UNO components running in the uno executable have a defined environment
-# (stlport, unxlngi6 libstdc++.so.6, and wntmsci10 uwinapi.dll are already
+# (unxlngi6 libstdc++.so.6, and wntmsci10 uwinapi.dll are already
# included via APP1STDLIB, unxlngi6 libgcc_s.so.1 and wntmsci10 msvcr71.dll and
# msvcp71.dll are magic---TODO):
APP1STDLIBS= \
diff --git a/desktop/source/pagein/makefile.mk b/desktop/source/pagein/makefile.mk
index e7fe19f..fdf2988 100644
--- a/desktop/source/pagein/makefile.mk
+++ b/desktop/source/pagein/makefile.mk
@@ -137,14 +137,6 @@ $(MISC)$/$(TARGET)-common : makefile.mk
@-echo $(URELIBPATH)$/bootstrap$(UNODLLPOST) >> $@
@-echo $(URELIBPATH)$/$(DLLPRE)reg$(UDKDLLPOST) >> $@
@-echo $(URELIBPATH)$/$(DLLPRE)store$(UDKDLLPOST) >> $@
-.IF "$(USE_SYSTEM_STL)"!="YES"
-.IF "$(COMNAME)" == "gcc2" || "$(COMNAME)" == "gcc3"
- @-echo $(URELIBPATH)$/$(DLLPRE)stlport_gcc$(DLLPOST) >> $@
-.ENDIF # gcc
-.IF "$(COMNAME)" == "sunpro5"
- @-echo $(URELIBPATH)$/$(DLLPRE)stlport_sunpro$(DLLPOST) >> $@
-.ENDIF # sunpro5
-.ENDIF # SYSTEM_STL
@-echo $(URELIBPATH)$/$(DLLPRE)uno_cppuhelper$(COMID)$(UDKDLLPOST) >> $@
@-echo $(URELIBPATH)$/$(DLLPRE)uno_cppu$(UDKDLLPOST) >> $@
@-echo $(URELIBPATH)$/$(DLLPRE)uno_sal$(UDKDLLPOST) >> $@
diff --git a/editeng/source/uno/unoipset.cxx b/editeng/source/uno/unoipset.cxx
index 358351c..5e78407 100644
--- a/editeng/source/uno/unoipset.cxx
+++ b/editeng/source/uno/unoipset.cxx
@@ -27,8 +27,6 @@
#include <svl/eitem.hxx>
#include <tools/list.hxx>
-#include <hash_map>
-#include <vector>
#include <svl/itemprop.hxx>
#include <editeng/unoipset.hxx>
diff --git a/external_deps.lst b/external_deps.lst
index 717cf9d..2aaafd4 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -168,24 +168,6 @@ if ( true )
URL1 = http://archive.apache.org/dist/apr/$(name)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
-if ( USE_SYSTEM_STL != YES )
- MD5 = c441926f3a552ed3e5b274b62e86af16
- name = STLport-4.0.tar.gz
- # This seems to be the original host, but the MD5 sum does not match.
- # URL1 = http://sourceforge.net/projects/stlport/files/STLport%20archive/STLport%204/STLport-4.0.tar.gz/download
- URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
-
-if ( USE_SYSTEM_STL != YES )
- MD5 = 18f577b374d60b3c760a3a3350407632
- name = STLport-4.5.tar.gz
- URL1 = http://sourceforge.net/projects/stlport/files/STLport%20archive/STLport%204/STLport-4.5.tar.gz/download
- URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
-
-if ( USE_SYSTEM_STL != YES )
- MD5 = 7376930b0d3f3d77a685d94c4a3acda8
- name = STLport-4.5-0119.tar.gz
- URL1 = $(OOO_EXTRAS)$(MD5)-$(name)
-
if (SYSTEM_LIBXML != YES)
MD5 = 8127a65e8c3b08856093099b52599c86
name = libxml2-2.7.8.tar.gz
diff --git a/nss/nss.patch b/nss/nss.patch
old mode 100644
new mode 100755
index 604ffd8..d27de91
--- a/nss/nss.patch
+++ b/nss/nss.patch
@@ -5,8 +5,8 @@
$(RC) $(RCFLAGS) $(filter-out -U%,$(DEFINES)) $(INCLUDES:-I%=--include-dir %) -o $@ $<
else
- $(RC) $(RCFLAGS) $(filter-out -U%,$(DEFINES)) $(INCLUDES) -Fo$@ $<
-+ #We remove stl from the paths to avoid that rc.exe finds the stlport of
-+ #OOo. stlport includes the system stl which will fail. By removing it,
++ #We remove stl from the paths to avoid that rc.exe finds the stl wrapper
++ #of AOO. stlport includes the system stl which will fail. By removing it,
+ #rc will use the stl from the system if the path is in the INCLUDE
+ #variable.
+ INCLUDE="$(subst /stl,,$(INCLUDE))" $(RC) $(RCFLAGS) $(filter-out -U%,$(DEFINES)) $(INCLUDES) -Fo$@ $<
diff --git a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile
index a05090d..06d9a14 100644
--- a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile
+++ b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile
@@ -71,14 +71,14 @@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES)
-$(MKDIR) $(subst /,$(PS),$(OUT_COMP_GEN))
$(LINK) $(COMP_LINK_FLAGS) /OUT:$@ \
/MAP:$(OUT_COMP_GEN)/$(subst $(SHAREDLIB_EXT),map,$(@F)) $(SLOFILES) \
- $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) msvcrt.lib kernel32.lib
+ $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) msvcrt.lib kernel32.lib
$(LINK_MANIFEST)
else
#$(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) $(COMP_MAPFILE)
$(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES)
-$(MKDIR) $(subst /,$(PS),$(@D))
$(LINK) $(COMP_LINK_FLAGS) $(LINK_LIBS) -o $@ $(SLOFILES) \
- $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB)
+ $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB)
ifeq "$(OS)" "MACOSX"
$(INSTALL_NAME_URELIBS) $@
endif
diff --git a/odk/examples/DevelopersGuide/Components/CppComponent/Makefile b/odk/examples/DevelopersGuide/Components/CppComponent/Makefile
index d489cbe..cc55d87 100644
--- a/odk/examples/DevelopersGuide/Components/CppComponent/Makefile
+++ b/odk/examples/DevelopersGuide/Components/CppComponent/Makefile
@@ -104,14 +104,14 @@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES)
-$(MKDIR) $(subst /,$(PS),$(SAMPLE_GEN_OUT))
$(LINK) $(COMP_LINK_FLAGS) /OUT:$@ \
/MAP:$(SAMPLE_GEN_OUT)/$(subst $(SHAREDLIB_EXT),map,$(@F)) $(SLOFILES) \
- $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) msvcrt.lib kernel32.lib
+ $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) msvcrt.lib kernel32.lib
$(LINK_MANIFEST)
else
#$(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) $(COMP_MAPFILE)
$(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES)
-$(MKDIR) $(subst /,$(PS),$(@D)) && $(DEL) $(subst \\,\,$(subst /,$(PS),$@))
$(LINK) $(COMP_LINK_FLAGS) $(LINK_LIBS) -o $@ $(SLOFILES) \
- $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB)
+ $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB)
ifeq "$(OS)" "MACOSX"
$(INSTALL_NAME_URELIBS) $@
endif
@@ -176,10 +176,10 @@ $(OUT_BIN)/_$(APP1_NAME)$(EXE_EXT) : $(SAMPLE_OBJ_OUT)/$(APP1_NAME).$(OBJ_EXT)
-$(MKDIR) $(subst /,$(PS),$(SAMPLE_GEN_OUT))
ifeq "$(OS)" "WIN"
$(LINK) $(EXE_LINK_FLAGS) /OUT:$@ /MAP:$(SAMPLE_GEN_OUT)/$(basename $(@F)).map \
- $< $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STLPORTLIB)
+ $< $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB)
else
$(LINK) $(EXE_LINK_FLAGS) $(LINK_LIBS) -o $@ $< \
- $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STLPORTLIB) $(STDC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALHELPERDYLIB) $(SALDYLIB)
+ $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STDC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALHELPERDYLIB) $(SALDYLIB)
ifeq "$(OS)" "MACOSX"
$(INSTALL_NAME_URELIBS_BIN) $@
endif
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile b/odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile
index b876f65..0ce3328 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile
@@ -79,13 +79,13 @@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES)
-$(MKDIR) $(subst /,$(PS),$(OUT_COMP_MISC))
$(LINK) $(COMP_LINK_FLAGS) /OUT:$@ \
/MAP:$(OUT_COMP_MISC)/$(COMP_NAME).map $(SLOFILES) \
- $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) msvcrt.lib kernel32.lib
+ $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) msvcrt.lib kernel32.lib
$(LINK_MANIFEST)
else
$(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES)
-$(MKDIR) $(subst /,$(PS),$(@D))
$(LINK) $(COMP_LINK_FLAGS) $(LINK_LIBS) -o $@ $(SLOFILES) \
- $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB)
+ $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB)
ifeq "$(OS)" "MACOSX"
$(INSTALL_NAME_URELIBS) $@
endif
diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/unix/Makefile b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/unix/Makefile
index 5793d2b..abd7827 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/unix/Makefile
+++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/unix/Makefile
@@ -52,7 +52,7 @@ $(OUT_SHL_SLO)/%.$(OBJ_EXT) : %.c
$(SHAREDLIB_OUT)/$(SHAREDLIB_PRE)$(SHL_NAME).$(SHAREDLIB_EXT) : $(SLOFILES)
-$(MKDIR) $(subst /,$(PS),$(@D))
$(LINK) $(LIBRARY_LINK_FLAGS) $(LINK_LIBS) $(LINK_JAVA_LIBS) -o $@ $< \
- -ljawt $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) $(STDC++LIB)
+ -ljawt $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STDC++LIB)
.PHONY: clean
clean :
diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile
index bb16d0f..f77c8c9 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile
+++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile
@@ -73,13 +73,13 @@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES)
-$(MKDIR) $(subst /,$(PS),$(OUT_COMP_GEN))
$(LINK) $(COMP_LINK_FLAGS) /OUT:$@ \
/MAP:$(OUT_COMP_GEN)/$(subst $(SHAREDLIB_EXT),map,$(@F)) $(SLOFILES) \
- $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) msvcrt.lib kernel32.lib
+ $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) msvcrt.lib kernel32.lib
$(LINK_MANIFEST)
else
$(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES)
-$(MKDIR) $(subst /,$(PS),$(@D))
$(LINK) $(COMP_LINK_FLAGS) $(LINK_LIBS) -o $@ $(SLOFILES) \
- $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB)
+ $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB)
ifeq "$(OS)" "MACOSX"
$(INSTALL_NAME_URELIBS) $@
endif
diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile
index 94e4db5..95b1412 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile
+++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile
@@ -70,13 +70,13 @@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES)
-$(MKDIR) $(subst /,$(PS),$(OUT_COMP_GEN))
$(LINK) $(COMP_LINK_FLAGS) /OUT:$@ \
/MAP:$(OUT_COMP_GEN)/$(subst $(SHAREDLIB_EXT),map,$(@F)) $(SLOFILES) \
- $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) msvcrt.lib kernel32.lib
+ $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) msvcrt.lib kernel32.lib
$(LINK_MANIFEST)
else
$(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES)
-$(MKDIR) $(subst /,$(PS),$(@D))
$(LINK) $(COMP_LINK_FLAGS) $(LINK_LIBS) -o $@ $(SLOFILES) \
- $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB)
+ $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB)
ifeq "$(OS)" "MACOSX"
$(INSTALL_NAME_URELIBS) $@
endif
diff --git a/odk/examples/DevelopersGuide/ProfUNO/CppBinding/Makefile b/odk/examples/DevelopersGuide/ProfUNO/CppBinding/Makefile
old mode 100644
new mode 100755
index e4195a2..21d6e49
--- a/odk/examples/DevelopersGuide/ProfUNO/CppBinding/Makefile
+++ b/odk/examples/DevelopersGuide/ProfUNO/CppBinding/Makefile
@@ -62,10 +62,10 @@ $(OUT_BIN)/%$(EXE_EXT) : $(SAMPLE_OBJ_OUT)/%.$(OBJ_EXT)
-$(MKDIR) $(subst /,$(PS),$(SAMPLE_GEN_OUT))
ifeq "$(OS)" "WIN"
$(LINK) $(EXE_LINK_FLAGS) /OUT:$@ /MAP:$(SAMPLE_GEN_OUT)/$(subst $(EXE_EXT),.map,$(@F)) \
- $< $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STLPORTLIB)
+ $< $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB)
else
$(LINK) $(EXE_LINK_FLAGS) $(LINK_LIBS) -o $@ $< \
- $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STLPORTLIB) $(STDC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALHELPERDYLIB) $(SALDYLIB)
+ $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STDC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALHELPERDYLIB) $(SALDYLIB)
ifeq "$(OS)" "MACOSX"
$(INSTALL_NAME_URELIBS_BIN) $@
endif
diff --git a/odk/examples/DevelopersGuide/ProfUNO/Lifetime/Makefile b/odk/examples/DevelopersGuide/ProfUNO/Lifetime/Makefile
index 6fc72c5..aad42a2 100644
--- a/odk/examples/DevelopersGuide/ProfUNO/Lifetime/Makefile
+++ b/odk/examples/DevelopersGuide/ProfUNO/Lifetime/Makefile
@@ -68,10 +68,10 @@ $(OUT_BIN)/$(COMPONENT_NAME)$(EXE_EXT) : $(OBJFILES)
-$(MKDIR) $(subst /,$(PS),$(OUT_COMP_GEN))
ifeq "$(OS)" "WIN"
$(LINK) $(EXE_LINK_FLAGS) /OUT:$@ /MAP:$(OUT_COMP_GEN)/$(subst $(EXE_EXT),.map,$(@F)) \
- $(OBJFILES) $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STLPORTLIB)
+ $(OBJFILES) $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB)
else
$(LINK) $(EXE_LINK_FLAGS) $(LINK_LIBS) -o $@ $(OBJFILES) \
- $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STLPORTLIB) $(STDC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALHELPERDYLIB) $(SALDYLIB)
+ $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STDC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALHELPERDYLIB) $(SALDYLIB)
ifeq "$(OS)" "MACOSX"
$(INSTALL_NAME_URELIBS_BIN) $@
endif
diff --git a/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/Makefile b/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/Makefile
index 6c590b8..a817c9b 100644
--- a/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/Makefile
+++ b/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/Makefile
@@ -55,10 +55,10 @@ $(OUT_BIN)/_$(APP_NAME)$(EXE_EXT) : $(OUT_APP_OBJ)/$(APP_NAME).$(OBJ_EXT)
-$(MKDIR) $(subst /,$(PS),$(OUT_APP_GEN))
ifeq "$(OS)" "WIN"
$(LINK) $(EXE_LINK_FLAGS) /OUT:$@ /MAP:$(OUT_APP_GEN)/$(basename $(@F)).map \
- $< $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STLPORTLIB)
+ $< $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB)
else
$(LINK) $(EXE_LINK_FLAGS) $(LINK_LIBS) -o $@ $< \
- $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STLPORTLIB) $(STDC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALHELPERDYLIB) $(SALDYLIB)
+ $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STDC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALHELPERDYLIB) $(SALDYLIB)
ifeq "$(OS)" "MACOSX"
$(INSTALL_NAME_URELIBS_BIN) $@
endif
diff --git a/odk/pack/copying/makefile.mk b/odk/pack/copying/makefile.mk
index dc01417..a64a174 100644
--- a/odk/pack/copying/makefile.mk
+++ b/odk/pack/copying/makefile.mk
@@ -82,13 +82,6 @@ LIBLIST = \
$(DESTDIRLIB)/irmcxt.lib \
$(DESTDIRLIB)/ipurpenvhelper3MSC.lib
-.IF "$(COMEX)"=="8"
- LIBLIST += $(DESTDIRLIB)/stlport_vc7.lib
-.ELIF "$(COMEX)"=="10" || "$(COMEX)"=="11" || "$(COMEX)"=="12"
- LIBLIST += $(DESTDIRLIB)/stlport_vc71.lib
-.ELSE
- LIBLIST += $(DESTDIRLIB)/stlport_vc6.lib
-.ENDIF
.ENDIF
.IF "$(OS)"=="LINUX"
diff --git a/odk/util/odk_rules.pmk b/odk/util/odk_rules.pmk
index 69ce304..d04a9f7 100644
--- a/odk/util/odk_rules.pmk
+++ b/odk/util/odk_rules.pmk
@@ -84,11 +84,7 @@ $(DESTDIR)/cfgWin.js : $(PRJ)/cfgWin.js
$(DESTDIRSETTINGS)/%.mk : $(PRJ)/settings/%.mk
@@-rm -f $@
-.IF "$(COMEX)"=="7"
- $(MY_TEXTCOPY) $< | $(SED) -e 's/stlport_vc7/stlport_vc6/' $@
-.ELSE
$(MY_TEXTCOPY) $< $@
-.ENDIF
$(DESTDIRXML)/module-description.dtd : $(XMLOUT)/module-description.dtd
@@-rm -f $@
diff --git a/postprocess/rebase/coffbase.txt b/postprocess/rebase/coffbase.txt
index ce0fdfc..b198d77 100644
--- a/postprocess/rebase/coffbase.txt
+++ b/postprocess/rebase/coffbase.txt
@@ -246,8 +246,6 @@ spellmi.dll 0x000000005e5e0000 0x00030000
splmi.dll 0x000000005e5a0000 0x00030000
srtrs1.dll 0x000000005e570000 0x00020000
ssleay32.dll 0x000000005e520000 0x00040000
-stlport_vc7145.dll 0x000000005e470000 0x000a0000
-stlport_vc71_stldebug45.dll 0x000000005e340000 0x00120000
stocservices.uno.dll 0x000000005e310000 0x00020000
store3.dll 0x000000005e2e0000 0x00020000
streams.uno.dll 0x000000005e2b0000 0x00020000
diff --git a/sal/cppunittester/makefile.mk b/sal/cppunittester/makefile.mk
index acf01d1..3e03321 100644
--- a/sal/cppunittester/makefile.mk
+++ b/sal/cppunittester/makefile.mk
@@ -35,13 +35,6 @@ all:
.ELSE
-#building with stlport, but cppunit was not built with stlport
-.IF "$(USE_SYSTEM_STL)"!="YES"
-.IF "$(SYSTEM_CPPUNIT)"=="YES"
-CFLAGSCXX+=-DADAPT_EXT_STL
-.ENDIF
-.ENDIF
-
CFLAGSCXX += $(CPPUNIT_CFLAGS)
OBJFILES = $(APP1OBJS)
diff --git a/sal/inc/rtl/string.hxx b/sal/inc/rtl/string.hxx
index ebf3e30..32a2392 100644
--- a/sal/inc/rtl/string.hxx
+++ b/sal/inc/rtl/string.hxx
@@ -419,7 +419,7 @@ public:
@return a hash code value for this object.
- @see rtl::OStringHash for convenient use of STLPort's hash_map
+ @see rtl::OStringHash for convenient use of hash_map / unordered_map
*/
sal_Int32 hashCode() const SAL_THROW(())
{
@@ -911,7 +911,7 @@ public:
/** A helper to use OStrings with hash maps.
Instances of this class are unary function objects that can be used as
- hash function arguments to STLPort's hash_map and similar constructs.
+ hash function arguments to unordered_map, hash_map and similar constructs.
*/
struct OStringHash
{
diff --git a/sal/rtl/source/bootstrap.cxx b/sal/rtl/source/bootstrap.cxx
index 13f417e..2c93d98 100644
--- a/sal/rtl/source/bootstrap.cxx
+++ b/sal/rtl/source/bootstrap.cxx
@@ -605,8 +605,6 @@ void Bootstrap_Impl::expandValue(
namespace {
struct bootstrap_map {
- // map<> may be preferred here, but hash_map<> is implemented fully inline,
- // thus there is no need to link against the stlport:
typedef std::hash_map<
rtl::OUString, Bootstrap_Impl *,
rtl::OUStringHash, std::equal_to< rtl::OUString >,
diff --git a/sal/util/makefile.mk b/sal/util/makefile.mk
index 3e30be1..bb16018 100644
--- a/sal/util/makefile.mk
+++ b/sal/util/makefile.mk
@@ -125,20 +125,6 @@ SHL1STDLIBS+= -z allextract -staticlib=Crun -z defaultextract
SHL1STDLIBS=-lmmap -lpthread
.ENDIF # OS2
-# If we compile sal with STLport checking iterators
-# we need to link against the STLport
-.IF "$(USE_STLP_DEBUG)" != ""
-SHL1STDLIBS+=$(LIBSTLPORT)
-.ENDIF
-
-#The irony that using the system STL instead of
-#stlport requires that we link libsal with the
-#LIBSTLPORT alias which is not required when using
-#stlport is not lost on me
-.IF "$(USE_SYSTEM_STL)"=="YES"
-SHL1STDLIBS+=$(LIBSTLPORT)
-.ENDIF
-
.IF "$(OS)"=="MACOSX"
SHL1STDLIBS+=-framework CoreFoundation -framework Carbon
.ENDIF
diff --git a/sax/qa/cppunit/makefile.mk b/sax/qa/cppunit/makefile.mk
index 69770cb..711dc6f 100644
--- a/sax/qa/cppunit/makefile.mk
+++ b/sax/qa/cppunit/makefile.mk
@@ -38,13 +38,6 @@ ENABLE_EXCEPTIONS=TRUE
.ELSE # "$(WITH_CPPUNIT)" != "YES"
-#building with stlport, but cppunit was not built with stlport
-.IF "$(USE_SYSTEM_STL)"!="YES"
-.IF "$(SYSTEM_CPPUNIT)"=="YES"
-CFLAGSCXX+=-DADAPT_EXT_STL
-.ENDIF
-.ENDIF
-
CFLAGSCXX += $(CPPUNIT_CFLAGS)
DLLPRE = # no leading "lib" on .so files
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index e1b3cfa..467dee5 100644
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -541,11 +541,6 @@ End
#define SCP2_URE_DL_UNO_VER(n, v) n v ".dll"
#define SCP2_URE_DL_UNO_COMID_VER(n, v) n v STRING(COMID) ".dll"
#define SCP2_URE_SHARE_DIR gid_Dir_Common_Ure
-#if defined _STLP_DEBUG
-#define SCP2_STDLP_DEBUG "d"
-#else
-#define SCP2_STDLP_DEBUG ""
-#endif
#else
#define SCP2_URE_DL_DIR gid_Dir_Ure_Lib
#define SCP2_URE_DL_NORMAL(n) "lib" n STRING(UNXSUFFIX)
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index dc076f1..857012a 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -116,10 +116,6 @@ SCPDEFS+=-DSYSTEM_LIBXSLT
SCPDEFS+=-DLIBXSLT_MAJOR=$(LIBXSLT_MAJOR)
.ENDIF
-.IF "$(USE_SYSTEM_STL)" == "YES" || "$(STLPORT4)" != "NO_STLPORT4"
-SCPDEFS+=-DUSE_SYSTEM_STL
-.ENDIF
-
.IF "$(WITH_MYSPELL_DICTS)" == "NO"
SCPDEFS+=-DWITHOUT_MYSPELL_DICTS
.ENDIF
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 3f8d2ea..a296f32 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -417,8 +417,6 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Wininetbe,
gid_File_Lib_Macbe,
gid_File_Lib_Gdiplus,
- gid_File_Lib_Stlport_Vc6,
- gid_File_Lib_Stlport_Vc7,
gid_File_Tabaction,
gid_File_Lib_Fps_Office,
gid_File_Lib_Fpicker,
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index c5f9b9d..5263b27 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -823,46 +823,6 @@ File gid_File_Dl_Libxml2
End
#endif
-#if !defined USE_SYSTEM_STL || \
- (defined USE_SYSTEM_STL && defined _C52 && defined IS_LP64)
-File gid_File_Dl_Stlport
- TXT_FILE_BODY;
- Dir = SCP2_URE_DL_DIR;
-#if defined _gcc3 && defined WNT
-#if defined _STLP_DEBUG
- Name = SCP2_URE_DL_NORMAL("libstlport_gcc_stldebug");
-#else
- Name = SCP2_URE_DL_NORMAL("libstlport_gcc");
-#endif
-#elif defined _gcc3
-#if defined _STLP_DEBUG
- Name = SCP2_URE_DL_NORMAL("stlport_gcc_stldebug");
-#else
- Name = SCP2_URE_DL_NORMAL("stlport_gcc");
-#endif
-#elif defined SOLARIS
-#if defined IS_LP64
- Name = SCP2_URE_DL_VER("stlport", "1");
-#else
-#if defined _STLP_DEBUG
- Name = SCP2_URE_DL_NORMAL("stlport_sunpro_debug");
-#else
- Name = SCP2_URE_DL_NORMAL("stlport_sunpro");
-#endif
-#endif
-#elif defined WNT && (defined(M1310) || defined(M1400) || defined(M1500) )
-#if defined _STLP_DEBUG
- Name = SCP2_URE_DL_NORMAL("stlport_vc71_stldebug45");
-#else
- Name = SCP2_URE_DL_NORMAL("stlport_vc7145");
-#endif
-#else
-#error "stlport dynamic library: unsupported platform"
-#endif
- Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-End
-#endif
-
#if defined _gcc3 && !(defined NETBSD \
|| defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT) || defined(OS2))
File gid_File_Dl_GccS
@@ -1072,7 +1032,6 @@ Module gid_Module_Root_Ure_Hidden
gid_File_Dl_Textoutstream,
gid_File_Dl_Uuresolver,
gid_File_Dl_Libxml2,
- gid_File_Dl_Stlport,
gid_File_Dl_GccS,
gid_File_Dl_Stdcpp,
gid_File_Lib_Mingw_GccS_Ure,
diff --git a/scp2/source/winexplorerext/makefile.mk b/scp2/source/winexplorerext/makefile.mk
index 0e591b4..f179e35 100644
--- a/scp2/source/winexplorerext/makefile.mk
+++ b/scp2/source/winexplorerext/makefile.mk
@@ -46,10 +46,6 @@ PARFILES= \
registryitem_winexplorerext.par
.ENDIF
-.IF "$(USE_SYSTEM_STL)" == "YES" || "$(STLPORT4)" != "NO_STLPORT4"
-SCPDEFS+=-DUSE_SYSTEM_STL
-.ENDIF
-
ULFFILES= \
module_winexplorerext.ulf
diff --git a/set_soenv.in b/set_soenv.in
index 76363e4..dffde97 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -94,8 +94,7 @@ my ( $BIG_SVX, $COM, $ARCH, $CPU, $CPUNAME, $CVER, $GLIBC, $GUI, $GUIBASE,
my ( $USR, $ETC, $BIN, $LIB, $LIB64, $INC, $INCLUDE, $DEV, $OPT, $LOCAL, $SOLENV, $SOLVER, $CONFIG,
$USR_BIN, $USR_LIB, $USR_LOCAL, $USR_CCS, $JAVA_BIN, $JAVA_LIB, $JAVA_INCLUDE,
$SOLARENVINC, $USR_DT, $USR_OPENWIN, $XLIB, $XINC,
- $CYGWIN_PATH, $language, $dict, $ASM_PATH, $NSIS_PATH, $ps_STLPORT_LIB, $L_STLPORT_LIB,
- $STLPORT_stlport, $STLPORT_inc_stlport, $PERL_PATH );
+ $CYGWIN_PATH, $language, $dict, $ASM_PATH, $NSIS_PATH, $PERL_PATH );
# Environment variables.
my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK, $JAVAFLAGS, $OOO_SHELL,
@@ -109,7 +108,7 @@ my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK, $JAVAFLAGS, $OOO_SHELL,
$COMP_ENV, $ILIB, $JAVAHOME, $PSDK_HOME, $DIRECTXSDK_LIB, $USE_NEW_SDK, $FRAME_HOME,
$USE_DIRECTX5, $ATL_LIB, $ATL_LIB_X64, $HAVE_ATLTHUNK, $ATL_INCLUDE, $MFC_LIB, $MFC_INCLUDE, $TMPDIR,
$COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
- $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $MOZILLABUILD,
+ $WIN_GNUCOPY, $WIN_TOUCH, $MOZILLABUILD,
$PROEXT, $TARFILE_LOCATION,
$ENABLE_HUNSPELL, $ENABLE_HYPHEN,
$SYSTEM_PYTHON, $EPM_FLAGS);
@@ -145,10 +144,8 @@ $I = " -I"; # include search path
$L = " -L"; # library search path
$D = " -D"; # define search path
$empty = ""; # used as argument
-$no_stl = "NO_STLPORT4"; # possible argument
$warnfile = "warn"; # logfile configure warnings.
$Warning = ""; # container for warning messages
-$STLPORT4 = '@STLPORT4@'; # Location of STLport4
$SYSTEM_PYTHON = '@SYSTEM_PYTHON@';
$JDK = '@JDK@';
$JAVAFLAGS = '@JAVAFLAGS@';
@@ -857,11 +854,6 @@ else
$OOO_SHELL = '@SHELLPATH@'."\/bash";
}
-if ( '@STLPORT4@' eq $no_stl )
-{
- $STLPORT4 = "$no_stl";
-}
-
# ml.exe assembler path for Windows users.
if ($platform =~ m/cygwin/)
{ $ASM_PATH = PathFormat('@ASM_HOME@');
@@ -909,19 +901,6 @@ if ($GUI eq "OS2")
$outfile_bat =~ s/set$/cmd/i;
}
-if ($STLPORT4 ne $no_stl) {
- $ps_STLPORT_LIB = $ps.'$STLPORT4'.$LIB64;
- $L_STLPORT_LIB = $L.'$STLPORT4'.$LIB64;
- $STLPORT_stlport = $I.'$STLPORT4'.$ds.'stlport';
- $STLPORT_inc_stlport = $I.'$STLPORT4'.$ds.'include'.$ds.'stlport';
-} else {
- $ps_STLPORT_LIB = "";
- $L_STLPORT_LIB = "";
- $STLPORT_stlport = $I.$SRC_ROOT.$SOLVER.$ds.$UPD.$ds.$INPATH.$INC.$ds."stl";
- $STLPORT_inc_stlport = "";
-}
-
-
# Windows NT only variables
if ($platform =~ m/cygwin/)
{
@@ -1061,10 +1040,6 @@ if ($platform =~ m/cygwin|os2/)
$ILIB = $cur_dir;
- if ($STLPORT4 ne $no_stl) {
- $ILIB .= $wps.$STLPORT4.$LIB64;
- }
-
# Mingw is different
if ( $COM eq "MSC" )
{ $ILIB .= $wps.$SOLARVER.$ds.$INPATH.$LIB.
@@ -1219,7 +1194,6 @@ elsif ($platform =~ m/cygwin/)
if ( $PATH !~ /(?:[:]|\A)(?:$tmppath)(?:[:]|\Z)/ ) {
$PATH .= $ps.$tmppath;
}
- $PATH .= $ps_STLPORT_LIB;
# nsis path for Windows users.
$NSIS_PATH = PathFormat('@NSIS_PATH@');
$tmppath = CygFormat($NSIS_PATH);
@@ -1334,7 +1308,6 @@ if ($platform =~ m/solaris/)
$L.$JRELIBDIR.
$L.$JRETOOLKITDIR.
$L.$JRETHREADDIR.
- $L_STLPORT_LIB.
$L.$XLIB;
}
elsif ($platform =~ m/linux|netbasd|osf1|aix|freebsd/)
@@ -1346,18 +1319,15 @@ elsif ($platform =~ m/linux|netbasd|osf1|aix|freebsd/)
$L.$JRELIBDIR.
$L.$JRETOOLKITDIR.
$L.$JRETHREADDIR.
- $L_STLPORT_LIB.
$L.$XLIB;
}
elsif ($platform =~ m/cygwin|os2/)
{ $SOLARLIB = $L.'$SOLARVER'.$ds.'$INPATH'.$LIB.
$L.$par_dir.$LIB.
- $L_STLPORT_LIB.
$L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB;
}
elsif ($platform =~ m/darwin/)
{ $SOLARLIB = $L.'$SOLARVER'.$ds.'$INPATH'.$LIB.
- $L_STLPORT_LIB.
$L.$USR_LIB;
# [ed] 6/15/02 Add in X11 libraries onto the library path
if ($GUIBASE eq "unx") {
@@ -1378,11 +1348,9 @@ $SOLARINC = $I.$cur_dir.
if ($platform =~ m/solaris|linux|osf1|freebsd|netbsd/)
{
-$SOLARINC .= $STLPORT_stlport;
if ($platform =~ m/linux|freebsd|netbsd/)
{
# This simply adds an include path, so even cases that break the FHS work
-$SOLARINC .= $STLPORT_inc_stlport;
}
if ($platform =~ m/solaris/ && ! $CC =~ "gcc")
{
@@ -1396,7 +1364,6 @@ if ($platform =~ m/solaris/)
if ($platform =~ m/linux/)
{
# This simply adds an include path, so even cases that break the FHS work
- $SOLARINC .= $STLPORT_inc_stlport;
}
@@ -1436,8 +1403,7 @@ if ($platform =~ m/linux/)
}
}
elsif ($platform =~ m/cygwin/)
-{ $SOLARINC .= $STLPORT_stlport.
- $I.'$JAVA_HOME'.$ds."include".$ds."win32".
+{ $SOLARINC .= $I.'$JAVA_HOME'.$ds."include".$ds."win32".
$I.'$JAVA_HOME'.$ds."include";
# Mingw is different
if ( $COM eq "MSC" )
@@ -1477,14 +1443,9 @@ elsif ($platform =~ m/cygwin/)
}
}
elsif ($platform =~ m/darwin/)
-{ $SOLARINC .= $STLPORT_stlport.
- $I.$FRAMEWORKSHOME.$ds."JavaVM.framework".$ds."Versions".$ds."Current".$ds."Headers".
- $I.$FRAMEWORKSHOME.$ds."JavaVM.framework".$ds."Headers";
- # [ed] 6/15/02 Add in X11 headers as appropriate for the build
- if ($GUIBASE eq "unx") {
- $SOLARINC .= $I.$XINC.
- $I.$XINC.$ds."freetype2";
- }
+{
+ my $STLINC .= $I."/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/c++/v1/";
+ $SOLARINC .= $STLINC . $I.$FRAMEWORKSHOME.$ds."JavaVM.framework".$ds."Headers";
}
else
{ AddWarning( "set_soenv", "$platform not configured for system dependant include dir" );
@@ -1550,8 +1511,6 @@ ToFile( "ANT_HOME", PathFormat("@ANT_HOME@"), "e" );
ToFile( "ANT_LIB", PathFormat("@ANT_LIB@"), "e" );
ToFile( "ANT", PathFormat("@ANT@"), "e" );
ToFile( "JDKLIB", $JAVA_LIB, "e" );
-ToFile( "STLPORT4", $STLPORT4, "e" );
-ToFile( "STLPORT_VER", "@STLPORT_VER@", "e" );
ToFile( "ASM_PATH", $ASM_PATH, "e" );
ToFile( "BUILD_SOSL", $BUILD_SOSL, "e" );
ToFile( "FRAMEWORKSHOME", $FRAMEWORKSHOME, "e" );
@@ -1716,10 +1675,10 @@ if ( $platform =~ m/darwin/ )
{
# MAXOSX_DEPLOYMENT_TARGET : The minimum version required to run the build,
# build can assume functions/libraries of that version to be available
-# unless you want to do runtime checks for 10.5 api, you also want to use the 10.4 sdk
+# unless you want to do runtime checks for 10.5 api, you also want to use the 10.7 sdk
# (safer/easier than dealing with the MAC_OS_X_VERSION_MAX_ALLOWED macro)
# http://developer.apple.com/technotes/tn2002/tn2064.html
- ToFile( "MACOSX_DEPLOYMENT_TARGET", "10.4", "e" );
+ ToFile( "MACOSX_DEPLOYMENT_TARGET", "10.7", "e" );
}
#
diff --git a/setup_native/source/win32/customactions/languagepacks/makefile.mk b/setup_native/source/win32/customactions/languagepacks/makefile.mk
index b9f45d8..ce5fcec 100644
--- a/setup_native/source/win32/customactions/languagepacks/makefile.mk
+++ b/setup_native/source/win32/customactions/languagepacks/makefile.mk
@@ -35,10 +35,6 @@ USE_DEFFILE=TRUE
.INCLUDE : settings.mk
-.IF "$(USE_SYSTEM_STL)" != "YES"
-CFLAGS+=-D_STLP_USE_STATIC_LIB
-.ENDIF
-
#Disable precompiled header
CDEFS+=-Dnot_used_define_to_disable_pch
@@ -61,10 +57,6 @@ STDSHL+= \
$(MSILIB) \
$(SHELL32LIB)
-.IF "$(USE_SYSTEM_STL)" != "YES"
-STDSHL+=$(LIBSTLPORTST)
-.ENDIF
-
SHL1OBJS = $(SLOFILES) \
$(SLO)$/seterror.obj
diff --git a/setup_native/source/win32/customactions/patch/makefile.mk b/setup_native/source/win32/customactions/patch/makefile.mk
index 9df5928..3a10402 100644
--- a/setup_native/source/win32/customactions/patch/makefile.mk
+++ b/setup_native/source/win32/customactions/patch/makefile.mk
@@ -34,10 +34,6 @@ USE_DEFFILE=TRUE
.INCLUDE : settings.mk
-.IF "$(USE_SYSTEM_STL)" != "YES"
-CFLAGS+=-D_STLP_USE_STATIC_LIB
-.ENDIF
-
#Disable precompiled header
CDEFS+=-Dnot_used_define_to_disable_pch
@@ -59,10 +55,6 @@ STDSHL += \
$(MSILIB)\
$(SHELL32LIB)
-.IF "$(USE_SYSTEM_STL)" != "YES"
-STDSHL += $(LIBSTLPORTST)
-.ENDIF
-
.IF "$(COM)"=="GCC"
STDSHL+= \
$(KERNEL32LIB)\
diff --git a/setup_native/source/win32/customactions/quickstarter/makefile.mk b/setup_native/source/win32/customactions/quickstarter/makefile.mk
index 0175b33..134e006 100644
--- a/setup_native/source/win32/customactions/quickstarter/makefile.mk
+++ b/setup_native/source/win32/customactions/quickstarter/makefile.mk
@@ -37,10 +37,6 @@ USE_DEFFILE=TRUE
.INCLUDE : settings.mk
-.IF "$(USE_SYSTEM_STL)" != "YES"
-CFLAGS+=-D_STLP_USE_STATIC_LIB
-.ENDIF
-
UWINAPILIB=
# --- Files --------------------------------------------------------
@@ -56,10 +52,6 @@ STDSHL += \
$(SHELL32LIB)\
$(MSILIB)
-.IF "$(USE_SYSTEM_STL)" != "YES"
-STDSHL += $(LIBSTLPORTST)
-.ENDIF
-
.IF "$(COM)"=="GCC"
STDSHL+= \
$(KERNEL32LIB)\
diff --git a/setup_native/source/win32/customactions/rebase/makefile.mk b/setup_native/source/win32/customactions/rebase/makefile.mk
index 5e3cc1c..4b871f8 100644
--- a/setup_native/source/win32/customactions/rebase/makefile.mk
+++ b/setup_native/source/win32/customactions/rebase/makefile.mk
@@ -36,10 +36,6 @@ MINGW_NODLL=YES
.INCLUDE : settings.mk
-.IF "$(USE_SYSTEM_STL)" != "YES"
-CFLAGS+=-D_STLP_USE_STATIC_LIB
-.ENDIF
-
UWINAPILIB=
# --- Files --------------------------------------------------------
@@ -55,10 +51,6 @@ STDSHL += \
$(SHELL32LIB)\
$(MSILIB)
-.IF "$(USE_SYSTEM_STL)" != "YES"
-STDSHL += $(LIBSTLPORTST)
-.ENDIF
-
.IF "$(COM)"=="GCC"
STDSHL+= \
$(KERNEL32LIB)\
diff --git a/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk b/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk
index c00b8aa..08fd4a5 100644
--- a/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk
+++ b/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk
@@ -35,9 +35,6 @@ USE_DEFFILE=TRUE
.INCLUDE : settings.mk
CFLAGS+=-DUNICODE -D_UNICODE
-.IF "$(USE_SYSTEM_STL)" != "YES"
-CFLAGS+=-D_STLP_USE_STATIC_LIB
-.ENDIF
# --- Files --------------------------------------------------------
@@ -58,10 +55,6 @@ SHL1STDLIBS= $(KERNEL32LIB)\
$(MSILIB)\
$(SHLWAPILIB)
-.IF "$(USE_SYSTEM_STL)" != "YES"
-SHL1STDLIBS+=$(LIBSTLPORTST)
-.ENDIF
-
SHL1LIBS = $(SLB)$/$(TARGET).lib
SHL1TARGET = $(TARGET)
diff --git a/setup_native/source/win32/customactions/reg4msdoc/makefile.mk b/setup_native/source/win32/customactions/reg4msdoc/makefile.mk
index 0b2cac5..0c8a18b 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/makefile.mk
+++ b/setup_native/source/win32/customactions/reg4msdoc/makefile.mk
@@ -36,9 +36,6 @@ MINGW_NODLL=YES
.INCLUDE : settings.mk
CFLAGS+=-DUNICODE -D_UNICODE
-.IF "$(USE_SYSTEM_STL)" != "YES"
-CFLAGS+=-D_STLP_USE_STATIC_LIB
-.ENDIF
# --- Files --------------------------------------------------------
@@ -67,10 +64,6 @@ SHL1STDLIBS= $(KERNEL32LIB)\
$(MSILIB)\
$(SHLWAPILIB)
-.IF "$(USE_SYSTEM_STL)" != "YES"
-SHL1STDLIBS+=$(LIBSTLPORTST)
-.ENDIF
-
SHL1LIBS = $(SLB)$/$(TARGET).lib
SHL1TARGET = $(TARGET)
diff --git a/setup_native/source/win32/customactions/reg64/makefile.mk b/setup_native/source/win32/customactions/reg64/makefile.mk
index 071c0f8..93182d5 100644
--- a/setup_native/source/win32/customactions/reg64/makefile.mk
+++ b/setup_native/source/win32/customactions/reg64/makefile.mk
@@ -35,10 +35,6 @@ EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
.INCLUDE : settings.mk
-.IF "$(USE_SYSTEM_STL)" != "YES"
-CFLAGS+=-D_STLP_USE_STATIC_LIB
-.ENDIF
-
#Disable precompiled header
CDEFS+=-Dnot_used_define_to_disable_pch
diff --git a/setup_native/source/win32/customactions/regactivex/makefile.mk b/setup_native/source/win32/customactions/regactivex/makefile.mk
index 00f6ed4..90b872a 100644
--- a/setup_native/source/win32/customactions/regactivex/makefile.mk
+++ b/setup_native/source/win32/customactions/regactivex/makefile.mk
@@ -38,11 +38,6 @@ USE_DEFFILE=TRUE
.IF "$(GUI)"=="WNT"
-.IF "$(USE_SYSTEM_STL)" != "YES" && "$(PRODUCT)" = ""
-CDEFS+=-D_DEBUG
-.ENDIF
-
-
UWINAPILIB=
SLOFILES = $(SLO)$/regactivex.obj
diff --git a/setup_native/source/win32/customactions/relnotes/makefile.mk b/setup_native/source/win32/customactions/relnotes/makefile.mk
index 9484cc6..0f77f4c 100644
--- a/setup_native/source/win32/customactions/relnotes/makefile.mk
+++ b/setup_native/source/win32/customactions/relnotes/makefile.mk
@@ -36,9 +36,6 @@ USE_DEFFILE=TRUE
.INCLUDE : settings.mk
CDEFS+=-DUNICODE
-.IF "$(USE_SYSTEM_STL)" != "YES"
-CDEFS+=-D_STLP_USE_STATIC_LIB
-.ENDIF
UWINAPILIB=
@@ -57,10 +54,6 @@ STDSHL+= \
$(SHELL32LIB)\
$(MSILIB)
-.IF "$(USE_SYSTEM_STL)" != "YES"
-STDSHL+=$(LIBSTLPORTST)
-.ENDIF
-
SHL1LIBS = $(SLB)$/$(TARGET).lib
SHL1TARGET = $(TARGET)
diff --git a/setup_native/source/win32/customactions/shellextensions/makefile.mk b/setup_native/source/win32/customactions/shellextensions/makefile.mk
index a6f702c..ddac3dd 100644
--- a/setup_native/source/win32/customactions/shellextensions/makefile.mk
+++ b/setup_native/source/win32/customactions/shellextensions/makefile.mk
@@ -34,10 +34,6 @@ USE_DEFFILE=TRUE
.INCLUDE : settings.mk
-.IF "$(USE_SYSTEM_STL)" != "YES"
-CFLAGS+=-D_STLP_USE_STATIC_LIB
-.ENDIF
-
#Disable precompiled header
CDEFS+=-Dnot_used_define_to_disable_pch
@@ -75,10 +71,6 @@ STDSHL += \
$(MSILIB)\
$(SHELL32LIB)
-.IF "$(USE_SYSTEM_STL)" != "YES"
-STDSHL += $(LIBSTLPORTST)
-.ENDIF
-
.IF "$(COM)"=="GCC"
STDSHL+= \
$(KERNEL32LIB)\
diff --git a/setup_native/source/win32/customactions/tools/makefile.mk b/setup_native/source/win32/customactions/tools/makefile.mk
index ff8ba6a..a9a40f0 100644
--- a/setup_native/source/win32/customactions/tools/makefile.mk
+++ b/setup_native/source/win32/customactions/tools/makefile.mk
@@ -35,10 +35,6 @@ USE_DEFFILE=TRUE
.INCLUDE : settings.mk
-.IF "$(USE_SYSTEM_STL)" != "YES"
-CFLAGS+=-D_STLP_USE_STATIC_LIB
-.ENDIF
-
# --- Files --------------------------------------------------------
.IF "$(GUI)"=="WNT"
@@ -58,10 +54,6 @@ STDSHL+= \
$(ADVAPI32LIB)\
$(MSILIB)
-.IF "$(USE_SYSTEM_STL)" != "YES"
-STDSHL+=$(LIBSTLPORTST)
-.ENDIF
-
#SHL1LIBS = $(SLB)$/$(TARGET).lib
SHL1TARGET = $(TARGET)
diff --git a/slideshow/source/engine/animationfactory.cxx b/slideshow/source/engine/animationfactory.cxx
index 8157119..b948325 100644
--- a/slideshow/source/engine/animationfactory.cxx
+++ b/slideshow/source/engine/animationfactory.cxx
@@ -611,8 +611,8 @@ namespace slideshow
pGetValue,
pSetValue,
// no modification necessary, use identity functor here
- ::std::identity< typename AnimationBase::ValueType >(),
- ::std::identity< typename AnimationBase::ValueType >() ) );
+ std::identity< typename AnimationBase::ValueType >(),
+ std::identity< typename AnimationBase::ValueType >()));
}
class Scaler
diff --git a/solenv/doc/gbuild/solenv/gbuild/gbuild.mk b/solenv/doc/gbuild/solenv/gbuild/gbuild.mk
index 78d6753..e221d39 100644
--- a/solenv/doc/gbuild/solenv/gbuild/gbuild.mk
+++ b/solenv/doc/gbuild/solenv/gbuild/gbuild.mk
@@ -43,7 +43,6 @@ static const Path UPD;
static const String CVER;
static const String LIBXML_CFLAGS;
static const String OS;
-static const String STLPORT_VER;
static const Bool DEBUG;
static const Bool PRODUCT;
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 848ced3..7f1fe75 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -34,7 +34,6 @@
# PRODUCT
# SOLARINC
# SOLARLIB
-# STLPORT_VER
# UPD
# GXX_INCLUDE_PATH (Linux)
@@ -163,11 +162,6 @@ gb_GLOBALDEFS := \
$(gb_COMPILERDEFS) \
$(gb_CPUDEFS) \
-ifneq ($(USE_SYSTEM_STL),YES)
-gb_GLOBALDEFS += \
- -DSTLPORT_VERSION=$(STLPORT_VER)
-endif
-
ifeq ($(gb_PRODUCT),$(true))
gb_GLOBALDEFS += \
-DPRODUCT \
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 7f6ce10..5b91705 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -300,20 +300,10 @@ gb_Library_TARGETTYPEFLAGS := -dynamiclib -single_module
gb_Library_SYSPRE := lib
gb_Library_UNOVERPRE := $(gb_Library_SYSPRE)uno_
gb_Library_PLAINEXT := .dylib
-gb_Library_RTEXT := gcc3$(gb_Library_PLAINEXT)
-ifeq ($(gb_PRODUCT),$(true))
-gb_Library_STLEXT := port_gcc$(gb_Library_PLAINEXT)
-else
-gb_Library_STLEXT := port_gcc_stldebug$(gb_Library_PLAINEXT)
-endif
+gb_Library_RTEXT := $(COMID)$(gb_Library_PLAINEXT)
-ifeq ($(CPUNAME),INTEL)
gb_Library_OOOEXT := $(gb_Library_PLAINEXT)
gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT)
-else # ifeq ($(CPUNAME),POWERPC)
-gb_Library_OOOEXT := $(gb_Library_PLAINEXT)
-gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT)
-endif
gb_Library__FRAMEWORKS := \
Cocoa \
diff --git a/solenv/inc/unxlng.mk b/solenv/inc/unxlng.mk
index 187946e..032f013 100644
--- a/solenv/inc/unxlng.mk
+++ b/solenv/inc/unxlng.mk
@@ -39,7 +39,8 @@ JAVAFLAGSDEBUG=-g
#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter"
# _PTHREADS is needed for the stl
-CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER)
+CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1
+CDEFS+=-DBOOST_DETAIL_NO_CONTAINER_FWD
# enable visibility define in "sal/types.h"
.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
@@ -226,24 +227,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)
# name of library manager
diff --git a/solenv/inc/unxmacx.mk b/solenv/inc/unxmacx.mk
index 007f24a..b3cbb40 100644
--- a/solenv/inc/unxmacx.mk
+++ b/solenv/inc/unxmacx.mk
@@ -34,14 +34,9 @@ LINKOUTPUT_FILTER=
# Definitions that we may need on the compile line.
# -D_PTHREADS and -D_REENTRANT are needed for STLport, and must be specified when
# compiling STLport sources too, either internally or externally.
-CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNO_PTHREAD_PRIORITY $(PROCESSOR_DEFINES) -DSTLPORT_VERSION=$(STLPORT_VER) -D_USE_NAMESPACE=1
-.IF "$(GUIBASE)"=="unx" && "$(USE_SYSTEM_STL)"!="YES"
-CDEFS+=-DX_LOCALE
-.ENDIF
-.IF "$(GUIBASE)"=="aqua"
-# MAXOSX_DEPLOYMENT_TARGET : The minimum version required to run the build,
-# build can assume functions/libraries of that version to be available
-# unless you want to do runtime checks for 10.5 api, you also want to use the 10.4 sdk
+CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNO_PTHREAD_PRIORITY $(PROCESSOR_DEFINES) -D_USE_NAMESPACE=1
+
+# MAXOSX_DEPLOYMENT_TARGET : The minimum version required to run the build result
# (safer/easier than dealing with the MAC_OS_X_VERSION_MAX_ALLOWED macro)
# http://developer.apple.com/technotes/tn2002/tn2064.html
# done in setsolar/configure now. left here for documentation
diff --git a/solenv/inc/wntmsci11.mk b/solenv/inc/wntmsci11.mk
index 7270adf..db9d0fb 100644
--- a/solenv/inc/wntmsci11.mk
+++ b/solenv/inc/wntmsci11.mk
@@ -219,7 +219,7 @@ CFLAGSWERRCC=-WX
MODULES_WITH_WARNINGS := \
soldep
-CDEFS+=-DSTLPORT_VERSION=400 -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
.IF "$(COMEX)" == "11"
_VC_MANIFEST_BASENAME=__VC80
.ELSE
diff --git a/stlport/STLport-4.0-sunstudio12u1.patch b/stlport/STLport-4.0-sunstudio12u1.patch
deleted file mode 100644
index 49d76ab..0000000
--- a/stlport/STLport-4.0-sunstudio12u1.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- misc/STLport-4.0/stlport/config/stl_sunpro.h Mon Jul 6 13:43:35 2009
-+++ misc/build/STLport-4.0/stlport/config/stl_sunpro.h Mon Jul 6 13:56:56 2009
-@@ -31,7 +31,8 @@
- # endif
- # endif
-
--# if (__SUNPRO_CC < 0x600)
-+// support SunStudio compiler 12u1 version 5.10 (which results in 0x5100)
-+# if (__SUNPRO_CC < 0x600 || ((__SUNPRO_CC | 0x0FFF) > 0x0FFF && __SUNPRO_CC < 0x6000))
- // those are tested and proved not to work...
- # define __STL_STATIC_ARRAY_BUG 1
- # define __STL_STATIC_CONST_INIT_BUG 1
-@@ -57,7 +58,7 @@
- # define __STL_NO_FRIEND_TEMPLATES 1
- #endif
-
--# if (__SUNPRO_CC < 0x600)
-+# if (__SUNPRO_CC < 0x600 || ((__SUNPRO_CC | 0x0FFF) > 0x0FFF && __SUNPRO_CC < 0x6000))
- # define __STL_HAS_NO_NEW_C_HEADERS 1
- # define __STL_NO_EXPLICIT_FUNCTION_TMPL_ARGS
- # define __STL_NON_TYPE_TMPL_PARAM_BUG 1
diff --git a/stlport/STLport-4.0.patch b/stlport/STLport-4.0.patch
deleted file mode 100644
index 0d262b5..0000000
--- a/stlport/STLport-4.0.patch
+++ /dev/null
@@ -1,4926 +0,0 @@
-*** misc/STLport-4.0/src/gcc.mak Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/src/gcc.mak Tue Sep 6 18:38:04 2005
-***************
-*** 5,12 ****
- #
- # compiler
- #
-! CC = gcc
-! CXX = c++
-
- #
- # Basename for libraries
---- 5,12 ----
- #
- # compiler
- #
-! CC *= gcc
-! CXX *= c++
-
- #
- # Basename for libraries
-***************
-*** 19,25 ****
- #
- LINK=ar cr
- # 2.95 flag
-! DYN_LINK=gcc -shared -o
-
- OBJEXT=o
- DYNEXT=so
---- 19,25 ----
- #
- LINK=ar cr
- # 2.95 flag
-! DYN_LINK=$(CC) -shared -o
-
- OBJEXT=o
- DYNEXT=so
-*** misc/STLport-4.0/src/sunpro.mak Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/src/sunpro.mak Tue Sep 6 18:38:04 2005
-***************
-*** 30,35 ****
---- 30,40 ----
-
- include common_macros.mak
-
-+ # override because STLDEBUG breaks...
-+ ALL_STATIC_LIBS=$(OUTDIR)$(PATH_SEP)$(RELEASE_LIB) $(OUTDIR)$(PATH_SEP)$(DEBUG_LIB)
-+
-+ ALL_DYNAMIC_LIBS=$(OUTDIR)$(PATH_SEP)$(RELEASE_DYNLIB) $(OUTDIR)$(PATH_SEP)$(DEBUG_DYNLIB)
-+
- CXXFLAGS_COMMON = -mt -pta +w2 -features=rtti -xildoff ${STL_INCL} -D__SGI_STL_OWN_IOSTREAMS
-
- SHCXXFLAGS = -PIC
-***************
-*** 70,75 ****
---- 75,88 ----
- LDFLAGS_STLDEBUG_static = ${CXXFLAGS_STLDEBUG_static}
- LDFLAGS_STLDEBUG_dynamic = ${CXXFLAGS_STLDEBUG_dynamic}
-
-+ LDLIBS_RELEASE_dynamic = -lm
-+ LDLIBS_DEBUG_dynamic = -lm
-+ LDLIBS_STLDEBUG_dynamic = -lm
-+
-+ LDFLAGS_RELEASE_dynamic += -norunpath
-+ LDFLAGS_DEBUG_dynamic += -norunpath
-+ LDFLAGS_STLDEBUG_dynamic += -norunpath
-+
- include common_percent_rules.mak
- include common_rules.mak
-
-*** misc/STLport-4.0/src/sunpro11.mak Mon Dec 5 17:22:32 2005
---- misc/build/STLport-4.0/src/sunpro11.mak Mon Dec 5 17:25:03 2005
-***************
-*** 1 ****
-! dummy
---- 1,82 ----
-! #
-! # Basename for libraries
-! #
-! LIB_BASENAME = libstlport_sunpro
-!
-! STL_INCL= -I. -I${PWD}/../stlport/SC5 -I${SYSBASE}/usr/include
-! # STL_INCL= -I. -I${PWD}/../stlport
-!
-! CC = CC
-! CXX = CC
-!
-! #
-! # guts for common stuff
-! #
-! #
-! LINK=$(CC) -mt -xar -o
-! DYN_LINK=$(CC) -mt -G -o
-!
-! OBJEXT=o
-! DYNEXT=so
-! STEXT=a
-! RM=rm -rf
-! PATH_SEP=/
-! MKDIR=mkdir -p
-! COMP=SUN
-!
-! # LINK_OUT=-xar -o
-! # DYNLINK_OUT=-o
-!
-! all: all_static all_dynamic
-!
-! include common_macros.mak
-!
-! # override because STLDEBUG breaks...
-! ALL_STATIC_LIBS=$(OUTDIR)$(PATH_SEP)$(RELEASE_LIB) $(OUTDIR)$(PATH_SEP)$(DEBUG_LIB)
-!
-! ALL_DYNAMIC_LIBS=$(OUTDIR)$(PATH_SEP)$(RELEASE_DYNLIB) $(OUTDIR)$(PATH_SEP)$(DEBUG_DYNLIB)
-!
-! CXXFLAGS_COMMON = -mt -library=%none,Crun ${STL_INCL} -D__SGI_STL_OWN_IOSTREAMS
-!
-! SHCXXFLAGS = -KPIC
-!
-! #
-! # Try those flags to see if they help to get maximum efficiency :
-! # -Qoption iropt -R,-Ml30,-Ms30,-Mi1000000,-Mm1000000,-Mr1000000,-Ma1000000,-Mc1000000,-Mt1000000
-! # Note, these flags don't work anymore with the SunStudio 11 compiler. Let the compiler
-! # decide how to optimize
-! RELEASE_FLAGS = -O3
-!
-!
-! # install: $(TARGETS)
-! # cp -p $(TARGETS) ${INSTALLDIR}
-!
-! CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${RELEASE_FLAGS}
-! CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${RELEASE_FLAGS} $(SHCXXFLAGS)
-!
-! CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
-! CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g $(SHCXXFLAGS)
-!
-! CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_COMMON) -g -D__STL_DEBUG
-! CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_COMMON) -g -D__STL_DEBUG $(SHCXXFLAGS)
-!
-! LDFLAGS_RELEASE_static = ${CXXFLAGS_RELEASE_static}
-! LDFLAGS_RELEASE_dynamic = ${CXXFLAGS_RELEASE_dynamic}
-!
-! LDFLAGS_DEBUG_static = ${CXXFLAGS_DEBUG_static}
-! LDFLAGS_DEBUG_dynamic = ${CXXFLAGS_DEBUG_dynamic}
-!
-! LDFLAGS_STLDEBUG_static = ${CXXFLAGS_STLDEBUG_static}
-! LDFLAGS_STLDEBUG_dynamic = ${CXXFLAGS_STLDEBUG_dynamic}
-!
-! LDLIBS_RELEASE_dynamic = -lm
-! LDLIBS_DEBUG_dynamic = -lm
-! LDLIBS_STLDEBUG_dynamic = -lm
-!
-! LDFLAGS_RELEASE_dynamic += -norunpath
-! LDFLAGS_DEBUG_dynamic += -norunpath
-! LDFLAGS_STLDEBUG_dynamic += -norunpath
-!
-! include common_percent_rules.mak
-! include common_rules.mak
-!
-*** misc/STLport-4.0/src/sunpro6.mak Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/src/sunpro6.mak Tue Sep 6 18:38:04 2005
-***************
-*** 3,10 ****
- #
- LIB_BASENAME = libstlport_sunpro
-
-! # STL_INCL= -I. -I${PWD}/../stlport/SC5
-! STL_INCL= -I. -I${PWD}/../stlport
-
- CC = CC
- CXX = CC
---- 3,10 ----
- #
- LIB_BASENAME = libstlport_sunpro
-
-! STL_INCL= -I. -I${PWD}/../stlport/SC5
-! # STL_INCL= -I. -I${PWD}/../stlport
-
- CC = CC
- CXX = CC
-***************
-*** 30,35 ****
---- 30,40 ----
- all: all_static all_dynamic
-
- include common_macros.mak
-+
-+ # override because STLDEBUG breaks...
-+ ALL_STATIC_LIBS=$(OUTDIR)$(PATH_SEP)$(RELEASE_LIB) $(OUTDIR)$(PATH_SEP)$(DEBUG_LIB)
-+
-+ ALL_DYNAMIC_LIBS=$(OUTDIR)$(PATH_SEP)$(RELEASE_DYNLIB) $(OUTDIR)$(PATH_SEP)$(DEBUG_DYNLIB)
-
- CXXFLAGS_COMMON = -mt -library=%none,Crun -template=wholeclass ${STL_INCL} -D__SGI_STL_OWN_IOSTREAMS
-
-***************
-*** 62,67 ****
---- 67,80 ----
- LDFLAGS_STLDEBUG_static = ${CXXFLAGS_STLDEBUG_static}
- LDFLAGS_STLDEBUG_dynamic = ${CXXFLAGS_STLDEBUG_dynamic}
-
-+ LDLIBS_RELEASE_dynamic = -lm
-+ LDLIBS_DEBUG_dynamic = -lm
-+ LDLIBS_STLDEBUG_dynamic = -lm
-+
-+ LDFLAGS_RELEASE_dynamic += -norunpath
-+ LDFLAGS_DEBUG_dynamic += -norunpath
-+ LDFLAGS_STLDEBUG_dynamic += -norunpath
-+
- include common_percent_rules.mak
- include common_rules.mak
-
-*** misc/STLport-4.0/src/sunpro8.mak Tue Sep 6 19:11:15 2005
---- misc/build/STLport-4.0/src/sunpro8.mak Tue Sep 6 19:10:31 2005
-***************
-*** 1 ****
-! dummy
---- 1,80 ----
-! #
-! # Basename for libraries
-! #
-! LIB_BASENAME = libstlport_sunpro
-!
-! STL_INCL= -I. -I${PWD}/../stlport/SC5 -I${SYSBASE}/usr/include
-! # STL_INCL= -I. -I${PWD}/../stlport
-!
-! CC = CC
-! CXX = CC
-!
-! #
-! # guts for common stuff
-! #
-! #
-! LINK=$(CC) -mt -xar -o
-! DYN_LINK=$(CC) -mt -G -o
-!
-! OBJEXT=o
-! DYNEXT=so
-! STEXT=a
-! RM=rm -rf
-! PATH_SEP=/
-! MKDIR=mkdir -p
-! COMP=SUN
-!
-! # LINK_OUT=-xar -o
-! # DYNLINK_OUT=-o
-!
-! all: all_static all_dynamic
-!
-! include common_macros.mak
-!
-! # override because STLDEBUG breaks...
-! ALL_STATIC_LIBS=$(OUTDIR)$(PATH_SEP)$(RELEASE_LIB) $(OUTDIR)$(PATH_SEP)$(DEBUG_LIB)
-!
-! ALL_DYNAMIC_LIBS=$(OUTDIR)$(PATH_SEP)$(RELEASE_DYNLIB) $(OUTDIR)$(PATH_SEP)$(DEBUG_DYNLIB)
-!
-! CXXFLAGS_COMMON = -DSYSBASE="$(SYSBASE)" -mt -library=%none,Crun ${STL_INCL} -D__SGI_STL_OWN_IOSTREAMS
-!
-! SHCXXFLAGS = -KPIC
-!
-! #
-! # Try those flags to see if they help to get maximum efficiency :
-! # -Qoption iropt -R,-Ml30,-Ms30,-Mi1000000,-Mm1000000,-Mr1000000,-Ma1000000,-Mc1000000,-Mt1000000
-! RELEASE_FLAGS = -O2 -Qoption iropt -R,-Ml30,-Ms30,-Mi1000000,-Mm1000000,-Mr1000000,-Ma1000000,-Mc1000000,-Mt1000000
-!
-!
-! # install: $(TARGETS)
-! # cp -p $(TARGETS) ${INSTALLDIR}
-!
-! CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${RELEASE_FLAGS}
-! CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${RELEASE_FLAGS} $(SHCXXFLAGS)
-!
-! CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
-! CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g $(SHCXXFLAGS)
-!
-! CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_COMMON) -g -D__STL_DEBUG
-! CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_COMMON) -g -D__STL_DEBUG $(SHCXXFLAGS)
-!
-! LDFLAGS_RELEASE_static = ${CXXFLAGS_RELEASE_static}
-! LDFLAGS_RELEASE_dynamic = ${CXXFLAGS_RELEASE_dynamic} -L$(SYSBASE)/usr/lib
-!
-! LDFLAGS_DEBUG_static = ${CXXFLAGS_DEBUG_static}
-! LDFLAGS_DEBUG_dynamic = ${CXXFLAGS_DEBUG_dynamic} -L$(SYSBASE)/usr/lib
-!
-! LDFLAGS_STLDEBUG_static = ${CXXFLAGS_STLDEBUG_static}
-! LDFLAGS_STLDEBUG_dynamic = ${CXXFLAGS_STLDEBUG_dynamic} -L$(SYSBASE)/usr/lib
-!
-! LDLIBS_RELEASE_dynamic = -lm
-! LDLIBS_DEBUG_dynamic = -lm
-! LDLIBS_STLDEBUG_dynamic = -lm
-!
-! LDFLAGS_RELEASE_dynamic += -norunpath
-! LDFLAGS_DEBUG_dynamic += -norunpath
-! LDFLAGS_STLDEBUG_dynamic += -norunpath
-!
-! include common_percent_rules.mak
-! include common_rules.mak
-!
-*** misc/STLport-4.0/src/vc6.mak Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/src/vc6.mak Tue Sep 6 18:38:04 2005
-***************
-*** 8,14 ****
- LIB_BASENAME=stlport_vc6
- COMP=VC6
-
-! EXTRA_COMMON_FLAGS=/D "_MBCS"
-
- all: platform all_static all_dynamic
-
---- 8,14 ----
- LIB_BASENAME=stlport_vc6
- COMP=VC6
-
-! EXTRA_COMMON_FLAGS=/D "_MBCS" /D "_NTSDK"
-
- all: platform all_static all_dynamic
-
-*** misc/STLport-4.0/stlport/SC5/config/stl_sunpro.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/SC5/config/stl_sunpro.h Wed Oct 10 16:11:29 2007
-***************
-*** 42,53 ****
-
- # define __STL_NO_QUALIFIED_FRIENDS 1
-
-- // <locale> constructor problem
-- # define __STL_NO_MEMBER_TEMPLATES 1
-- # define __STL_NO_MEMBER_TEMPLATE_KEYWORD 1
-- # define __STL_NO_MEMBER_TEMPLATE_CLASSES 1
-- # define __STL_NO_FRIEND_TEMPLATES 1
--
- // ambiguity problems
- # define __STL_NO_CLASS_PARTIAL_SPECIALIZATION 1
- # define __STL_NO_FUNCTION_TMPL_PARTIAL_ORDER 1
---- 42,47 ----
-***************
-*** 55,62 ****
- # endif
-
-
- # if (__SUNPRO_CC < 0x600)
-- # define __STL_NO_TYPENAME_ON_RETURN_TYPE 1
- # define __STL_HAS_NO_NEW_C_HEADERS 1
- # define __STL_NO_EXPLICIT_FUNCTION_TMPL_ARGS
- # define __STL_NON_TYPE_TMPL_PARAM_BUG 1
---- 49,63 ----
- # endif
-
-
-+ # if (__SUNPRO_CC < 0x530)
-+ // <locale> constructor problem
-+ # define __STL_NO_MEMBER_TEMPLATES 1
-+ # define __STL_NO_MEMBER_TEMPLATE_KEYWORD 1
-+ # define __STL_NO_MEMBER_TEMPLATE_CLASSES 1
-+ # define __STL_NO_FRIEND_TEMPLATES 1
-+ #endif
-+
- # if (__SUNPRO_CC < 0x600)
- # define __STL_HAS_NO_NEW_C_HEADERS 1
- # define __STL_NO_EXPLICIT_FUNCTION_TMPL_ARGS
- # define __STL_NON_TYPE_TMPL_PARAM_BUG 1
-***************
-*** 63,68 ****
---- 64,73 ----
- # define __STL_NONTEMPL_BASE_MATCH_BUG 1
- # endif
-
-+ # if (__SUNPRO_CC < 0x510)
-+ # define __STL_NO_TYPENAME_ON_RETURN_TYPE 1
-+ # endif
-+
- // Features that depend on compatibility switch
- # if ( __SUNPRO_CC < 0x500 ) || (defined (__SUNPRO_CC_COMPAT) && (__SUNPRO_CC_COMPAT < 5))
- # define __STL_HAS_NO_NEW_IOSTREAMS 1
-***************
-*** 73,84 ****
- # define __STL_NO_BAD_ALLOC 1
- # define __STL_NO_EXCEPTION_HEADER 1
- # define __STL_NATIVE_C_INCLUDE_PATH ../include
-! # elif (__SUNPRO_CC < 0x600)
- # define __STL_NATIVE_C_HEADER(header) <../CC/##header##.SUNWCCh>
- # define __STL_NATIVE_CPP_C_HEADER(header) <../CC/##header##.SUNWCCh>
- # else
-! # define __STL_NATIVE_C_INCLUDE_PATH ../CC/std
-! # define __STL_NATIVE_CPP_C_INCLUDE_PATH ../CC/std
- # endif
-
- # if ( __SUNPRO_CC < 0x500 )
---- 78,94 ----
- # define __STL_NO_BAD_ALLOC 1
- # define __STL_NO_EXCEPTION_HEADER 1
- # define __STL_NATIVE_C_INCLUDE_PATH ../include
-! # elif (__SUNPRO_CC < 0x520)
- # define __STL_NATIVE_C_HEADER(header) <../CC/##header##.SUNWCCh>
- # define __STL_NATIVE_CPP_C_HEADER(header) <../CC/##header##.SUNWCCh>
- # else
-! # if defined SYSBASE
-! # define __STL_NATIVE_C_INCLUDE_PATH SYSBASE/usr/include
-! # define __STL_NATIVE_CPP_C_INCLUDE_PATH SYSBASE/usr/include
-! # else
-! # define __STL_NATIVE_C_INCLUDE_PATH /usr/include
-! # define __STL_NATIVE_CPP_C_INCLUDE_PATH /usr/include
-! # endif
- # endif
-
- # if ( __SUNPRO_CC < 0x500 )
-*** misc/STLport-4.0/stlport/cctype Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/cctype Thu Aug 25 15:54:53 2005
-***************
-*** 48,53 ****
---- 48,56 ----
-
- # if ! defined (__STL_NO_CSTD_FUNCTION_IMPORTS)
- # if defined ( __STL_IMPORT_VENDOR_CSTD )
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
- using __STL_VENDOR_CSTD::isalnum;
- using __STL_VENDOR_CSTD::isalpha;
-***************
-*** 63,68 ****
---- 66,74 ----
- using __STL_VENDOR_CSTD::tolower;
- using __STL_VENDOR_CSTD::toupper;
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
- # endif /* __STL_IMPORT_VENDOR_CSTD*/
- # endif /* __STL_NO_CSTD_FUNCTION_IMPORTS */
-
-*** misc/STLport-4.0/stlport/cerrno Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/cerrno Thu Aug 25 15:54:53 2005
-***************
-*** 30,38 ****
---- 30,44 ----
- #ifndef errno
-
- # ifdef __STL_IMPORT_VENDOR_CSTD
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
- using __STL_VENDOR_CSTD::errno;
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
- # endif /* __STL_IMPORT_VENDOR_CSTD */
-
- #endif
-*** misc/STLport-4.0/stlport/clocale Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/clocale Thu Aug 25 15:54:53 2005
-***************
-*** 28,33 ****
---- 28,36 ----
- # endif
-
- # ifdef __STL_IMPORT_VENDOR_CSTD
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
- using __STL_VENDOR_CSTD::lconv;
- # if ! defined (__STL_NO_CSTD_FUNCTION_IMPORTS)
-***************
-*** 35,40 ****
---- 38,46 ----
- using __STL_VENDOR_CSTD::setlocale;
- # endif
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
- # endif /* __STL_IMPORT_VENDOR_CSTD */
-
- # if (__STL_OUTERMOST_HEADER_ID == 0x108 )
-*** misc/STLport-4.0/stlport/cmath Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/cmath Thu Aug 25 15:54:53 2005
-***************
-*** 40,45 ****
---- 40,48 ----
- # endif
-
- # ifdef __STL_IMPORT_VENDOR_CSTD
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
- # if ! defined (__STL_NO_CSTD_FUNCTION_IMPORTS)
- using __STL_VENDOR_CSTD::acos;
-***************
-*** 66,73 ****
---- 69,82 ----
- using __STL_VENDOR_CSTD::tanh;
- # endif /* BUG */
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
- # endif /* __STL_IMPORT_VENDOR_CSTD */
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- # ifdef __STL_SAME_FUNCTION_NAME_RESOLUTION_BUG
-***************
-*** 135,140 ****
---- 144,152 ----
- # endif
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # if (__STL_OUTERMOST_HEADER_ID == 0x109 )
- # include <stl/_epilog.h>
-*** misc/STLport-4.0/stlport/csetjmp Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/csetjmp Thu Aug 25 15:54:54 2005
-***************
-*** 31,36 ****
---- 31,39 ----
- # endif
-
- # ifdef __STL_IMPORT_VENDOR_CSTD
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
- using __STL_VENDOR_CSTD::jmp_buf;
- # ifndef __STL_NO_CSTD_FUNCTION_IMPORTS
-***************
-*** 40,45 ****
---- 43,51 ----
- using __STL_VENDOR_CSTD::longjmp;
- # endif
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
- #endif /* __STL_IMPORT_VENDOR_CSTD */
-
- # if (__STL_OUTERMOST_HEADER_ID == 0x111 )
-*** misc/STLport-4.0/stlport/csignal Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/csignal Thu Aug 25 15:54:54 2005
-***************
-*** 28,33 ****
---- 28,36 ----
- # endif
-
- # ifdef __STL_IMPORT_VENDOR_CSTD
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
- # ifndef __STL_NO_CSTD_FUNCTION_IMPORTS
- using __STL_VENDOR_CSTD::signal;
-***************
-*** 35,40 ****
---- 38,46 ----
- # endif /* __STL_NO_CSTD_FUNCTION_IMPORTS */
- using __STL_VENDOR_CSTD::sig_atomic_t;
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
- # endif /* __STL_IMPORT_VENDOR_CSTD */
-
- # if (__STL_OUTERMOST_HEADER_ID == 0x112 )
-*** misc/STLport-4.0/stlport/cstdarg Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/cstdarg Thu Aug 25 15:54:54 2005
-***************
-*** 28,36 ****
---- 28,42 ----
- # endif
-
- # ifdef __STL_IMPORT_VENDOR_CSTD
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
- using __STL_VENDOR_CSTD::va_list;
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
- #endif /* __STL_IMPORT_VENDOR_CSTD */
-
- # if (__STL_OUTERMOST_HEADER_ID == 0x113 )
-*** misc/STLport-4.0/stlport/cstddef Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/cstddef Thu Aug 25 15:54:54 2005
-***************
-*** 30,39 ****
---- 30,45 ----
- # endif
-
- # ifdef __STL_IMPORT_VENDOR_CSTD
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
- using __STL_VENDOR_CSTD::ptrdiff_t;
- using __STL_VENDOR_CSTD::size_t;
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
- #endif /* __STL_IMPORT_VENDOR_CSTD */
-
- # if (__STL_OUTERMOST_HEADER_ID == 0x114 )
-*** misc/STLport-4.0/stlport/cstdio Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/cstdio Thu Aug 25 15:54:54 2005
-***************
-*** 47,52 ****
---- 47,55 ----
- # endif
-
- # ifdef __STL_IMPORT_VENDOR_CSTD
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
- using __STL_VENDOR_CSTD::FILE;
- using __STL_VENDOR_CSTD::fpos_t;
-***************
-*** 108,113 ****
---- 111,119 ----
- # endif
- # endif /* __STL_NO_CSTD_FUNCTION_IMPORTS */
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
- # endif /* __STL_IMPORT_VENDOR_CSTD */
-
- # if (__STL_OUTERMOST_HEADER_ID == 15)
-*** misc/STLport-4.0/stlport/cstdlib Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/cstdlib Thu Aug 25 15:54:54 2005
-***************
-*** 42,47 ****
---- 42,50 ----
- # endif
-
- # ifdef __STL_IMPORT_VENDOR_CSTD
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
- using __STL_VENDOR_CSTD::div_t;
- using __STL_VENDOR_CSTD::ldiv_t;
-***************
-*** 83,88 ****
---- 86,94 ----
- using __STL_VENDOR_CSTD::srand;
- # endif /* __STL_NO_CSTD_FUNCTION_IMPORTS */
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
- #endif /* __STL_IMPORT_VENDOR_CSTD */
-
- # if (__STL_OUTERMOST_HEADER_ID == 0x116)
-*** misc/STLport-4.0/stlport/cstring Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/cstring Thu Aug 25 15:54:54 2005
-***************
-*** 28,36 ****
---- 28,42 ----
- # endif
-
- # ifdef __STL_IMPORT_VENDOR_CSTD
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
- # include <using/cstring>
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
- #endif /* __STL_IMPORT_VENDOR_CSTD */
-
- # if (__STL_OUTERMOST_HEADER_ID == 0x117)
-*** misc/STLport-4.0/stlport/ctime Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/ctime Thu Aug 25 15:54:54 2005
-***************
-*** 28,33 ****
---- 28,36 ----
- # endif
-
- # ifdef __STL_IMPORT_VENDOR_CSTD
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
- using __STL_VENDOR_CSTD::size_t;
- using __STL_VENDOR_CSTD::clock_t;
-***************
-*** 45,50 ****
---- 48,56 ----
- using __STL_VENDOR_CSTD::time;
- # endif /* __STL_NO_CSTD_FUNCTION_IMPORTS */
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
- #endif /* __STL_IMPORT_VENDOR_CSTD */
-
- # if (__STL_OUTERMOST_HEADER_ID == 0x118)
-*** misc/STLport-4.0/stlport/cwchar Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/cwchar Thu Aug 25 15:54:54 2005
-***************
-*** 79,84 ****
---- 79,87 ----
-
- # ifdef __STL_USE_OWN_MBSTATE_T
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- struct __stl_mbstate_t {
-***************
-*** 109,114 ****
---- 112,120 ----
- typedef __stl_mbstate_t mbstate_t;
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # endif
-
-***************
-*** 119,124 ****
---- 125,133 ----
-
-
- # ifdef __STL_IMPORT_VENDOR_CSTD
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
- using __STL_VENDOR_CSTD::wint_t;
- using __STL_VENDOR_CSTD::size_t;
-***************
-*** 230,235 ****
---- 239,247 ----
-
- # endif /* __STL_NO_NATIVE_WIDE_FUNCTIONS */
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
- # endif /* __STL_IMPORT_VENDOR_CSTD */
-
- # undef __STL_WCHAR_SUNPRO_EXCLUDE
-*** misc/STLport-4.0/stlport/cwctype Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/cwctype Thu Aug 25 15:54:54 2005
-***************
-*** 39,44 ****
---- 39,47 ----
- # endif
-
- # ifdef __STL_IMPORT_VENDOR_CSTD
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
- using __STL_VENDOR_CSTD::wctype_t;
- using __STL_VENDOR_CSTD::wint_t;
-***************
-*** 67,72 ****
---- 70,78 ----
- using __STL_VENDOR_CSTD::towupper;
- # endif /* __STL_NO_CSTD_FUNCTION_IMPORTS */
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
- #endif /* __STL_IMPORT_VENDOR_CSTD */
-
- # if (__STL_OUTERMOST_HEADER_ID == 0x121)
-*** misc/STLport-4.0/stlport/exception Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/exception Thu Aug 25 15:54:54 2005
-***************
-*** 60,65 ****
---- 60,68 ----
-
- # ifdef __STL_USE_OWN_NAMESPACE
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- using __STL_VENDOR_EXCEPT_STD::exception;
-***************
-*** 90,95 ****
---- 93,101 ----
- # endif
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # endif /* __STL_OWN_NAMESPACE */
-
-***************
-*** 98,103 ****
---- 104,112 ----
- # ifndef __SGI_STL_EXCEPTION_H
- # define __SGI_STL_EXCEPTION_H
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- // section 18.6
-***************
-*** 140,152 ****
---- 149,170 ----
- # define __STL_EXCEPTION_BASE exception
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- #endif /* __STL_NO_EXCEPTION_HEADER */
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
- // forward declaration
- class __Named_exception;
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
- #endif /* __SGI_STL_EXCEPTION_H */
-
- # if (__STL_OUTERMOST_HEADER_ID == 0x423)
-*** misc/STLport-4.0/stlport/iomanip Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/iomanip Thu Aug 25 15:54:54 2005
-***************
-*** 32,37 ****
---- 32,40 ----
-
- # include <istream> // Includes <ostream> and <ios>
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- //----------------------------------------------------------------------
-***************
-*** 177,182 ****
---- 180,188 ----
- }
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # elif !defined (__STL_USE_NO_IOSTREAMS)
- # include <wrap_std/iomanip>
-*** misc/STLport-4.0/stlport/iomanip.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/iomanip.h Thu Aug 25 15:54:54 2005
-***************
-*** 43,51 ****
---- 43,57 ----
- # include __STL_NATIVE_OLD_STREAMS_HEADER(iomanip.h)
-
- # if defined (__STL_USE_NAMESPACES) && ! defined (__STL_BROKEN_USING_DIRECTIVE)
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
- # include <using/h/iomanip.h>
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
- # endif /* __STL_USE_NAMESPACES */
-
- # endif
-*** misc/STLport-4.0/stlport/ios.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/ios.h Thu Aug 25 15:54:54 2005
-***************
-*** 33,41 ****
---- 33,47 ----
-
- # include __STL_NATIVE_OLD_STREAMS_HEADER(ios.h)
- # if defined (__STL_USE_NAMESPACES) && !defined (__STL_BROKEN_USING_DIRECTIVE)
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
- using __STL_OLD_IO_NAMESPACE::ios;
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
- # endif /* __STL_USE_OWN_NAMESPACE */
-
- # endif
-*** misc/STLport-4.0/stlport/iosfwd Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/iosfwd Thu Aug 25 15:54:54 2005
-***************
-*** 38,46 ****
---- 38,52 ----
-
- # else
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
- template <class _Tp> class allocator;
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # include <wrap_std/iosfwd>
-
-*** misc/STLport-4.0/stlport/iostream Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/iostream Thu Aug 25 15:54:54 2005
-***************
-*** 34,39 ****
---- 34,42 ----
- #include <istream>
- #include <ostream>
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- // Note: cin and wcin are both associated with stdio. The C standard
-***************
-*** 62,67 ****
---- 65,73 ----
- # endif
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # elif defined ( __STL_USE_NO_IOSTREAMS )
- # include <stl/_null_stream.h>
-*** misc/STLport-4.0/stlport/istream.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/istream.h Thu Aug 25 15:54:54 2005
-***************
-*** 46,54 ****
---- 46,60 ----
- # include __STL_NATIVE_OLD_STREAMS_HEADER(istream.h)
-
- # if defined (__STL_USE_NAMESPACES) && !defined (__STL_BROKEN_USING_DIRECTIVE)
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
- using __STL_OLD_IO_NAMESPACE::istream;
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
- # endif /* __STL_USE_OWN_NAMESPACE */
-
- # endif /* __SGI_STL_OWN_IOSTREAMS */
-*** misc/STLport-4.0/stlport/locale Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/locale Thu Aug 25 15:54:54 2005
-***************
-*** 59,64 ****
---- 59,67 ----
- #undef toupper
- #undef tolower
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- template <class _CharT>
-***************
-*** 133,138 ****
---- 136,144 ----
- # endif
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # elif !defined (__STL_USE_NO_IOSTREAMS)
- # include <wrap_std/locale>
-*** misc/STLport-4.0/stlport/math.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/math.h Thu Aug 25 15:55:17 2005
-***************
-*** 24,30 ****
---- 24,36 ----
- # define exception __math_exception
- # endif
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- # include __STL_NATIVE_C_HEADER(math.h)
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # if defined (__STL_HAS_NO_NAMESPACES)
- # undef exception
-*** misc/STLport-4.0/stlport/memory Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/memory Thu Aug 25 15:54:55 2005
-***************
-*** 51,56 ****
---- 51,59 ----
-
- # endif
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
- // implementation primitive
- class __ptr_base {
-***************
-*** 188,193 ****
---- 191,199 ----
-
- };
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # if (__STL_OUTERMOST_HEADER_ID == 0x46)
- # include <stl/_epilog.h>
-*** misc/STLport-4.0/stlport/memory.new Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/memory.new Thu Aug 25 15:54:55 2005
-***************
-*** 58,63 ****
---- 58,66 ----
-
- # endif
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- // implementation primitive
-***************
-*** 223,228 ****
---- 226,234 ----
- };
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- #endif /* __SGI_STL_MEMORY */
-
-*** misc/STLport-4.0/stlport/new Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/new Thu Aug 25 15:54:55 2005
-***************
-*** 58,63 ****
---- 58,66 ----
-
- # ifndef __STL_NO_BAD_ALLOC
- # ifdef __STL_USE_OWN_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
- using __STL_VENDOR_EXCEPT_STD::bad_alloc;
- using __STL_VENDOR_EXCEPT_STD::nothrow_t;
-***************
-*** 72,77 ****
---- 75,83 ----
- # endif
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # endif /* __STL_OWN_NAMESPACE */
- # else /* __STL_NO_BAD_ALLOC */
-***************
-*** 78,83 ****
---- 84,92 ----
-
- # include <exception>
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- class nothrow_t {};
-***************
-*** 98,106 ****
---- 107,121 ----
- };
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- #endif /* __STL_NO_BAD_ALLOC */
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
- inline void* __STL_CALL __stl_new(size_t __n) {
- #if (( defined(__IBMCPP__)|| defined(__OS400__) || defined (__xlC__) || defined (qTidyHeap)) && defined(__DEBUG_ALLOC__) )
-***************
-*** 118,123 ****
---- 133,141 ----
- #endif
- }
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- #endif /* WINCE */
-
-*** misc/STLport-4.0/stlport/ostream.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/ostream.h Thu Aug 25 15:54:56 2005
-***************
-*** 33,41 ****
---- 33,47 ----
-
- # include __STL_NATIVE_OLD_STREAMS_HEADER(ostream.h)
- # if defined (__STL_USE_NAMESPACES) && !defined (__STL_BROKEN_USING_DIRECTIVE)
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
- # include <using/h/ostream.h>
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
- # endif /* __STL_USE_NAMESPACES */
-
- # endif /* __STL_USE_NO_IOSTREAMS */
-*** misc/STLport-4.0/stlport/pthread_alloc Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/pthread_alloc Thu Aug 25 15:54:56 2005
-***************
-*** 51,56 ****
---- 51,59 ----
- # define __RESTRICT
- #endif
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- #define __STL_DATA_ALIGNMENT 8
-***************
-*** 516,521 ****
---- 519,527 ----
- #endif /* __STL_MEMBER_TEMPLATE_CLASSES */
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # if (__STL_OUTERMOST_HEADER_ID == 0x52)
- # include <stl/_epilog.h>
-*** misc/STLport-4.0/stlport/stdexcept Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stdexcept Thu Aug 25 15:54:56 2005
-***************
-*** 45,50 ****
---- 45,53 ----
- # include <stl/_string_fwd.h>
- #endif
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- class __STL_CLASS_DECLSPEC __Named_exception : public __STL_EXCEPTION_BASE {
-***************
-*** 106,111 ****
---- 109,117 ----
- };
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- #endif /* Not o32, and no exceptions */
- # endif /* __STL_STDEXCEPT_SEEN */
-*** misc/STLport-4.0/stlport/typeinfo Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/typeinfo Thu Aug 25 15:55:00 2005
-***************
-*** 35,40 ****
---- 35,43 ----
-
- # if defined (__STL_USE_NAMESPACES) \
- && ( defined (__STL_VENDOR_GLOBAL_EXCEPT_STD) || defined (__STL_USE_OWN_NAMESPACE) || defined (__STL_DEBUG))
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- // VC++ 6 has only this guy in ::
-***************
-*** 48,61 ****
---- 51,73 ----
-
- using __STL_VENDOR_EXCEPT_STD::bad_cast;
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
- #endif /* __STL_OWN_NAMESPACE */
-
- #else
-
- # include <exception>
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
- struct bad_cast : exception {};
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
- #endif /* NO_TYPEINFO */
-
- # if (__STL_OUTERMOST_HEADER_ID == 0x473)
-*** misc/STLport-4.0/stlport/typeinfo.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/typeinfo.h Thu Aug 25 15:55:00 2005
-***************
-*** 31,36 ****
---- 31,39 ----
-
- # if defined (__STL_USE_OWN_NAMESPACE)
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- using /* __STL_VENDOR_EXCEPT_STD */ ::type_info;
-***************
-*** 38,43 ****
---- 41,49 ----
- using /* __STL_VENDOR_EXCEPT_STD */ ::bad_cast;
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- #endif /* __STL_OWN_NAMESPACE */
-
-*** misc/STLport-4.0/stlport/old_hp/alloc.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/old_hp/alloc.h Thu Aug 25 15:54:55 2005
-***************
-*** 49,54 ****
---- 49,57 ----
- #endif
-
- // Old SGI names
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- typedef __sgi_alloc alloc;
-***************
-*** 62,67 ****
---- 65,73 ----
- typedef __multithreaded_alloc multithreaded_alloc;
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list