[Libreoffice-commits] .: basic/source config_host.mk.in configure.ac desktop/source distro-configs/LibreOfficeAndroid.conf distro-configs/LibreOfficeAndroidX86.conf distro-configs/LibreOfficeiOS.conf l10ntools/inc Makefile.fetch odk/setsdkenv_unix.csh.in odk/setsdkenv_unix.sh.in odk/settings postprocess/prj README.Solaris scp2/source slideshow/source solenv/doc solenv/gbuild solenv/inc stlport/dos_lineends.patch stlport/makefile.mk stlport/prj stlport/README stlport/STLport-4.0.patch stlport/STLport-4.0-sunstudio12u1.patch stlport/STLport-4.5-0119.patch stlport/STLport-4.5-clang_locale_h.patch stlport/STLport-4.5-cxx0x.patch stlport/STLport-4.5-gcc43_warnings.patch stlport/STLport-4.5.patch stlport/win32_custom.bat stlport/win32_custom.sh stlport/win32_sdk.bat stlport/win32_sdk.sh sw/source ure/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Dec 17 07:34:49 PST 2012
Makefile.fetch | 3
README.Solaris | 2
basic/source/runtime/methods.cxx | 7
config_host.mk.in | 2
configure.ac | 103
desktop/source/app/app.cxx | 1
desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx | 7
distro-configs/LibreOfficeAndroid.conf | 1
distro-configs/LibreOfficeAndroidX86.conf | 1
distro-configs/LibreOfficeiOS.conf | 1
l10ntools/inc/helpmerge.hxx | 2
odk/setsdkenv_unix.csh.in | 15
odk/setsdkenv_unix.sh.in | 18
odk/settings/settings.mk | 16
postprocess/prj/build.lst | 2
scp2/source/ooo/module_hidden_ooo.scp | 2
scp2/source/ooo/ure.scp | 39
slideshow/source/engine/usereventqueue.cxx | 2
solenv/doc/gbuild/solenv/gbuild/gbuild.mk | 2
solenv/gbuild/gbuild.mk | 1
solenv/gbuild/platform/WNT_INTEL_GCC.mk | 4
solenv/gbuild/platform/com_GCC_defs.mk | 1
solenv/gbuild/platform/solaris.mk | 4
solenv/gbuild/platform/unxgcc.mk | 4
solenv/inc/prewin.h | 1
solenv/inc/settings.mk | 6
stlport/README | 4
stlport/STLport-4.0-sunstudio12u1.patch | 21
stlport/STLport-4.0.patch | 4943 -------------
stlport/STLport-4.5-0119.patch | 1348 ---
stlport/STLport-4.5-clang_locale_h.patch | 11
stlport/STLport-4.5-cxx0x.patch | 17
stlport/STLport-4.5-gcc43_warnings.patch | 113
stlport/STLport-4.5.patch | 1047 --
stlport/dos_lineends.patch | 60
stlport/makefile.mk | 186
stlport/prj/build.lst | 2
stlport/prj/d.lst | 3
stlport/win32_custom.bat | 11
stlport/win32_custom.sh | 9
stlport/win32_sdk.bat | 11
stlport/win32_sdk.sh | 9
sw/source/ui/vba/vbasystem.cxx | 7
ure/source/README | 16
ure/source/THIRDPARTYLICENSEREADME.html | 66
ure/source/uretest/Makefile.pln | 11
ure/source/uretest/README | 4
ure/source/uretest/cppmain.cc | 10
48 files changed, 43 insertions(+), 8113 deletions(-)
New commits:
commit 77d3777c8934171a9557a96872d020cf12443fb9
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Dec 13 16:52:50 2012 +0100
Remove --with-stlport from LO 4.0
The STLport was only built for the benefit of old extensions on platforms that
once used it themselves (Linux x86, Solaris x86 and SPARC, Windows). We
deliberately break such old extensions for LO 4.0 by no longer shipping that
backwards-compatiblity cludge.
Keeps STLport listed in readlicense_oo/ because of
o3tl/inc/o3tl/compat_functionality.hxx.
Also removes GXX_INCLUDE_PATH, as that was only used by STLport (if at all?).
Removes a spurious #define MOVEFILE_REPLACE_EXISTING 0x01 from
l10ntools/inc/helpmerge.hxx that was once added with
854812584862d0609b695682d2bfea2667d75c00 "INTEGRATION: CWS extensionl10nfix01
(1.11.6); FILE MERGED: 2008/06/26 13:56:03 ihi 1.11.6.1: #i90987# windows rename
-> MoveFileEx" but now starts to cause trouble on Windows. Also disables
warning C4005 about redefinition of WB_LEFT/RIGHT macros (defined in both
tools/wintypes.hxx and the Windows API) in a number of places that include
windows.h -- however the old STLport caused those warnings to not show.
Change-Id: Ie138a219fbbc86fb5aaa7ea0b88cf349935d9829
diff --git a/Makefile.fetch b/Makefile.fetch
index c722f68..161dc40 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -79,9 +79,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR)
$(call fetch_Optional,VISIO,VISIO_TARBALL) \
,$(call fetch_Download_item_special,http://dev-www.libreoffice.org/src,$(item)))
$(foreach item, \
- 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz \
- 7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz \
- c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz \
4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz \
$(call fetch_Optional,AFMS,$(AFMS_TARBALL)) \
$(call fetch_Optional,APACHE_COMMONS,$(APACHE_COMMONS_CODEC_TARBALL)) \
diff --git a/README.Solaris b/README.Solaris
index a36cc8b..3b005a0 100644
--- a/README.Solaris
+++ b/README.Solaris
@@ -32,7 +32,7 @@ pkg install pkg:/developer/documentation-tool/doxygen at 1.5.7.1-0.175.0.0.0.2.537
Compiling
---------
-CC="gcc" CXX="g++" ./autogen.sh --with-num-cpus=2 --with-max-jobs=4 --without-junit --disable-mozilla --with-system-curl --without-help --disable-cups --without-java --with-system-cairo --with-lang= --disable-gconf --enable-gio --disable-gnome-vfs --disable-gstreamer --without-fonts --with-system-dicts --without-stlport --disable-mozilla --without-system-mozilla --disable-xmlsec --with-system-openssl
+CC="gcc" CXX="g++" ./autogen.sh --with-num-cpus=2 --with-max-jobs=4 --without-junit --disable-mozilla --with-system-curl --without-help --disable-cups --without-java --with-system-cairo --with-lang= --disable-gconf --enable-gio --disable-gnome-vfs --disable-gstreamer --without-fonts --with-system-dicts --disable-mozilla --without-system-mozilla --disable-xmlsec --with-system-openssl
gmake
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 8f1ac5d..cbf7bda 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -96,7 +96,14 @@ SbxVariable* getDefaultProp( SbxVariable* pRef );
#ifdef WNT
#define GradientStyle_RECT BLA_GradientStyle_RECT
+#if defined _MSC_VER
+#pragma warning (push, 1)
+#pragma warning (disable: 4005)
+#endif
#include <windows.h>
+#if defined _MSC_VER
+#pragma warning (pop)
+#endif
#include <io.h>
#undef GetObject
#undef GradientSyle_RECT
diff --git a/config_host.mk.in b/config_host.mk.in
index fd12153..e6dddc5 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -219,7 +219,6 @@ export GUI=@GUI@
export GUIBASE=@GUIBASE@
export GUIBASE_FOR_BUILD=@GUIBASE_FOR_BUILD@
export GUI_FOR_BUILD=@GUI_FOR_BUILD@
-export GXX_INCLUDE_PATH=@GXX_INCLUDE_PATH@
export HAVE_CXX0X=@HAVE_CXX0X@
export HAVE_GCC_AVX=@HAVE_GCC_AVX@
export HAVE_GCC_BUILTIN_ATOMIC=@HAVE_GCC_BUILTIN_ATOMIC@
@@ -612,7 +611,6 @@ export WITH_LINKER_HASH_STYLE=@WITH_LINKER_HASH_STYLE@
export WITH_MOZAB4WIN=@WITH_MOZAB4WIN@
export WITH_MYSPELL_DICTS=@WITH_MYSPELL_DICTS@
export WITH_POOR_HELP_LOCALIZATIONS=@WITH_POOR_HELP_LOCALIZATIONS@
-export WITH_STLPORT=@WITH_STLPORT@
export WITH_THEMES=@WITH_THEMES@
export WORDS_BIGENDIAN=@WORDS_BIGENDIAN@
export WORKDIR=@WORKDIR@
diff --git a/configure.ac b/configure.ac
index 29462cd..2e9983b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1664,13 +1664,6 @@ AC_ARG_WITH(linker-hash-style,
Possible values: "sysv", "gnu", "both". The default value is "gnu"
if supported on the build system, and "sysv" otherwise.]))
-AC_ARG_WITH(stlport,
- AS_HELP_STRING([--with-stlport],
- [Build the STLPort library for compatibility with old extensions for
- architectures where STLPort used to be used.]),
- with_stlport=$withval ,
-with_stlport=auto)
-
AC_ARG_WITH(jdk-home,
AS_HELP_STRING([--with-jdk-home],
[If you have installed JDK 1.3 or later on your system please supply the
@@ -1681,15 +1674,6 @@ AC_ARG_WITH(jdk-home,
],
,)
-AC_ARG_WITH(gxx_include_path,
- AS_HELP_STRING([--with-gxx-include-path],
- [If you want to override the autodetected g++ include path.])
- [
- Usage: --with-gxx-include-path=<absolute path to
- g++ include dir>
- ],
-,)
-
AC_ARG_WITH(help,
AS_HELP_STRING([--without-help],
[Disable the build of help.]))
@@ -4201,9 +4185,9 @@ if test "$cross_compiling" = "yes"; then
test -f ./config_host.mk 2>/dev/null || exit
cp config_host.mk ../config_build.mk
cp config.log ../config.Build.log
- . ./bin/get_config_variables COM GUI GUIBASE OS PATH CPU CPUNAME CC CXX DISABLE_PYTHON GXX_INCLUDE_PATH MACOSX_DEPLOYMENT_TARGET INPATH OUTPATH PYTHON SYSTEM_LIBXSLT OUTDIR SOLARINC SOLARLIB WORKDIR
+ . ./bin/get_config_variables COM GUI GUIBASE OS PATH CPU CPUNAME CC CXX DISABLE_PYTHON MACOSX_DEPLOYMENT_TARGET INPATH OUTPATH PYTHON SYSTEM_LIBXSLT OUTDIR SOLARINC SOLARLIB WORKDIR
- for V in COM GUI GUIBASE OS CPU CPUNAME CC CXX DISABLE_PYTHON GXX_INCLUDE_PATH MACOSX_DEPLOYMENT_TARGET INPATH OUTPATH \
+ for V in COM GUI GUIBASE OS CPU CPUNAME CC CXX DISABLE_PYTHON MACOSX_DEPLOYMENT_TARGET INPATH OUTPATH \
PYTHON SYSTEM_LIBXSLT; do
VV='$'$V
VV=`eval "echo $VV"`
@@ -5464,89 +5448,6 @@ EXCEPTIONS="$exceptions_type"
AC_SUBST(EXCEPTIONS)
dnl ===================================================================
-dnl Checks for what the default STL should be
-dnl ===================================================================
-AC_MSG_CHECKING([Whether building STLPort library makes sense])
-BUILD_STLPORT="no"
-if test "$_os" = "Linux"; then
- case "$host_cpu" in
- i?86)
- case "$host_os" in
- k*bsd*-gnu*)
- BUILD_STLPORT="no"
- ;;
- *)
- BUILD_STLPORT="yes"
- ;;
- esac
- ;;
- *)
- BUILD_STLPORT="no"
- ;;
- esac
-elif test "$_os" = "SunOS" -a "$COM" = "C52"; then
- BUILD_STLPORT="yes"
-elif test "$_os" = "WINNT" -a "$CPUNAME" != X86_64 -a "$WITH_MINGW" != "yes"; then
- BUILD_STLPORT="yes"
-elif test "$_os" = "FreeBSD"; then
- BUILD_STLPORT="yes"
-fi
-if test "$BUILD_STLPORT" = "yes"; then
- AC_MSG_RESULT([yes])
-else
- AC_MSG_RESULT([no])
-fi
-
-AC_MSG_CHECKING([Whether STLPort library will be actually built])
-if test "$with_stlport" = "auto" -o "$BUILD_STLPORT" = "no"; then
- with_stlport=$BUILD_STLPORT
-fi
-if test "$with_stlport" = "yes"; then
- AC_MSG_RESULT([yes])
- WITH_STLPORT=YES
- SCPDEFS="$SCPDEFS -DWITH_STLPORT"
- BUILD_TYPE="$BUILD_TYPE STLPORT"
-else
- WITH_STLPORT=NO
- AC_MSG_RESULT([no])
-fi
-
-AC_SUBST(WITH_STLPORT)
-
-dnl ===================================================================
-dnl gxx include directories needed by STLPort
-dnl ===================================================================
-# Removed the special FreeBSD treatment. The problem was that with_gxx_include_path
-# 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
- with_gxx_include_path=`echo "#include <cstring>" | $CXX -E -xc++ - 2>/dev/null | $SED -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1`
- if test "$with_gxx_include_path" = "/usr/libexec/(null)/include"; then
- with_gxx_include_path="/usr/include"
- fi
- if echo $with_gxx_include_path | $GREP -q linux; then
- # workaround for Mandriva - issue 100049
- with_gxx_include_path=`cd -P $with_gxx_include_path && pwd`
- fi
- fi
- dnl This is the original code...
- dnl with_gxx_include_path=`$CXX -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include
- if test -z "$with_gxx_include_path"; then
- with_gxx_include_path="NO_GXX_INCLUDE"
- AC_MSG_RESULT([none])
- else
- PathFormat "$with_gxx_include_path"
- with_gxx_include_path="$formatted_path"
- AC_MSG_RESULT([$with_gxx_include_path])
- fi
-else
- with_gxx_include_path="NO_GXX_INCLUDE"
-fi
-GXX_INCLUDE_PATH="$with_gxx_include_path"
-AC_SUBST(GXX_INCLUDE_PATH)
-
-dnl ===================================================================
dnl thread-safe statics
dnl ===================================================================
AC_MSG_CHECKING([whether $CXX supports thread safe statics])
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 26d79ec..a83296f 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -111,6 +111,7 @@
#ifdef WNT
#ifdef _MSC_VER
#pragma warning(push, 1) /* disable warnings within system headers */
+#pragma warning (disable: 4005)
#endif
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
index bd83d12..36af071 100644
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
@@ -88,7 +88,14 @@
#ifdef WNT
#define GradientStyle_RECT BLA_GradientStyle_RECT
+#if defined _MSC_VER
+#pragma warning (push, 1)
+#pragma warning (disable: 4005)
+#endif
#include <windows.h>
+#if defined _MSC_VER
+#pragma warning (pop)
+#endif
#include <objbase.h>
#undef GradientStyle_RECT
#endif
diff --git a/distro-configs/LibreOfficeAndroid.conf b/distro-configs/LibreOfficeAndroid.conf
index c2574ff..b07359a 100644
--- a/distro-configs/LibreOfficeAndroid.conf
+++ b/distro-configs/LibreOfficeAndroid.conf
@@ -18,7 +18,6 @@
--disable-systray
--without-junit
--without-ppds
---without-stlport
--without-helppack-integration
--without-myspell-dicts
--with-build-platform-configure-options=--disable-liblangtag
diff --git a/distro-configs/LibreOfficeAndroidX86.conf b/distro-configs/LibreOfficeAndroidX86.conf
index 0d8f4fd..590d069 100644
--- a/distro-configs/LibreOfficeAndroidX86.conf
+++ b/distro-configs/LibreOfficeAndroidX86.conf
@@ -18,7 +18,6 @@
--disable-systray
--without-junit
--without-ppds
---without-stlport
--without-helppack-integration
--without-myspell-dicts
--with-build-platform-configure-options=--disable-liblangtag
diff --git a/distro-configs/LibreOfficeiOS.conf b/distro-configs/LibreOfficeiOS.conf
index 6234d99..70bd6e4 100644
--- a/distro-configs/LibreOfficeiOS.conf
+++ b/distro-configs/LibreOfficeiOS.conf
@@ -24,4 +24,3 @@
--without-java
--without-junit
--without-ppds
---without-stlport
diff --git a/l10ntools/inc/helpmerge.hxx b/l10ntools/inc/helpmerge.hxx
index aefc873..77f1dd8 100644
--- a/l10ntools/inc/helpmerge.hxx
+++ b/l10ntools/inc/helpmerge.hxx
@@ -24,8 +24,6 @@
#include <rtl/strbuf.hxx>
#include <memory> /* auto_ptr */
-#define MOVEFILE_REPLACE_EXISTING 0x01
-
/// This Class is responsible for extracting/merging OpenOffice XML Helpfiles
class HelpParser
{
diff --git a/odk/setsdkenv_unix.csh.in b/odk/setsdkenv_unix.csh.in
index 567f406..c739414 100644
--- a/odk/setsdkenv_unix.csh.in
+++ b/odk/setsdkenv_unix.csh.in
@@ -129,11 +129,6 @@ switch (`${OO_SDK_HOME}/config.guess | cut -d"-" -f3,4`)
breaksw
case "linux-gnu":
- if ( $?OO_SDK_CPP_HOME == 0) then
- set sdk_gxx_include_path=`echo "#include <cstring>" | ${OO_SDK_CPP_HOME}/g++ -E -xc++ - | sed -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1`
- setenv SDK_GXX_INCLUDE_PATH ${sdk_gxx_include_path}
- endif
-
set directoryname=linux
set comid=gcc3
set pltfrm=gcc
@@ -150,11 +145,6 @@ switch (`${OO_SDK_HOME}/config.guess | cut -d"-" -f3,4`)
breaksw
case "darwin*":
- if ( $?OO_SDK_CPP_HOME == 0) then
- set sdk_gxx_include_path=`echo "#include <cstring>" | ${OO_SDK_CPP_HOME}/g++ -E -xc++ - | sed -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1`
- setenv SDK_GXX_INCLUDE_PATH ${sdk_gxx_include_path}
- endif
-
set directoryname=macosx
set comid=gcc3
set pltfrm=gcc
@@ -171,11 +161,6 @@ switch (`${OO_SDK_HOME}/config.guess | cut -d"-" -f3,4`)
breaksw
case "freebsd*":
- if ( $?OO_SDK_CPP_HOME == 0) then
- set sdk_gxx_include_path=`echo "#include <cstring>" | ${OO_SDK_CPP_HOME}/g++ -E -xc++ - | sed -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1`
- setenv SDK_GXX_INCLUDE_PATH ${sdk_gxx_include_path}
- endif
-
set directoryname=freebsd
set comid=gcc3
set pltfrm=gcc
diff --git a/odk/setsdkenv_unix.sh.in b/odk/setsdkenv_unix.sh.in
index de15276..1181548 100644
--- a/odk/setsdkenv_unix.sh.in
+++ b/odk/setsdkenv_unix.sh.in
@@ -156,12 +156,6 @@ case ${sdk_platform} in
;;
darwin*)
- if [ -n "$OO_SDK_CPP_HOME" ]
- then
- SDK_GXX_INCLUDE_PATH=`echo "#include <cstring>" | ${OO_SDK_CPP_HOME}/g++ -E -xc++ - | sed -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1`
- export SDK_GXX_INCLUDE_PATH
- fi
-
directoryname=macosx
comid=gcc3
pltfrm=gcc
@@ -173,12 +167,6 @@ case ${sdk_platform} in
;;
linux-gnu)
- if [ -n "$OO_SDK_CPP_HOME" ]
- then
- SDK_GXX_INCLUDE_PATH=`echo "#include <cstring>" | ${OO_SDK_CPP_HOME}/g++ -E -xc++ - | sed -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1`
- export SDK_GXX_INCLUDE_PATH
- fi
-
directoryname=linux
comid=gcc3
pltfrm=gcc
@@ -190,12 +178,6 @@ case ${sdk_platform} in
;;
freebsd*)
- if [ -n "$OO_SDK_CPP_HOME" ]
- then
- SDK_GXX_INCLUDE_PATH=`echo "#include <cstring>" | ${OO_SDK_CPP_HOME}/g++ -E -xc++ - | sed -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1`
- export SDK_GXX_INCLUDE_PATH
- fi
-
directoryname=freebsd
comid=gcc3
pltfrm=gcc
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index ed7aff6..a71be27 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -228,9 +228,9 @@ SDK_JAVA_INCLUDES = -I"$(OO_SDK_JAVA_HOME)/include" -I"$(OO_SDK_JAVA_HOME)/inclu
# -DCPPU_ENV=sunpro5 -- sunpro cc 5.x solaris sparc/intel
#CC_DEFINES_JNI=-DUNX -DSOLARIS -DCPPU_ENV=sunpro5
-CC_DEFINES_JNI=-DUNX -DSOLARIS -DCPPU_ENV=$(CPPU_ENV) -DGCC -DGXX_INCLUDE_PATH=$(SDK_GXX_INCLUDE_PATH)
+CC_DEFINES_JNI=-DUNX -DSOLARIS -DCPPU_ENV=$(CPPU_ENV) -DGCC
#CC_DEFINES=-DUNX -DSOLARIS -DSPARC -DCPPU_ENV=sunpro5 -DHAVE_GCC_VISIBILITY_FEATURE
-CC_DEFINES=-DUNX -DSOLARIS -DSPARC -DCPPU_ENV=$(CPPU_ENV) -DHAVE_GCC_VISIBILITY_FEATURE -DGCC -DGXX_INCLUDE_PATH=$(SDK_GXX_INCLUDE_PATH)
+CC_DEFINES=-DUNX -DSOLARIS -DSPARC -DCPPU_ENV=$(CPPU_ENV) -DHAVE_GCC_VISIBILITY_FEATURE -DGCC
CC_OUTPUT_SWITCH=-o
#LIBRARY_LINK_FLAGS=-w -mt -z combreloc -PIC -temp=/tmp '-R$$ORIGIN' -z text -norunpath -G -Bdirect -Bdynamic -lpthread -lCrun -lc -lm
@@ -358,8 +358,8 @@ endif
SDK_JAVA_INCLUDES = -I"$(OO_SDK_JAVA_HOME)/include" -I"$(OO_SDK_JAVA_HOME)/include/linux"
CC_INCLUDES=-I. -I$(OUT)/inc -I$(OUT)/inc/examples -I$(PRJ)/include
-CC_DEFINES_JNI=-DUNX -DGCC -DLINUX -DCPPU_ENV=$(CPPU_ENV) -DGXX_INCLUDE_PATH=$(SDK_GXX_INCLUDE_PATH)
-CC_DEFINES=-DUNX -DGCC -DLINUX -DCPPU_ENV=$(CPPU_ENV) -DGXX_INCLUDE_PATH=$(SDK_GXX_INCLUDE_PATH) -DHAVE_GCC_VISIBILITY_FEATURE
+CC_DEFINES_JNI=-DUNX -DGCC -DLINUX -DCPPU_ENV=$(CPPU_ENV)
+CC_DEFINES=-DUNX -DGCC -DLINUX -DCPPU_ENV=$(CPPU_ENV) -DHAVE_GCC_VISIBILITY_FEATURE
CC_OUTPUT_SWITCH=-o
@@ -479,8 +479,8 @@ endif
SDK_JAVA_INCLUDES = -I/System/Library/Frameworks/JavaVM.framework/Versions/Current/Headers -I/System/Library/Frameworks/JavaVM.framework/Headers
CC_INCLUDES=-I. -I$(OUT)/inc -I$(OUT)/inc/examples -I$(PRJ)/include
-CC_DEFINES_JNI=-DUNX -DGCC -DMACOSX -DCPPU_ENV=$(CPPU_ENV) -DGXX_INCLUDE_PATH=$(SDK_GXX_INCLUDE_PATH)
-CC_DEFINES=-DUNX -DGCC -DMACOSX -DCPPU_ENV=$(CPPU_ENV) -DGXX_INCLUDE_PATH=$(SDK_GXX_INCLUDE_PATH) -DHAVE_GCC_VISIBILITY_FEATURE
+CC_DEFINES_JNI=-DUNX -DGCC -DMACOSX -DCPPU_ENV=$(CPPU_ENV)
+CC_DEFINES=-DUNX -DGCC -DMACOSX -DCPPU_ENV=$(CPPU_ENV) -DHAVE_GCC_VISIBILITY_FEATURE
CC_OUTPUT_SWITCH=-o
@@ -593,8 +593,8 @@ endif
SDK_JAVA_INCLUDES = -I"$(OO_SDK_JAVA_HOME)/include" -I"$(OO_SDK_JAVA_HOME)/include/freebsd"
CC_INCLUDES=-I. -I$(OUT)/inc -I$(OUT)/inc/examples -I$(PRJ)/include
-CC_DEFINES_JNI=-DUNX -DGCC -DFREEBSD -DCPPU_ENV=$(CPPU_ENV) -DGXX_INCLUDE_PATH=$(SDK_GXX_INCLUDE_PATH)
-CC_DEFINES=-DUNX -DGCC -DFREEBSD -DCPPU_ENV=$(CPPU_ENV) -DGXX_INCLUDE_PATH=$(SDK_GXX_INCLUDE_PATH) -DHAVE_GCC_VISIBILITY_FEATURE
+CC_DEFINES_JNI=-DUNX -DGCC -DFREEBSD -DCPPU_ENV=$(CPPU_ENV)
+CC_DEFINES=-DUNX -DGCC -DFREEBSD -DCPPU_ENV=$(CPPU_ENV) -DHAVE_GCC_VISIBILITY_FEATURE
CC_OUTPUT_SWITCH=-o
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index 8760aef..fbeebca 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,2 +1,2 @@
-po postprocess :: CRASHREP:crashrep HELP:helpcontent2 ODK:odk MYSQLC:mysqlc DESKTOP:setup_native STLPORT:stlport sysui tail_build NULL
+po postprocess :: CRASHREP:crashrep HELP:helpcontent2 ODK:odk MYSQLC:mysqlc DESKTOP:setup_native sysui tail_build NULL
po postprocess\prj nmake - all po_prj NULL
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 13bb7b7..2671051 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -461,8 +461,6 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Msvcp70_So,
gid_File_Lib_Msvcr70_So,
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 a53ddcb..50c42b2 100755
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -842,44 +842,6 @@ Unixlink gid_Unixlink_File_Dl_Libxml2
End
#endif
-#if defined WITH_STLPORT
-File gid_File_Dl_Stlport
- LIB_FILE_BODY;
- Dir = SCP2_URE_DL_DIR;
-#if defined _gcc3 && defined WNT
-#if defined _DEBUG_RUNTIME
- Name = SCP2_URE_DL_NORMAL("libstlport_gcc_stldebug");
-#else
- Name = SCP2_URE_DL_NORMAL("libstlport_gcc");
-#endif
-#elif defined _gcc3
-#if defined _DEBUG_RUNTIME
- 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 _DEBUG_RUNTIME
- Name = SCP2_URE_DL_NORMAL("stlport_sunpro_debug");
-#else
- Name = SCP2_URE_DL_NORMAL("stlport_sunpro");
-#endif
-#endif
-#elif defined _MSC_VER
-#if defined _DEBUG_RUNTIME
- Name = SCP2_URE_DL_NORMAL("stlport_vc71_stldebug45");
-#else
- Name = SCP2_URE_DL_NORMAL("stlport_vc7145");
-#endif
-#endif
- Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
- // CompID = "D976338D-D2A5-4D29-B765-D3AC43181C7F";
-End
-#endif
-
#if defined(WNT) && defined( _gcc3 )
#if defined(MINGW_GCCDLL)
@@ -1102,7 +1064,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_Lib_Mingw_GccS_Ure,
gid_File_Lib_Mingw_Stdcpp_Ure,
gid_File_Dl_Unicows,
diff --git a/slideshow/source/engine/usereventqueue.cxx b/slideshow/source/engine/usereventqueue.cxx
index 945801b..0ded7aa 100644
--- a/slideshow/source/engine/usereventqueue.cxx
+++ b/slideshow/source/engine/usereventqueue.cxx
@@ -466,7 +466,7 @@ protected:
{
// this looks funny, since ::std::map does
// provide an erase( iterator )
- // method. Unfortunately, stlport does not
+ // method. Unfortunately, C++ does not
// declare the obvious erase(
// reverse_iterator ) needed here (missing
// orthogonality, eh?)
diff --git a/solenv/doc/gbuild/solenv/gbuild/gbuild.mk b/solenv/doc/gbuild/solenv/gbuild/gbuild.mk
index 6bb3a58..b0354f7 100644
--- a/solenv/doc/gbuild/solenv/gbuild/gbuild.mk
+++ b/solenv/doc/gbuild/solenv/gbuild/gbuild.mk
@@ -21,7 +21,6 @@ static const Path JAVA_HOME;
static const Path UPD;
static const String LIBXML_CFLAGS;
static const String OS;
-static const String STLPORT_VER;
static const Bool DEBUG;
static const Bool PRODUCT;
@@ -70,7 +69,6 @@ namespace gb
static const Path SDKDIR;
};
-// GXX_INCLUDE_PATH (Linux)
// PTHREAD_CFLAGS (Linux)
// SYSTEM_ICU (Linux)
// SYSTEM_JPEG (Linux)
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 5898cde..1970d54 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -40,7 +40,6 @@ GBUILDDIR:=$(SRCDIR)/solenv/gbuild
# SOLARLIB
# UPD
-# GXX_INCLUDE_PATH (Linux)
# PTHREAD_CFLAGS (Linux)
# SYSTEM_ICU (Linux)
# SYSTEM_JPEG (Linux)
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index 123a796..b9edab0 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -40,10 +40,6 @@ gb_GccLess470 := $(shell expr $(gb_CCVER) \< 40700)
gb_RC := $(WINDRES)
-ifeq ($(GXX_INCLUDE_PATH),)
-GXX_INCLUDE_PATH=$(COMPATH)/include/c++/$(shell gcc -dumpversion)
-endif
-
gb_COMPILERDEFS += \
-D_MT \
-D_NATIVE_WCHAR_T_DEFINED \
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
index 3eca80e..8709c36 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -57,7 +57,6 @@ gb_CPPU_ENV := gcc3
gb_COMPILERDEFS := \
-D$(COM) \
-DCPPU_ENV=$(gb_CPPU_ENV) \
- -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) \
gb_CFLAGS_COMMON := \
-Wall \
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index 2768fc5..1ae3f3c 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -59,10 +59,6 @@ gb_OSDEFS := \
-DUNX \
$(PTHREAD_CFLAGS) \
-ifeq ($(GXX_INCLUDE_PATH),)
-GXX_INCLUDE_PATH=$(COMPATH)/include/c++/$(shell gcc -dumpversion)
-endif
-
gb_CFLAGS := \
$(gb_CFLAGS_COMMON) \
-fPIC \
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index d6b67be..eaa567e 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -44,10 +44,6 @@ gb_OSDEFS := \
-DUNX \
$(PTHREAD_CFLAGS) \
-ifeq ($(GXX_INCLUDE_PATH),)
-GXX_INCLUDE_PATH=$(COMPATH)/include/c++/$(shell gcc -dumpversion)
-endif
-
gb_CFLAGS := \
$(gb_CFLAGS_COMMON) \
-fPIC \
diff --git a/solenv/inc/prewin.h b/solenv/inc/prewin.h
index c7041b0..837dfa0 100644
--- a/solenv/inc/prewin.h
+++ b/solenv/inc/prewin.h
@@ -46,6 +46,7 @@ extern "C" {
#endif
#ifdef _MSC_VER
#pragma warning(push, 1)
+#pragma warning (disable: 4005)
#endif
#include <windows.h>
#ifdef _MSC_VER
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 6ab5211..dbb513d 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -1030,12 +1030,6 @@ COMID=$(COM)
.ENDIF "$(USE_JAVAVER)"!=""
.ENDIF # "$(SOLAR_JAVA)"=="TRUE"
-.IF "$(COM)"=="GCC"
-GXX_INCLUDE_PATH*:=$(COMPATH)/include/c++/$(CCVER)
-.EXPORT : GXX_INCLUDE_PATH
-CDEFS+= -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH)
-.ENDIF
-
# --- extend new environment ----------------------------------
CDEFS+= -DSUPD=$(UPD)
diff --git a/stlport/README b/stlport/README
deleted file mode 100644
index 5e4603f..0000000
--- a/stlport/README
+++ /dev/null
@@ -1,4 +0,0 @@
-The STLPort library
-
-This is used for compatibility for old extensions for architectures
-where STLPort used to be used. Noawadays we use platform native STL.
\ No newline at end of file
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 ea21ff9..0000000
--- a/stlport/STLport-4.0.patch
+++ /dev/null
@@ -1,4943 +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
-
- #ifdef __STL_USE_NAMESPACES
- # ifdef __STL_BROKEN_USING_DIRECTIVE
-*** misc/STLport-4.0/stlport/old_hp/iterator.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/old_hp/iterator.h Thu Aug 25 15:54:55 2005
-***************
-*** 82,87 ****
---- 82,90 ----
-
- # if 0 // defined (__STL_USE_OWN_NAMESPACE) && defined (__STL_IMPORT_VENDOR_STD) && !defined (__STL_BROKEN_USING_DIRECTIVE)
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- using __STL_VENDOR_STD::istream_iterator;
-***************
-*** 88,93 ****
---- 91,99 ----
- using __STL_VENDOR_STD::ostream_iterator;
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # endif
-
-*** misc/STLport-4.0/stlport/stl/_algo.c Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_algo.c Thu Aug 25 15:54:57 2005
-***************
-*** 26,31 ****
---- 26,34 ----
- #ifndef __STL_ALGO_C
- # define __STL_ALGO_C
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- template <class _BidirectionalIter, class _Distance>
-***************
-*** 2663,2668 ****
---- 2666,2674 ----
- # endif /* __STL_NO_EXTENSIONS */
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # undef __stl_threshold
-
-*** misc/STLport-4.0/stlport/stl/_algo.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_algo.h Thu Aug 25 15:54:57 2005
-***************
-*** 51,56 ****
---- 51,59 ----
- # include <cstdio>
- # endif
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- // for_each. Apply a function to every element of a range.
-***************
-*** 1039,1044 ****
---- 1042,1050 ----
- # endif
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # if !defined (__STL_LINK_TIME_INSTANTIATION)
- # include <stl/_algo.c>
-*** misc/STLport-4.0/stlport/stl/_algobase.c Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_algobase.c Thu Aug 25 15:54:57 2005
-***************
-*** 25,30 ****
---- 25,33 ----
- #ifndef __SGI_STL_ALGOBASE_C
- #define __SGI_STL_ALGOBASE_C
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- template <class _InputIter1, class _InputIter2>
-***************
-*** 89,94 ****
---- 92,100 ----
- }
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- #endif /* __SGI_STL_ALGOBASE_C */
-
-*** misc/STLport-4.0/stlport/stl/_algobase.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_algobase.h Thu Aug 25 15:54:57 2005
-***************
-*** 67,72 ****
---- 67,75 ----
- # include <stl/_iterator_base.h>
- #endif
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
- // swap and iter_swap
- template <class _Tp>
-***************
-*** 679,684 ****
---- 682,690 ----
- _InputIter2 __first2, _InputIter2 __last2);
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # if !defined (__STL_LINK_TIME_INSTANTIATION)
- # include <stl/_algobase.c>
-*** misc/STLport-4.0/stlport/stl/_alloc.c Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_alloc.c Thu Aug 25 15:54:57 2005
-***************
-*** 40,45 ****
---- 40,48 ----
-
- #define _S_FREELIST_INDEX(__bytes) ((__bytes-size_t(1))>>(int)_ALIGN_SHIFT)
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- template <int __inst>
-***************
-*** 355,360 ****
---- 358,366 ----
- # endif /* __STL_STATIC_TEMPLATE_DATA */
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # undef _S_FREELIST_INDEX
-
-*** misc/STLport-4.0/stlport/stl/_alloc.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_alloc.h Thu Aug 25 15:54:57 2005
-***************
-*** 115,120 ****
---- 115,123 ----
- // conformance.
- # endif
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- template <class _Tp, class _Alloc>
-***************
-*** 893,898 ****
---- 896,904 ----
- # endif /* __STL_USE_TEMPLATE_EXPORT */
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # if !defined (__STL_LINK_TIME_INSTANTIATION)
- # include <stl/_alloc.c>
-*** misc/STLport-4.0/stlport/stl/_bitset.c Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_bitset.c Thu Aug 25 15:54:57 2005
-***************
-*** 26,31 ****
---- 26,34 ----
- # define bitset __bitset
- # endif
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- //
-***************
-*** 396,401 ****
---- 399,407 ----
- }; // end _First_one
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # undef __BITS_PER_WORD
- # undef __BITSET_WORDS
-*** misc/STLport-4.0/stlport/stl/_bitset.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_bitset.h Thu Aug 25 15:54:57 2005
-***************
-*** 67,72 ****
---- 67,75 ----
- #define __BITS_PER_WORD (CHAR_BIT*sizeof(unsigned long))
- #define __BITSET_WORDS(__n) ((__n) < 1 ? 1 : ((__n) + __BITS_PER_WORD - 1)/__BITS_PER_WORD)
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- // structure to aid in counting bits
-***************
-*** 753,758 ****
---- 756,764 ----
- # undef bitset
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # undef __BITS_PER_WORD
- # undef __BITSET_WORDS
-*** misc/STLport-4.0/stlport/stl/_bvector.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_bvector.h Thu Aug 25 15:54:57 2005
-***************
-*** 44,49 ****
---- 44,52 ----
- # include <stl/_range_errors.h>
- # endif
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- struct _Bit_reference {
-***************
-*** 72,77 ****
---- 75,83 ----
- };
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # if defined (__SGI_STL_NO_ARROW_OPERATOR) && ! defined (__STL_NO_PROXY_ARROW_OPERATOR)
-
-***************
-*** 87,92 ****
---- 93,101 ----
-
- # endif
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- inline void swap(_Bit_reference __x, _Bit_reference __y)
-***************
-*** 827,832 ****
---- 836,844 ----
- #endif
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- #undef _Alloc
- #undef __SGI_STL_VECBOOL_TEMPLATE
-*** misc/STLport-4.0/stlport/stl/_codecvt.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_codecvt.h Thu Aug 25 15:54:57 2005
-***************
-*** 26,31 ****
---- 26,34 ----
- #include <stl/c_locale.h>
- #include <stl/_locale.h>
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- class __STL_CLASS_DECLSPEC codecvt_base {
-***************
-*** 295,300 ****
---- 298,306 ----
- # endif
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- #endif /* __SGI_STL_INTERNAL_CODECVT_H */
-
-*** misc/STLport-4.0/stlport/stl/_collate.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_collate.h Thu Aug 25 15:54:57 2005
-***************
-*** 26,31 ****
---- 26,34 ----
- #include <stl/_string_fwd.h>
- #include <stl/_locale.h>
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
-
-***************
-*** 154,159 ****
---- 157,165 ----
-
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- #endif /* __SGI_STL_INTERNAL_COLLATE_H */
-
-*** misc/STLport-4.0/stlport/stl/_complex.c Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_complex.c Thu Aug 25 15:54:57 2005
-***************
-*** 18,23 ****
---- 18,26 ----
- #ifndef __STL_COMPLEX_C
- #define __STL_COMPLEX_C
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- // Non-inline member functions.
-***************
-*** 154,158 ****
---- 157,164 ----
- #endif /* __STL_USE_NEW_IOSTREAMS */
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- #endif /* __STL_COMPLEX_C */
-*** misc/STLport-4.0/stlport/stl/_complex.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_complex.h Thu Aug 25 15:54:57 2005
-***************
-*** 52,57 ****
---- 52,60 ----
- #include <istream>
- #include <sstream>
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- #if !defined(__STL_NO_COMPLEX_SPECIALIZATIONS) //*TY 02/25/2000 - added for MPW compiler workaround
-***************
-*** 656,661 ****
---- 659,667 ----
- # endif /* SPECIALIZATIONS */
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
-
- #if defined (__sgi) && !defined(__GNUC__)
-***************
-*** 721,726 ****
---- 727,735 ----
- # define __STL_HYPOT __STL_DO_HYPOT(double)
-
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- // Unary non-member arithmetic operators.
-***************
-*** 1051,1056 ****
---- 1060,1068 ----
- __STL_DECLSPEC complex<long double> __STL_CALL tanh(const complex<long double>&);
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
-
- # ifndef __STL_LINK_TIME_INSTANTIATION
-*** misc/STLport-4.0/stlport/stl/_config.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_config.h Thu Aug 25 15:55:22 2005
-***************
-*** 540,547 ****
---- 540,553 ----
-
- # define __STL_USING_NAMESPACE(x) using namespace x ;
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- namespace std { }
- namespace __std_alias = std;
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- /* assume std:: namespace for C++ std library if not being told otherwise */
- # ifdef __STL_VENDOR_GLOBAL_STD
-*** misc/STLport-4.0/stlport/stl/_construct.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_construct.h Thu Aug 25 15:54:57 2005
-***************
-*** 46,51 ****
---- 46,54 ----
- # include <stl/_iterator_base.h>
- #endif
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- # ifdef __STL_TRIVIAL_DESTRUCTOR_BUG
-***************
-*** 159,164 ****
---- 162,170 ----
- }
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- #endif /* __SGI_STL_INTERNAL_CONSTRUCT_H */
-
-*** misc/STLport-4.0/stlport/stl/_ctraits_fns.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_ctraits_fns.h Thu Aug 25 15:54:57 2005
-***************
-*** 25,30 ****
---- 25,33 ----
- // This file contains a few small adapters that allow a character
- // traits class to be used as a function object.
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- template <class _Traits>
-***************
-*** 61,66 ****
---- 64,72 ----
- };
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- #endif /* __SGI_STL_INTERNAL_CTRAITS_FUNCTIONS_H */
-
-*** misc/STLport-4.0/stlport/stl/_ctype.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_ctype.h Thu Aug 25 15:54:57 2005
-***************
-*** 28,33 ****
---- 28,36 ----
- # include <stl/_algobase.h>
- # endif
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- class __STL_CLASS_DECLSPEC ctype_base {
-***************
-*** 264,269 ****
---- 267,275 ----
-
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- #endif /* __SGI_STL_INTERNAL_CTYPE_H */
-
-*** misc/STLport-4.0/stlport/stl/_deque.c Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_deque.c Thu Aug 25 15:54:57 2005
-***************
-*** 26,31 ****
---- 26,34 ----
- #ifndef __STL_DEQUE_C
- #define __STL_DEQUE_C
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- // Non-inline member functions from _Deque_base.
-***************
-*** 778,783 ****
---- 781,789 ----
- # endif /* __STL_MEMBER_TEMPLATES */
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # undef __iterator__
- # undef iterator
-*** misc/STLport-4.0/stlport/stl/_deque.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_deque.h Thu Aug 25 15:54:57 2005
-***************
-*** 96,101 ****
---- 96,104 ----
- # undef deque
- # define deque __WORKAROUND_DBG_RENAME(deque)
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- # if defined ( __STL_USE_ABBREVS )
-***************
-*** 1058,1063 ****
---- 1061,1069 ----
- # endif
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- // do a cleanup
- # undef deque
-*** misc/STLport-4.0/stlport/stl/_fstream.c Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_fstream.c Thu Aug 25 15:54:57 2005
-***************
-*** 20,25 ****
---- 20,28 ----
-
- # if defined (__STL_DESIGNATED_DLL) || ! defined (__STL_NO_CUSTOM_IO)
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- # if defined ( __STL_NESTED_TYPE_PARAM_BUG )
-***************
-*** 732,737 ****
---- 735,743 ----
- }
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # undef __BF_int_type__
- # undef __BF_pos_type__
-*** misc/STLport-4.0/stlport/stl/_fstream.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_fstream.h Thu Aug 25 15:54:57 2005
-***************
-*** 61,66 ****
---- 61,69 ----
- #endif
-
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- //----------------------------------------------------------------------
-***************
-*** 644,654 ****
---- 647,663 ----
- };
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # if !defined (__STL_LINK_TIME_INSTANTIATION)
- # include <stl/_fstream.c>
- # endif
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- # if defined (__STL_USE_TEMPLATE_EXPORT)
-***************
-*** 663,668 ****
---- 672,680 ----
- # endif /* __STL_USE_TEMPLATE_EXPORT */
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- #endif /* __SGI_STL_FSTREAM */
-
-*** misc/STLport-4.0/stlport/stl/_function.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_function.h Thu Aug 25 15:54:57 2005
-***************
-*** 30,35 ****
---- 30,38 ----
- #ifndef __SGI_STL_INTERNAL_FUNCTION_H
- #define __SGI_STL_INTERNAL_FUNCTION_H
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- template <class _Arg, class _Result>
-***************
-*** 805,810 ****
---- 808,816 ----
- # endif /* __STL_MEMBER_POINTER_PARAM_BUG */
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- #endif /* __SGI_STL_INTERNAL_FUNCTION_H */
-
-*** misc/STLport-4.0/stlport/stl/_hash_fun.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_hash_fun.h Thu Aug 25 15:54:58 2005
-***************
-*** 35,40 ****
---- 35,43 ----
- # include <cstddef>
- # endif
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- template <class _Key> struct hash { };
-***************
-*** 99,104 ****
---- 102,110 ----
- # endif
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- #endif /* __SGI_STL_HASH_FUN_H */
-
-*** misc/STLport-4.0/stlport/stl/_hash_map.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_hash_map.h Thu Aug 25 15:54:58 2005
-***************
-*** 30,35 ****
---- 30,38 ----
- #ifndef __SGI_STL_INTERNAL_HASH_MAP_H
- #define __SGI_STL_INTERNAL_HASH_MAP_H
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- # define hash_map __WORKAROUND_RENAME(hash_map)
-***************
-*** 489,494 ****
---- 492,500 ----
-
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # if defined (__STL_USE_WRAPPER_FOR_ALLOC_PARAM)
- # include <stl/wrappers/_hash_map.h>
-*** misc/STLport-4.0/stlport/stl/_hash_set.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_hash_set.h Thu Aug 25 15:54:58 2005
-***************
-*** 33,38 ****
---- 33,41 ----
- # define hash_set __WORKAROUND_RENAME(hash_set)
- # define hash_multiset __WORKAROUND_RENAME(hash_multiset)
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- template <class _Value, __DFL_TMPL_PARAM(_HashFcn,hash<_Value>),
-***************
-*** 468,473 ****
---- 471,479 ----
-
- #endif /* __STL_CLASS_PARTIAL_SPECIALIZATION */
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- // do a cleanup
- # undef hash_set
-*** misc/STLport-4.0/stlport/stl/_hashtable.c Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_hashtable.c Thu Aug 25 15:54:58 2005
-***************
-*** 30,35 ****
---- 30,38 ----
- # define hashtable __WORKAROUND_DBG_RENAME(hashtable)
- #endif
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- # define __PRIME_LIST_BODY { \
-***************
-*** 441,446 ****
---- 444,452 ----
- # undef hashtable
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- #endif /* __STL_HASHTABLE_C */
-
-*** misc/STLport-4.0/stlport/stl/_hashtable.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_hashtable.h Thu Aug 25 15:54:58 2005
-***************
-*** 57,62 ****
---- 57,65 ----
- # define hashtable __WORKAROUND_DBG_RENAME(hashtable)
- #endif
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- # if defined ( __STL_USE_ABBREVS )
-***************
-*** 606,611 ****
---- 609,617 ----
- #endif /* __STL_USE_SEPARATE_RELOPS_NAMESPACE */
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # undef __stl_prime_list
- # undef hashtable
-*** misc/STLport-4.0/stlport/stl/_heap.c Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_heap.c Thu Aug 25 15:54:58 2005
-***************
-*** 30,35 ****
---- 30,38 ----
- # include <stl/_iterator_base.h>
- #endif
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- template <class _RandomAccessIterator, class _Distance, class _Tp>
-***************
-*** 234,239 ****
---- 237,245 ----
- }
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- #endif /* __STL_HEAP_C */
-
-*** misc/STLport-4.0/stlport/stl/_heap.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_heap.h Thu Aug 25 15:54:58 2005
-***************
-*** 34,39 ****
---- 34,42 ----
- #include <stl/_config.h>
- #endif
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- // Heap-manipulation functions: push_heap, pop_heap, make_heap, sort_heap.
-***************
-*** 117,122 ****
---- 120,128 ----
- }
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # if !defined (__STL_LINK_TIME_INSTANTIATION)
- # include <stl/_heap.c>
-*** misc/STLport-4.0/stlport/stl/_ios.c Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_ios.c Thu Aug 25 15:54:58 2005
-***************
-*** 20,25 ****
---- 20,28 ----
-
- # include <stl/_streambuf.h>
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- // basic_ios<>'s non-inline member functions
-***************
-*** 107,111 ****
---- 110,117 ----
- }
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- #endif /* __STL_IOS_C */
-*** misc/STLport-4.0/stlport/stl/_ios.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_ios.h Thu Aug 25 15:54:58 2005
-***************
-*** 26,31 ****
---- 26,34 ----
- #include <stl/_locale.h>
- #include <stl/_ctype.h>
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- // ----------------------------------------------------------------------
-***************
-*** 171,176 ****
---- 174,182 ----
-
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # if !defined (__STL_LINK_TIME_INSTANTIATION)
- # include <stl/_ios.c>
-*** misc/STLport-4.0/stlport/stl/_ios_base.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_ios_base.h Thu Aug 25 15:54:58 2005
-***************
-*** 24,29 ****
---- 24,32 ----
- #include <iosfwd>
- #include <stl/_locale.h>
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- // ----------------------------------------------------------------------
-***************
-*** 365,370 ****
---- 368,376 ----
- { __s.setf(ios_base::scientific, ios_base::floatfield); return __s; }
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- #endif /* __SGI_STL_IOS_BASE */
-
-*** misc/STLport-4.0/stlport/stl/_iosfwd.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_iosfwd.h Thu Aug 25 15:54:58 2005
-***************
-*** 28,33 ****
---- 28,36 ----
- #endif /* __unix */
-
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- template <class _Tp> class allocator;
-***************
-*** 110,118 ****
---- 113,127 ----
- typedef fpos<mbstate_t> wstreampos;
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- #include <stl/char_traits.h>
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- class __STL_CLASS_DECLSPEC ios_base;
-***************
-*** 245,250 ****
---- 254,262 ----
- # endif
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- #endif
-
-*** misc/STLport-4.0/stlport/stl/_istream.c Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_istream.c Thu Aug 25 15:54:58 2005
-***************
-*** 32,37 ****
---- 32,40 ----
- # define __BIS_off_type__ __STL_TYPENAME_ON_RETURN_TYPE basic_istream<_CharT, _Traits>::off_type
- # endif
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
-
-***************
-*** 1269,1274 ****
---- 1272,1280 ----
- {}
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # undef __BIS_int_type__
- # undef __BIS_pos_type__
-*** misc/STLport-4.0/stlport/stl/_istream.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_istream.h Thu Aug 25 15:54:58 2005
-***************
-*** 27,32 ****
---- 27,35 ----
- #include <stl/_ctraits_fns.h> // Helper functions that allow char traits
- // to be used as function objects.
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- template <class _CharT, class _Traits, class _Number>
-***************
-*** 470,475 ****
---- 473,481 ----
- # endif /* __STL_USE_TEMPLATE_EXPORT */
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # if !defined (__STL_LINK_TIME_INSTANTIATION)
- # include <stl/_istream.c>
-*** misc/STLport-4.0/stlport/stl/_iterator.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_iterator.h Thu Aug 25 15:54:58 2005
-***************
-*** 34,39 ****
---- 34,42 ----
- # include <stl/_iterator_base.h>
- #endif
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- # if defined (__STL_NO_CLASS_PARTIAL_SPECIALIZATION) || ! defined (__STL_NO_ANACHRONISMS)
-***************
-*** 574,579 ****
---- 577,585 ----
- }
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- #endif /* __SGI_STL_INTERNAL_ITERATOR_H */
-
-*** misc/STLport-4.0/stlport/stl/_iterator_base.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_iterator_base.h Thu Aug 25 15:54:58 2005
-***************
-*** 57,62 ****
---- 57,65 ----
- # define _Nonconst_traits _N_Tr
- # endif
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- struct input_iterator_tag {};
-***************
-*** 143,149 ****
---- 146,158 ----
- # define __STL_POINTERS_SPECIALIZE( _TpP )
- # else
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
- # include <stl/_ptrs_specialize.h>
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
- # endif
-
-***************
-*** 421,426 ****
---- 430,438 ----
- }
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # if defined (__STL_DEBUG) && ! defined (__STLPORT_DEBUG_H)
- # include <stl/debug/_debug.h>
-*** misc/STLport-4.0/stlport/stl/_limits.c Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_limits.c Thu Aug 25 15:54:58 2005
-***************
-*** 24,29 ****
---- 24,32 ----
- // numeric_limits static members
- //==========================================================
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- # ifdef __STL_NO_STATIC_TEMPLATE_DATA
-***************
-*** 362,366 ****
---- 365,372 ----
- # undef __STL_LDOUBLE_SNAN_REP
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- #endif /* __STLPORT_LIMITS_C_INCLUDED */
-*** misc/STLport-4.0/stlport/stl/_limits.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_limits.h Thu Aug 25 15:54:58 2005
-***************
-*** 26,31 ****
---- 26,34 ----
-
- #define __SGI_CPP_LIMITS
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- enum float_round_style {
-***************
-*** 379,384 ****
---- 382,390 ----
- // We write special values (Inf and NaN) as bit patterns and
- // cast the the appropriate floating-point types.
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # if !defined (__STL_LINK_TIME_INSTANTIATION)
- # include <stl/_limits.c>
-*** misc/STLport-4.0/stlport/stl/_list.c Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_list.c Thu Aug 25 15:54:58 2005
-***************
-*** 34,39 ****
---- 34,42 ----
- # undef list
- # define list __WORKAROUND_DBG_RENAME(list)
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- template <class _Dummy>
-***************
-*** 334,339 ****
---- 337,345 ----
- # undef __iterator__
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- #endif /* __STL_LIST_C */
-
-*** misc/STLport-4.0/stlport/stl/_list.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_list.h Thu Aug 25 15:54:58 2005
-***************
-*** 46,51 ****
---- 46,54 ----
- # include <stl/_construct.h>
- # endif
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- # undef list
-***************
-*** 268,274 ****
-
- reference front() { return *begin(); }
- const_reference front() const { return *begin(); }
-! reference back() { return *(--end()); }
- const_reference back() const { return *(--end()); }
-
- void swap(list<_Tp, _Alloc>& __x) {
---- 271,277 ----
-
- reference front() { return *begin(); }
- const_reference front() const { return *begin(); }
-! reference back() { iterator i(end()); --i; return *i; }
- const_reference back() const { return *(--end()); }
-
- void swap(list<_Tp, _Alloc>& __x) {
-***************
-*** 588,593 ****
---- 591,599 ----
- #endif /* __STL_USE_SEPARATE_RELOPS_NAMESPACE */
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # if !defined (__STL_LINK_TIME_INSTANTIATION)
- # include <stl/_list.c>
-*** misc/STLport-4.0/stlport/stl/_locale.c Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_locale.c Thu Aug 25 15:54:58 2005
-***************
-*** 23,28 ****
---- 23,31 ----
- #include <stl/_string.h>
- #include <stl/_collate.h>
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- //----------------------------------------------------------------------
-***************
-*** 66,70 ****
---- 69,76 ----
- # endif /* MEMBER_TEMPLATES */
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- #endif
-*** misc/STLport-4.0/stlport/stl/_locale.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_locale.h Thu Aug 25 15:54:58 2005
-***************
-*** 28,33 ****
---- 28,36 ----
- #include <stl/_threads.h>
- #include <stl/_string_fwd.h>
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- class __STL_CLASS_DECLSPEC _Locale_impl; // Forward declaration of opaque type.
-***************
-*** 212,217 ****
---- 215,223 ----
- # endif
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # ifndef __STL_LINK_TIME_INSTANTIATION
- # include <stl/_locale.c>
-*** misc/STLport-4.0/stlport/stl/_map.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_map.h Thu Aug 25 15:54:58 2005
-***************
-*** 33,38 ****
---- 33,41 ----
- #define map __WORKAROUND_RENAME(map)
- #define multimap __WORKAROUND_RENAME(multimap)
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- template <class _Key, class _Tp, __DFL_TMPL_PARAM(_Compare, less<_Key> ),
-***************
-*** 384,389 ****
---- 387,395 ----
- # undef __STL_TEMPLATE_HEADER
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- // do a cleanup
- # undef map
-*** misc/STLport-4.0/stlport/stl/_messages_facets.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_messages_facets.h Thu Aug 25 15:54:58 2005
-***************
-*** 24,29 ****
---- 24,32 ----
- #ifndef __SGI_STL_INTERNAL_MESSAGES_H
- #define __SGI_STL_INTERNAL_MESSAGES_H
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- // Forward declaration of an opaque type.
-***************
-*** 150,155 ****
---- 153,161 ----
- # endif /* WCHAR_T */
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- #endif /* __SGI_STL_INTERNAL_MESSAGES_H */
-
-*** misc/STLport-4.0/stlport/stl/_monetary.c Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_monetary.c Thu Aug 25 15:54:58 2005
-***************
-*** 18,23 ****
---- 18,26 ----
- #ifndef __STL_MONETARY_C
- #define __STL_MONETARY_C
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- template <class _CharT, class _InputIterator>
-***************
-*** 557,561 ****
---- 560,567 ----
- # endif /* defined (__STL_NO_CUSTOM_IO) && ! defined (__STL_DESIGNATED_DLL) */
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- #endif /* __STL_MONETARY_C */
-*** misc/STLport-4.0/stlport/stl/_monetary.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_monetary.h Thu Aug 25 15:54:58 2005
-***************
-*** 25,30 ****
---- 25,33 ----
-
- # include <stl/_numeric_facets.h>
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- class money_base {
-***************
-*** 441,446 ****
---- 444,452 ----
- };
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # if !defined (__STL_LINK_TIME_INSTANTIATION)
- # include <stl/_monetary.c>
-*** misc/STLport-4.0/stlport/stl/_null_stream.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_null_stream.h Thu Aug 25 15:54:58 2005
-***************
-*** 16,21 ****
---- 16,24 ----
- #ifndef __STL_NULL_STREAM_H
- # define __STL_NULL_STREAM_H
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- struct __null_stream
-***************
-*** 38,42 ****
---- 41,48 ----
- extern __null_stream cin, cout, cerr, endl, ws, hex, dec;
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # endif
-*** misc/STLport-4.0/stlport/stl/_numeric.c Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_numeric.c Thu Aug 25 15:54:58 2005
-***************
-*** 34,39 ****
---- 34,42 ----
- # include <stl/_iterator_base.h>
- #endif
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- template <class _InputIterator, class _OutputIterator, class _Tp>
-***************
-*** 181,186 ****
---- 184,192 ----
- }
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- #endif /* __STL_NUMERIC_C */
-
-*** misc/STLport-4.0/stlport/stl/_numeric.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_numeric.h Thu Aug 25 15:54:58 2005
-***************
-*** 36,41 ****
---- 36,44 ----
- # include <stl/debug/_debug.h>
- # endif
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- template <class _InputIterator, class _Tp>
-***************
-*** 141,146 ****
---- 144,152 ----
- # endif
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # if !defined (__STL_LINK_TIME_INSTANTIATION)
- # include <stl/_numeric.c>
-*** misc/STLport-4.0/stlport/stl/_numeric_facets.c Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_numeric_facets.c Thu Aug 25 15:54:58 2005
-***************
-*** 21,26 ****
---- 21,29 ----
- #include <stl/_pair.h>
- # include <stl/_stream_iterator.h>
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
-
-***************
-*** 1083,1088 ****
---- 1086,1094 ----
- # endif /* __STL_NO_CUSTOM_IO */
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
-
- #endif /* __STL_NUMERIC_FACETS_C */
-*** misc/STLport-4.0/stlport/stl/_numeric_facets.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_numeric_facets.h Thu Aug 25 15:54:58 2005
-***************
-*** 27,32 ****
---- 27,35 ----
- # include <stl/_locale.h>
- # include <stl/_string.h>
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- //----------------------------------------------------------------------
-***************
-*** 524,529 ****
---- 527,535 ----
- # endif /* CUSTOM_IO */
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # ifndef __STL_LINK_TIME_INSTANTIATION
- # include <stl/_numeric_facets.c>
-*** misc/STLport-4.0/stlport/stl/_ostream.c Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_ostream.c Thu Aug 25 15:54:58 2005
-***************
-*** 20,25 ****
---- 20,28 ----
-
- #include <stl/_numeric_facets.h> // For num_put<>
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- //----------------------------------------------------------------------
-***************
-*** 346,351 ****
---- 349,357 ----
-
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
-
- #endif /* __STL_OSTREAM_C */
-*** misc/STLport-4.0/stlport/stl/_ostream.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_ostream.h Thu Aug 25 15:54:58 2005
-***************
-*** 24,29 ****
---- 24,32 ----
- #include <limits> // Needed for class numeric_limits<>.
- #include <streambuf> // For basic_streambuf.
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- template <class _CharT, class _Traits, class _Number>
-***************
-*** 309,314 ****
---- 312,320 ----
- }
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # undef __STL_MANIP_INLINE
-
-*** misc/STLport-4.0/stlport/stl/_pair.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_pair.h Thu Aug 25 15:54:58 2005
-***************
-*** 32,37 ****
---- 32,40 ----
- #define __SGI_STL_INTERNAL_PAIR_H
-
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- template <class _T1, class _T2>
-***************
-*** 127,132 ****
---- 130,138 ----
-
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- #endif /* __SGI_STL_INTERNAL_PAIR_H */
-
-*** misc/STLport-4.0/stlport/stl/_ptrs_specialize.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_ptrs_specialize.h Thu Aug 25 15:54:58 2005
-***************
-*** 107,112 ****
---- 107,115 ----
- __STL_ITERATOR_TRAITS_SPECIALIZE(_Type**, _Type**) \
- __STL_ITERATOR_TRAITS_SPECIALIZE(_Type** const, _Type** const) \
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
- # endif
-
- # define __STL_TYPE_TRAITS_POD_SPECIALIZE_V(_Type) \
-*** misc/STLport-4.0/stlport/stl/_queue.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_queue.h Thu Aug 25 15:54:58 2005
-***************
-*** 46,51 ****
---- 46,54 ----
- # include <stl/_function.h>
- #endif
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- # if ! defined ( __STL_LIMITED_DEFAULT_TEMPLATES )
-***************
-*** 197,202 ****
---- 200,208 ----
- };
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # undef __STL_QUEUE_ARGS
- # undef __STL_QUEUE_HEADER_ARGS
-*** misc/STLport-4.0/stlport/stl/_range_errors.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_range_errors.h Thu Aug 25 15:54:59 2005
-***************
-*** 37,47 ****
---- 37,53 ----
-
- #if defined (__STL_EXTERN_RANGE_ERRORS)
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
- void __STL_DECLSPEC __STL_CALL __stl_throw_range_error(const char* __msg);
- void __STL_DECLSPEC __STL_CALL __stl_throw_out_of_range(const char* __msg);
- void __STL_DECLSPEC __STL_CALL __stl_throw_length_error(const char* __msg);
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- // For other compilers where we're throwing range errors, include the
- // stdexcept header and throw the appropriate exceptions directly.
-***************
-*** 55,60 ****
---- 61,69 ----
- # include <string>
- #endif
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- inline void __STL_DECLSPEC __STL_CALL __stl_throw_range_error(const char* __msg) {
-***************
-*** 70,75 ****
---- 79,87 ----
- }
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- // Otherwise, define inline functions that do nothing.
- #else
-***************
-*** 76,81 ****
---- 88,96 ----
-
- # include <cstdlib>
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- inline void __STL_DECLSPEC __STL_CALL __stl_throw_range_error(const char*) { abort(); }
-***************
-*** 82,87 ****
---- 97,105 ----
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list