summaryrefslogtreecommitdiff
path: root/stlport
diff options
context:
space:
mode:
Diffstat (limited to 'stlport')
-rw-r--r--stlport/STLport-4.0-sunstudio12u1.patch21
-rw-r--r--stlport/STLport-4.0.patch4943
-rw-r--r--stlport/STLport-4.5-0119.patch1348
-rw-r--r--stlport/STLport-4.5-cxx0x.patch17
-rw-r--r--stlport/STLport-4.5-gcc43_warnings.patch113
-rw-r--r--stlport/STLport-4.5.patch1047
-rw-r--r--stlport/dos_lineends.patch60
-rw-r--r--stlport/makefile.mk178
-rw-r--r--stlport/prj/build.lst2
-rw-r--r--stlport/prj/d.lst3
-rw-r--r--stlport/win32_custom.bat11
-rwxr-xr-xstlport/win32_custom.sh9
-rwxr-xr-xstlport/win32_sdk.bat11
-rw-r--r--stlport/win32_sdk.sh9
14 files changed, 0 insertions, 7772 deletions
diff --git a/stlport/STLport-4.0-sunstudio12u1.patch b/stlport/STLport-4.0-sunstudio12u1.patch
deleted file mode 100644
index 49d76abbd..000000000
--- 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 ea21ff931..000000000
--- 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 ----
- inline void __STL_DECLSPEC __STL_CALL __stl_throw_length_error(const char*) { abort();}
- inline void __STL_DECLSPEC __STL_CALL __stl_throw_out_of_range(const char*) { abort(); }
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- #endif
-
-*** misc/STLport-4.0/stlport/stl/_raw_storage_iter.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_raw_storage_iter.h Thu Aug 25 15:54:59 2005
-***************
-*** 30,35 ****
---- 30,38 ----
- #ifndef __SGI_STL_INTERNAL_RAW_STORAGE_ITERATOR_H
- #define __SGI_STL_INTERNAL_RAW_STORAGE_ITERATOR_H
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- template <class _ForwardIterator, class _Tp>
-***************
-*** 70,75 ****
---- 73,81 ----
- inline output_iterator_tag __ITERATOR_CATEGORY(const raw_storage_iterator<_ForwardIterator, _Tp>&) { return output_iterator_tag(); }
- #endif
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- #endif /* __SGI_STL_INTERNAL_RAW_STORAGE_ITERATOR_H */
-
-*** misc/STLport-4.0/stlport/stl/_rope.c Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_rope.c Thu Aug 25 15:54:59 2005
-***************
-*** 37,42 ****
---- 37,45 ----
-
- # include <stl/_range_errors.h>
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- # if defined ( __STL_NESTED_TYPE_PARAM_BUG )
-***************
-*** 1529,1534 ****
---- 1532,1540 ----
- # undef size_type
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
- # endif /* ROPEIMPL_H */
-
- // Local Variables:
-*** misc/STLport-4.0/stlport/stl/_rope.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_rope.h Thu Aug 25 15:54:59 2005
-***************
-*** 75,80 ****
---- 75,83 ----
- # include <mutex.h>
- # endif
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
-
-***************
-*** 2491,2496 ****
---- 2494,2502 ----
- }
- }
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # if !defined (__STL_LINK_TIME_INSTANTIATION)
- # include <stl/_rope.c>
-*** misc/STLport-4.0/stlport/stl/_set.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_set.h Thu Aug 25 15:54:59 2005
-***************
-*** 37,42 ****
---- 37,45 ----
- #define set __WORKAROUND_RENAME(set)
- #define multiset __WORKAROUND_RENAME(multiset)
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- template <class _Key, __DFL_TMPL_PARAM(_Compare,less<_Key>),
-***************
-*** 341,346 ****
---- 344,352 ----
- # undef __STL_TEMPLATE_HEADER
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- // do a cleanup
- # undef set
-*** misc/STLport-4.0/stlport/stl/_slist.c Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_slist.c Thu Aug 25 15:54:59 2005
-***************
-*** 25,30 ****
---- 25,33 ----
- # define size_type size_t
- # endif
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- template <class _Tp, class _Alloc>
-***************
-*** 255,260 ****
---- 258,266 ----
- # undef size_type
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- #endif /* __STL_SLIST_C */
-
-*** misc/STLport-4.0/stlport/stl/_slist.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_slist.h Thu Aug 25 15:54:59 2005
-***************
-*** 55,60 ****
---- 55,63 ----
- # undef slist
- # define slist __WORKAROUND_DBG_RENAME(slist)
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- template <class _Tp>
-***************
-*** 730,735 ****
---- 733,741 ----
- #endif /* __STL_FUNCTION_TMPL_PARTIAL_ORDER */
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # if !defined (__STL_LINK_TIME_INSTANTIATION)
- # include <stl/_slist.c>
-***************
-*** 742,747 ****
---- 748,756 ----
- # include <stl/debug/_slist.h>
- #endif
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
- // Specialization of insert_iterator so that insertions will be constant
- // time rather than linear time.
-***************
-*** 783,788 ****
---- 792,800 ----
- #endif /* __STL_CLASS_PARTIAL_SPECIALIZATION */
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
-
- # if defined ( __STL_USE_WRAPPER_FOR_ALLOC_PARAM )
-*** misc/STLport-4.0/stlport/stl/_slist_base.c Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_slist_base.c Thu Aug 25 15:54:59 2005
-***************
-*** 26,31 ****
---- 26,34 ----
- #ifndef __STL_SLIST_BASE_C
- #define __STL_SLIST_BASE_C
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- template <class _Dummy>
-***************
-*** 92,97 ****
---- 95,103 ----
- }
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- #endif /* __STL_SLIST_BASE_C */
-
-*** misc/STLport-4.0/stlport/stl/_slist_base.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_slist_base.h Thu Aug 25 15:54:59 2005
-***************
-*** 31,36 ****
---- 31,39 ----
- #include <cstddef>
- #endif
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- struct _Slist_node_base
-***************
-*** 71,76 ****
---- 74,82 ----
- typedef _Sl_global<bool> _Sl_global_inst;
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # if !defined (__STL_LINK_TIME_INSTANTIATION)
- # include <stl/_slist_base.c>
-*** misc/STLport-4.0/stlport/stl/_sstream.c Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_sstream.c Thu Aug 25 15:54:59 2005
-***************
-*** 29,34 ****
---- 29,37 ----
- # define __BSB_pos_type__ __STL_TYPENAME_ON_RETURN_TYPE basic_stringbuf<_CharT, _Traits, _Alloc>::pos_type
- # endif
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- //----------------------------------------------------------------------
-***************
-*** 529,534 ****
---- 532,540 ----
- {}
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
-
- # undef __BSB_int_type__
-*** misc/STLport-4.0/stlport/stl/_sstream.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_sstream.h Thu Aug 25 15:54:59 2005
-***************
-*** 28,33 ****
---- 28,36 ----
- #include <istream> // Includes <ostream>, <ios>, <iosfwd>
- #include <string>
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- //----------------------------------------------------------------------
-***************
-*** 230,235 ****
---- 233,241 ----
- # endif /* __STL_USE_TEMPLATE_EXPORT */
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # if !defined (__STL_LINK_TIME_INSTANTIATION)
- # include <stl/_sstream.c>
-*** misc/STLport-4.0/stlport/stl/_stack.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_stack.h Thu Aug 25 15:54:59 2005
-***************
-*** 30,35 ****
---- 30,38 ----
- #ifndef __SGI_STL_INTERNAL_STACK_H
- #define __SGI_STL_INTERNAL_STACK_H
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- # if !defined ( __STL_LIMITED_DEFAULT_TEMPLATES )
-***************
-*** 90,95 ****
---- 93,101 ----
- __STL_RELOPS_OPERATORS(template < __STL_STACK_HEADER_ARGS >, stack< __STL_STACK_ARGS >)
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # undef __STL_STACK_ARGS
- # undef __STL_STACK_HEADER_ARGS
-*** misc/STLport-4.0/stlport/stl/_stdio_file.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_stdio_file.h Thu Aug 25 15:54:59 2005
-***************
-*** 71,76 ****
---- 71,79 ----
- # include <unix.h> // get the definition of fileno
- #endif
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- //----------------------------------------------------------------------
-***************
-*** 89,95 ****
- typedef unsigned char* _File_ptr_type;
- #endif
-
-! inline int _FILE_fd(const FILE& __f) { return __f._file; }
- inline char* _FILE_I_begin(const FILE& __f) { return (char*) __f._base; }
- inline char* _FILE_I_next(const FILE& __f) { return (char*) __f._ptr; }
- inline char* _FILE_I_end(const FILE& __f)
---- 92,98 ----
- typedef unsigned char* _File_ptr_type;
- #endif
-
-! inline int _FILE_fd(const FILE& __f) { return fileno(__CONST_CAST(FILE*,&__f)); }
- inline char* _FILE_I_begin(const FILE& __f) { return (char*) __f._base; }
- inline char* _FILE_I_next(const FILE& __f) { return (char*) __f._ptr; }
- inline char* _FILE_I_end(const FILE& __f)
-***************
-*** 92,98 ****
- typedef unsigned char* _File_ptr_type;
- #endif
-
-! inline int _FILE_fd(const FILE& __f) { return __f._file; }
- inline char* _FILE_I_begin(const FILE& __f) { return (char*) __f._base; }
- inline char* _FILE_I_next(const FILE& __f) { return (char*) __f._ptr; }
- inline char* _FILE_I_end(const FILE& __f)
---- 92,98 ----
- typedef unsigned char* _File_ptr_type;
- #endif
-
-! inline int _FILE_fd(const FILE& __f) { return fileno(__CONST_CAST(FILE*,&__f)); }
- inline char* _FILE_I_begin(const FILE& __f) { return (char*) __f._base; }
- inline char* _FILE_I_next(const FILE& __f) { return (char*) __f._ptr; }
- inline char* _FILE_I_end(const FILE& __f)
-***************
-*** 377,382 ****
---- 380,388 ----
- # endif
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- #endif /* __SGI_STL_STDIO_FILE_H */
-
-*** misc/STLport-4.0/stlport/stl/_stream_iterator.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_stream_iterator.h Thu Aug 25 15:54:59 2005
-***************
-*** 46,51 ****
---- 46,54 ----
-
- # include <streambuf>
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- // We do not read any characters until operator* is called. The first
-***************
-*** 214,222 ****
---- 217,231 ----
- # endif
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # include <stl/_istream.h>
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- template <class _CharT, class _Traits>
-***************
-*** 242,247 ****
---- 251,259 ----
- : _M_buf(__o.rdbuf()), _M_ok(__o.rdbuf()!=0) {}
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # endif /* SGI_OWN_IOSTREAMS */
-
-***************
-*** 251,256 ****
---- 263,271 ----
-
- # if defined (__STL_USE_NEW_IOSTREAMS)
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- # ifndef __STL_LIMITED_DEFAULT_TEMPLATES
-***************
-*** 388,397 ****
---- 403,418 ----
- # endif
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
-
- # elif ! defined(__STL_USE_NO_IOSTREAMS)
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- # if defined (__STL_MINIMUM_DEFAULT_TEMPLATE_PARAMS) && ! defined (__STL_DEFAULT_TYPE_PARAM)
-***************
-*** 479,488 ****
---- 500,515 ----
- #endif
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- #endif /* __STL_USE_NEW_IOSTREAMS */
-
- // form-independent definiotion of stream iterators
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- template < __ISI_TMPL_HEADER_ARGUMENTS >
-***************
-*** 525,530 ****
---- 552,560 ----
- # endif
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # undef __ISI_TMPL_HEADER_ARGUMENTS
- # undef __ISI_TMPL_ARGUMENTS
-*** misc/STLport-4.0/stlport/stl/_streambuf.c Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_streambuf.c Thu Aug 25 15:54:59 2005
-***************
-*** 24,29 ****
---- 24,32 ----
-
- # if defined (__STL_DESIGNATED_DLL) || ! defined (__STL_NO_CUSTOM_IO)
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
- //----------------------------------------------------------------------
- // Non-inline basic_streambuf<> member functions.
-***************
-*** 210,215 ****
---- 213,221 ----
- # endif /* __STL_USE_TEMPLATE_EXPORT */
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # endif /* NO_CUSTOM_IO */
-
-*** misc/STLport-4.0/stlport/stl/_streambuf.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_streambuf.h Thu Aug 25 15:54:59 2005
-***************
-*** 23,28 ****
---- 23,31 ----
- #include <stl/_stdio_file.h> // Declaration of struct FILE, and of
- // functions to manipulate it.
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- //----------------------------------------------------------------------
-***************
-*** 479,484 ****
---- 482,490 ----
- # endif
- };
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # if !defined (__STL_LINK_TIME_INSTANTIATION)
- # include <stl/_streambuf.c>
-*** misc/STLport-4.0/stlport/stl/_string.c Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_string.c Thu Aug 25 15:54:59 2005
-***************
-*** 42,47 ****
---- 42,50 ----
- # define __iterator__ __STL_TYPENAME_ON_RETURN_TYPE basic_string<_CharT,_Traits,_Alloc>::iterator
- # endif
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- #if defined (__STL_MEMBER_TEMPLATES) && ! defined (__STL_INLINE_MEMBER_TEMPLATES)
-***************
-*** 664,669 ****
---- 667,675 ----
- }
- }
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- // _string_fwd has to see clean basic_string
- # undef basic_string
-***************
-*** 678,683 ****
---- 684,692 ----
-
- # include <stl/_range_errors.h>
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- // _String_base methods
-***************
-*** 692,697 ****
---- 701,709 ----
- }
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # undef basic_string
- # undef __size_type__
-*** misc/STLport-4.0/stlport/stl/_string.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_string.h Thu Aug 25 15:54:59 2005
-***************
-*** 78,83 ****
---- 78,86 ----
- // a user-defined non-POD type. However, _CharT must still have a
- // default constructor.
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- # ifdef __STL_DEBUG
-***************
-*** 1520,1525 ****
---- 1523,1531 ----
- # undef basic_string
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # ifdef __STL_DEBUG
- # include <stl/debug/_string.h>
-*** misc/STLport-4.0/stlport/stl/_string_fwd.c Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_string_fwd.c Thu Aug 25 15:54:59 2005
-***************
-*** 26,31 ****
---- 26,34 ----
- #if !defined ( __STL_STRING_FWD_C) && ! defined (__SGI_STL_OWN_IOSTREAMS)
- #define __STL_STRING_FWD_C
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- template <class _CharT, class _Traits, class _Alloc>
-***************
-*** 35,40 ****
---- 38,46 ----
- }
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- #endif /* __STL_STRING_FWD_C */
-
-*** misc/STLport-4.0/stlport/stl/_string_fwd.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_string_fwd.h Thu Aug 25 15:54:59 2005
-***************
-*** 21,26 ****
---- 21,29 ----
-
- # include <iosfwd>
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- # if !defined (__STL_LIMITED_DEFAULT_TEMPLATES)
-***************
-*** 51,56 ****
---- 54,62 ----
- # endif
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- #endif /* __SGI_STL_STRING_FWD_H */
-
-*** misc/STLport-4.0/stlport/stl/_string_hash.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_string_hash.h Thu Aug 25 15:54:59 2005
-***************
-*** 23,28 ****
---- 23,31 ----
- # include <stl/_hash_fun.h>
- #endif
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- template <class _CharT, class _Traits, class _Alloc>
-***************
-*** 62,66 ****
---- 65,72 ----
- #endif /* __STL_CLASS_PARTIAL_SPECIALIZATION */
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- #endif
-*** misc/STLport-4.0/stlport/stl/_string_io.c Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_string_io.c Thu Aug 25 15:54:59 2005
-***************
-*** 5,10 ****
---- 5,13 ----
- # define basic_string _Nondebug_string
- # endif
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- #if defined (__STL_USE_NEW_IOSTREAMS)
-***************
-*** 322,327 ****
---- 325,333 ----
- # endif /* __STL_NEW_IOSTREAMS */
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # undef basic_string
-
-*** misc/STLport-4.0/stlport/stl/_string_io.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_string_io.h Thu Aug 25 15:54:59 2005
-***************
-*** 29,34 ****
---- 29,37 ----
- # endif
-
- // I/O.
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- #if defined (__STL_USE_NEW_IOSTREAMS)
-***************
-*** 108,113 ****
---- 111,119 ----
- #endif /* __STL_USE_NEW_IOSTREAMS */
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # undef basic_string
-
-*** misc/STLport-4.0/stlport/stl/_strstream.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_strstream.h Thu Aug 25 15:54:59 2005
-***************
-*** 6,11 ****
---- 6,14 ----
- #include <istream> // Includes <ostream>, <ios>, <iosfwd>
- #include <string>
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- //----------------------------------------------------------------------
-***************
-*** 129,131 ****
---- 132,137 ----
- };
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-*** misc/STLport-4.0/stlport/stl/_tempbuf.c Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_tempbuf.c Thu Aug 25 15:54:59 2005
-***************
-*** 26,31 ****
---- 26,34 ----
- #ifndef __STL_TEMPBUF_C
- #define __STL_TEMPBUF_C
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- template <class _Tp>
-***************
-*** 45,50 ****
---- 48,56 ----
- return pair<_Tp*, ptrdiff_t>((_Tp*)0, 0);
- }
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- #endif /* __STL_TEMPBUF_C */
-
-*** misc/STLport-4.0/stlport/stl/_tempbuf.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_tempbuf.h Thu Aug 25 15:54:59 2005
-***************
-*** 40,45 ****
---- 40,48 ----
- # include <stl/_uninitialized.h>
- # endif
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- template <class _Tp>
-***************
-*** 157,162 ****
---- 160,168 ----
- # endif /* __STL_NO_EXTENSIONS */
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # ifndef __STL_LINK_TIME_INSTANTIATION
- # include <stl/_tempbuf.c>
-*** misc/STLport-4.0/stlport/stl/_threads.c Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_threads.c Thu Aug 25 15:54:59 2005
-***************
-*** 28,33 ****
---- 28,36 ----
-
- # if defined (__BUILDING_STLPORT) || ! defined (__SGI_STL_OWN_IOSTREAMS)
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- # if ( __STL_STATIC_TEMPLATE_DATA > 0 )
-***************
-*** 127,132 ****
---- 130,138 ----
- # endif /* if SGI or WIN */
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # endif /* BUILDING_STLPORT */
- #endif /* __STL_THREADS_C */
-*** misc/STLport-4.0/stlport/stl/_threads.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_threads.h Thu Aug 25 15:54:59 2005
-***************
-*** 124,129 ****
---- 124,132 ----
- # define __STL_MUTEX_INITIALIZER
- # endif
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
-
-***************
-*** 406,411 ****
---- 409,417 ----
- };
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # if !defined (__STL_LINK_TIME_INSTANTIATION)
- # include <stl/_threads.c>
-*** misc/STLport-4.0/stlport/stl/_time_facets.c Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_time_facets.c Thu Aug 25 15:54:59 2005
-***************
-*** 18,23 ****
---- 18,26 ----
- #ifndef __STL_TIME_FACETS_C
- #define __STL_TIME_FACETS_C
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- //----------------------------------------------------------------------
-***************
-*** 452,456 ****
---- 455,462 ----
- # endif /* CUSTOM_IO */
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- #endif /* __STL_TIME_FACETS_C */
-*** misc/STLport-4.0/stlport/stl/_time_facets.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_time_facets.h Thu Aug 25 15:54:59 2005
-***************
-*** 23,28 ****
---- 23,31 ----
- #ifndef __SGI_STL_INTERNAL_TIME_FACETS_H
- #define __SGI_STL_INTERNAL_TIME_FACETS_H
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- _Locale_time* __STL_CALL __acquire_time(const char* __name);
-***************
-*** 288,293 ****
---- 291,299 ----
- };
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # if !defined (__STL_LINK_TIME_INSTANTIATION)
- # include <stl/_time_facets.c>
-*** misc/STLport-4.0/stlport/stl/_tree.c Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_tree.c Thu Aug 25 15:55:00 2005
-***************
-*** 42,47 ****
---- 42,50 ----
- # define _Rb_tree __WORKAROUND_DBG_RENAME(Rb_tree)
- #endif
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- inline void
-***************
-*** 728,733 ****
---- 731,739 ----
- return true;
- }
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # undef __iterator__
- # undef __const_iterator__
-*** misc/STLport-4.0/stlport/stl/_tree.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_tree.h Thu Aug 25 15:55:00 2005
-***************
-*** 83,88 ****
---- 83,91 ----
- # define _Rb_tree __WORKAROUND_DBG_RENAME(Rb_tree)
- #endif
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- typedef bool _Rb_tree_Color_type;
-***************
-*** 557,562 ****
---- 560,568 ----
- #endif /* __STL_FUNCTION_TMPL_PARTIAL_ORDER */
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # if !defined (__STL_LINK_TIME_INSTANTIATION)
- # include <stl/_tree.c>
-***************
-*** 568,573 ****
---- 574,582 ----
- # include <stl/debug/_tree.h>
- #endif
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
- // Class rb_tree is not part of the C++ standard. It is provided for
- // compatibility with the HP STL.
-***************
-*** 587,592 ****
---- 596,604 ----
- ~rb_tree() {}
- };
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- #endif /* __SGI_STL_INTERNAL_TREE_H */
-
-*** misc/STLport-4.0/stlport/stl/_uninitialized.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_uninitialized.h Thu Aug 25 15:55:00 2005
-***************
-*** 46,51 ****
---- 46,54 ----
- # include <stl/_algobase.h>
- # endif
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- // uninitialized_copy
-***************
-*** 324,329 ****
---- 327,335 ----
- }
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- #endif /* __SGI_STL_INTERNAL_UNINITIALIZED_H */
-
-*** misc/STLport-4.0/stlport/stl/_valarray.c Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_valarray.c Thu Aug 25 15:55:00 2005
-***************
-*** 26,31 ****
---- 26,34 ----
- #ifndef __STL_VALARRAY_C
- #define __STL_VALARRAY_C
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- // Behavior is undefined if __x and *this have different sizes
-***************
-*** 177,182 ****
---- 180,188 ----
- }
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- #endif /* __STL_VALARRAY_C */
-
-*** misc/STLport-4.0/stlport/stl/_valarray.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_valarray.h Thu Aug 25 15:55:00 2005
-***************
-*** 42,47 ****
---- 42,50 ----
- #endif
-
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- class slice;
-***************
-*** 1655,1660 ****
---- 1658,1666 ----
- }
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # if !defined (__STL_LINK_TIME_INSTANTIATION)
- # include <stl/_valarray.c>
-*** misc/STLport-4.0/stlport/stl/_vector.c Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_vector.c Thu Aug 25 15:55:00 2005
-***************
-*** 44,49 ****
---- 44,52 ----
- # undef vector
- # define vector __WORKAROUND_DBG_RENAME(vector)
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- template <class _Tp, class _Alloc>
-***************
-*** 266,271 ****
---- 269,277 ----
-
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # undef __pointer__
- # undef __const_pointer__
-*** misc/STLport-4.0/stlport/stl/_vector.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/_vector.h Thu Aug 25 15:55:00 2005
-***************
-*** 53,58 ****
---- 53,61 ----
- # undef vector
- # define vector __WORKAROUND_DBG_RENAME(vector)
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- // The vector base class serves two purposes. First, its constructor
-***************
-*** 562,567 ****
---- 565,573 ----
- # define __vector__ __WORKAROUND_RENAME(vector)
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # if !defined (__STL_LINK_TIME_INSTANTIATION)
- # include <stl/_vector.c>
-*** misc/STLport-4.0/stlport/stl/c_locale.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/c_locale.h Thu Aug 25 15:54:56 2005
-***************
-*** 115,120 ****
---- 115,123 ----
- struct _Locale_messages;
-
- #ifdef __cplusplus
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
- extern "C" {
- #endif
-***************
-*** 652,657 ****
---- 655,663 ----
- # ifdef __cplusplus
- }
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
- # endif
-
- # endif /* __STL_C_LOCALE_H */
-*** misc/STLport-4.0/stlport/stl/char_traits.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/char_traits.h Thu Aug 25 15:54:56 2005
-***************
-*** 40,45 ****
---- 40,48 ----
- # include <stl/type_traits.h>
- #endif
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- // Class __char_traits_base.
-***************
-*** 178,183 ****
---- 181,189 ----
- # endif
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # else /* OWN_IOSTREAMS */
-
-*** misc/STLport-4.0/stlport/stl/concept_checks.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/concept_checks.h Thu Aug 25 15:54:56 2005
-***************
-*** 490,498 ****
---- 490,504 ----
-
- /* Associated Type Requirements */
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
- template <class _Iterator> struct iterator_traits;
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- template <class _Iter>
- struct __value_type_type_definition_requirement_violation {
-*** misc/STLport-4.0/stlport/stl/type_traits.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/type_traits.h Thu Aug 25 15:55:29 2005
-***************
-*** 56,61 ****
---- 56,64 ----
- */
-
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- struct __true_type {
- };
-
-***************
-*** 88,93 ****
---- 91,99 ----
- typedef __false_type has_trivial_destructor;
- typedef __false_type is_POD_type;
- };
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- // Provide some specializations. This is harmless for compilers that
- // have built-in __types_traits support, and essential for compilers
-*** misc/STLport-4.0/stlport/stl/debug/_debug.c Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/debug/_debug.c Thu Aug 25 15:54:56 2005
-***************
-*** 56,61 ****
---- 56,64 ----
- extern void __stl_debug_terminate(void);
- # endif
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- # ifndef __STL_STRING_LITERAL
-***************
-*** 101,106 ****
---- 104,112 ----
-
- # endif
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- // abort()
- # include <cstdlib>
-***************
-*** 110,115 ****
---- 116,124 ----
- # include <cstdarg>
- # include <cstdio>
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- template <class _Dummy>
-***************
-*** 141,149 ****
---- 150,164 ----
- }
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # endif /* __STL_DEBUG_MESSAGE */
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
-
-***************
-*** 191,201 ****
---- 206,222 ----
- }
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # endif /* __STL_ASSERTIONS */
-
- #ifdef __STL_DEBUG
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- # ifdef __STL_THREADS
-***************
-*** 447,452 ****
---- 468,476 ----
- }
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- #endif /* __STL_DEBUG */
-
-*** misc/STLport-4.0/stlport/stl/debug/_debug.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/debug/_debug.h Thu Aug 25 15:54:56 2005
-***************
-*** 69,74 ****
---- 69,77 ----
- /* have to hardcode that ;() */
- # define _StlMsg_MAX 27
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- // This class is unique (not inherited from exception),
-***************
-*** 136,141 ****
---- 139,147 ----
- typedef __stl_debug_engine<bool> __stl_debugger;
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # ifndef __STL_ASSERT
- # define __STL_ASSERT(expr) \
-***************
-*** 179,184 ****
---- 185,193 ----
- # include <stl/_iterator_base.h>
- #endif
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- //=============================================================
-***************
-*** 384,389 ****
---- 393,401 ----
- }
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # endif /* __STL_DEBUG */
-
-*** misc/STLport-4.0/stlport/stl/debug/_deque.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/debug/_deque.h Thu Aug 25 15:54:56 2005
-***************
-*** 41,46 ****
---- 41,49 ----
-
- # define __STL_DEQUE_SUPER __WORKAROUND_DBG_RENAME(deque) <_Tp,_Alloc>
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- # ifdef __STL_DEBUG_USE_DISTINCT_VALUE_TYPE_HELPERS
-***************
-*** 314,319 ****
---- 317,325 ----
- #endif
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # undef _DBG_deque
- # undef __STL_DEQUE_SUPER
-*** misc/STLport-4.0/stlport/stl/debug/_hashtable.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/debug/_hashtable.h Thu Aug 25 15:54:56 2005
-***************
-*** 42,47 ****
---- 42,50 ----
- # define __STL_DBG_HT_SUPER \
- __WORKAROUND_DBG_RENAME(hashtable) <_Val, _Key, _HF, _ExK, _EqK, _All>
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- # ifdef __STL_DEBUG_USE_DISTINCT_VALUE_TYPE_HELPERS
-***************
-*** 245,250 ****
---- 248,256 ----
- }
- #endif
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
- # undef hashtable
-
- #endif /* __SGI_STL_INTERNAL_HASHTABLE_H */
-*** misc/STLport-4.0/stlport/stl/debug/_iterator.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/debug/_iterator.h Thu Aug 25 15:54:56 2005
-***************
-*** 31,36 ****
---- 31,39 ----
- # define __STL_DBG_IDENTITY( __base )
- # endif
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- //============================================================
-***************
-*** 409,414 ****
---- 412,420 ----
- };
- # endif
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- #endif /* INTERNAL_H */
-
-*** misc/STLport-4.0/stlport/stl/debug/_list.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/debug/_list.h Thu Aug 25 15:54:56 2005
-***************
-*** 40,45 ****
---- 40,48 ----
- # define __STL_DBG_LIST_BASE \
- __WORKAROUND_DBG_RENAME(list) <_Tp, _Alloc>
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- # ifdef __STL_DEBUG_USE_DISTINCT_VALUE_TYPE_HELPERS
-***************
-*** 267,272 ****
---- 270,278 ----
- #endif /* __STL_USE_SEPARATE_RELOPS_NAMESPACE */
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- #endif /* __SGI_STL_INTERNAL_LIST_H */
-
-*** misc/STLport-4.0/stlport/stl/debug/_slist.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/debug/_slist.h Thu Aug 25 15:54:56 2005
-***************
-*** 36,41 ****
---- 36,44 ----
-
- # define __STL_DBG_SLIST_BASE __WORKAROUND_DBG_RENAME(slist) <_Tp, _Alloc>
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- # ifdef __STL_DEBUG_USE_DISTINCT_VALUE_TYPE_HELPERS
-***************
-*** 423,428 ****
---- 426,434 ----
- #endif /* __STL_FUNCTION_TMPL_PARTIAL_ORDER */
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- #endif /* __SGI_STL_INTERNAL_DBG_SLIST_H */
-
-*** misc/STLport-4.0/stlport/stl/debug/_string.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/debug/_string.h Thu Aug 25 15:54:56 2005
-***************
-*** 23,28 ****
---- 23,31 ----
-
- # define __STL_DBG_STRING_BASE _Nondebug_string <_CharT, _Traits, _Alloc>
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- # ifdef __STL_DEBUG_USE_DISTINCT_VALUE_TYPE_HELPERS
-***************
-*** 727,732 ****
---- 730,738 ----
-
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- #endif /* __SGI_STL_DBG_STRING */
-
-*** misc/STLport-4.0/stlport/stl/debug/_tree.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/debug/_tree.h Thu Aug 25 15:54:56 2005
-***************
-*** 39,44 ****
---- 39,47 ----
-
- # define __STL_DBG_TREE_SUPER __WORKAROUND_DBG_RENAME(Rb_tree) <_Key, _Value, _KeyOfValue, _Compare, _Alloc>
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- # ifdef __STL_DEBUG_USE_DISTINCT_VALUE_TYPE_HELPERS
-***************
-*** 288,293 ****
---- 291,299 ----
- #endif /* __STL_FUNCTION_TMPL_PARTIAL_ORDER */
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # undef __STL_DBG_TREE_SUPER
-
-*** misc/STLport-4.0/stlport/stl/debug/_vector.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/debug/_vector.h Thu Aug 25 15:54:56 2005
-***************
-*** 40,45 ****
---- 40,48 ----
- # define __STL_DBG_VECTOR_BASE __WORKAROUND_DBG_RENAME(vector) <_Tp, _Alloc>
-
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- # ifdef __STL_DEBUG_USE_DISTINCT_VALUE_TYPE_HELPERS
-***************
-*** 335,340 ****
---- 338,346 ----
- # endif /* __STL_USE_TEMPLATE_EXPORT */
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- # undef __STL_DBG_VECTOR_BASE
- # undef _DBG_vector
-*** misc/STLport-4.0/stlport/stl/wrappers/_deque.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/stl/wrappers/_deque.h Thu Aug 25 15:54:57 2005
-***************
-*** 35,40 ****
---- 35,43 ----
-
- # define _DEQUE_SUPER _DEQUE_SUPER_NAME<_Tp, __STL_DEFAULT_ALLOCATOR(_Tp) >
-
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- // provide a "default" deque adaptor
-***************
-*** 70,75 ****
---- 73,81 ----
- # undef _DEQUE_SUPER
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
-
- // Local Variables:
- // mode:C++
-*** misc/STLport-4.0/stlport/wrap_std/complex Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/wrap_std/complex Thu Aug 25 15:55:01 2005
-***************
-*** 16,21 ****
---- 16,24 ----
- # include __STL_NATIVE_HEADER(complex)
-
- # if defined (__STL_USE_OWN_NAMESPACE)
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
-
- using __STL_COMPLEX_NAMESPACE::complex;
-***************
-*** 42,47 ****
---- 45,53 ----
- using __STL_COMPLEX_NAMESPACE::tanh;
-
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
- # endif /* USE_OWN_NAMESPACE */
-
- // Local Variables:
-*** misc/STLport-4.0/stlport/wrap_std/fstream Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/wrap_std/fstream Thu Aug 25 15:55:01 2005
-***************
-*** 16,24 ****
---- 16,30 ----
- # if defined (__STL_USE_NEW_IOSTREAMS)
- # include __STL_NATIVE_HEADER(fstream)
- # if defined (__STL_USE_OWN_NAMESPACE)
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
- # include <using/fstream>
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
- # endif /* __STL_OWN_NAMESPACE */
- # else
- # include <wrap_std/h/fstream.h>
-*** misc/STLport-4.0/stlport/wrap_std/iomanip Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/wrap_std/iomanip Thu Aug 25 15:55:01 2005
-***************
-*** 18,26 ****
---- 18,32 ----
- # include __STL_NATIVE_HEADER(iomanip)
-
- # ifdef __STL_USE_OWN_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
- # include <using/iomanip>
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
- # endif /* __STL_OWN_NAMESPACE */
-
- # else
-***************
-*** 28,36 ****
---- 34,48 ----
- # include __STL_NATIVE_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_OWN_NAMESPACE */
-
- # endif /* __STL_USE_NEW_IOSTREAMS */
-*** misc/STLport-4.0/stlport/wrap_std/ios Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/wrap_std/ios Thu Aug 25 15:55:01 2005
-***************
-*** 16,24 ****
---- 16,30 ----
- # if defined (__STL_USE_NEW_IOSTREAMS)
- # include __STL_NATIVE_HEADER(ios)
- # ifdef __STL_USE_OWN_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
- # include <using/ios>
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
- #endif /* __STL_OWN_NAMESPACE */
- # else
- # include <wrap_std/h/iostream.h>
-*** misc/STLport-4.0/stlport/wrap_std/iosfwd Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/wrap_std/iosfwd Thu Aug 25 15:55:01 2005
-***************
-*** 56,64 ****
---- 56,70 ----
-
- # 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
-
- // use old-style iostreams
- # include <iostream.h>
-***************
-*** 77,85 ****
---- 83,97 ----
- # endif
-
- # if defined (__STL_USE_OWN_NAMESPACE)
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
- # include <using/iosfwd>
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
- # endif
-
- // Local Variables:
-*** misc/STLport-4.0/stlport/wrap_std/iostream Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/wrap_std/iostream Thu Aug 25 15:55:01 2005
-***************
-*** 22,30 ****
---- 22,36 ----
- # if defined (__STL_USE_NEW_IOSTREAMS)
- # include __STL_NATIVE_HEADER(iostream)
- # if defined (__STL_USE_OWN_NAMESPACE)
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
- # include <using/iostream>
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
- # endif
- # else
- # include <wrap_std/h/iostream.h>
-*** misc/STLport-4.0/stlport/wrap_std/istream Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/wrap_std/istream Thu Aug 25 15:55:01 2005
-***************
-*** 24,32 ****
---- 24,38 ----
- # include __STL_NATIVE_HEADER(istream)
-
- # if defined (__STL_USE_OWN_NAMESPACE)
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
- # include <using/istream>
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
- # endif /* __STL_OWN_NAMESPACE */
-
- # else
-***************
-*** 33,42 ****
---- 39,54 ----
-
- # include __STL_NATIVE_OLD_STREAMS_HEADER(iostream.h)
- # if defined (__STL_USE_NAMESPACES)
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
- using ::istream;
- // using ::ws;
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
- # endif /* NAMESPACES */
-
- # endif /* if defined (__STL_USE_NEW_IOSTREAMS) */
-*** misc/STLport-4.0/stlport/wrap_std/locale Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/wrap_std/locale Thu Aug 25 15:55:01 2005
-***************
-*** 20,28 ****
---- 20,34 ----
- # include __STL_NATIVE_HEADER(locale)
-
- # ifdef __STL_USE_OWN_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
- # include <using/locale>
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
- #endif /* __STL_OWN_NAMESPACE */
-
- // Local Variables:
-*** misc/STLport-4.0/stlport/wrap_std/ostream Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/wrap_std/ostream Thu Aug 25 15:55:01 2005
-***************
-*** 24,32 ****
---- 24,38 ----
- # include __STL_NATIVE_HEADER(ostream)
-
- # if defined (__STL_USE_OWN_NAMESPACE)
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
- # include <using/ostream>
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
- # endif /* __STL_OWN_NAMESPACE */
-
- # else
-***************
-*** 34,42 ****
---- 40,54 ----
- # include __STL_NATIVE_OLD_STREAMS_HEADER(iostream.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_NAMESPACE */
- # endif /* if defined (__STL_USE_NEW_IOSTREAMS) */
- // Local Variables:
-*** misc/STLport-4.0/stlport/wrap_std/sstream Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/wrap_std/sstream Thu Aug 25 15:55:01 2005
-***************
-*** 15,23 ****
---- 15,29 ----
-
- # include __STL_NATIVE_HEADER(sstream)
- # ifdef __STL_USE_OWN_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
- # include <using/sstream>
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
- #endif /* __STL_OWN_NAMESPACE */
-
- // Local Variables:
-*** misc/STLport-4.0/stlport/wrap_std/streambuf Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/wrap_std/streambuf Thu Aug 25 15:55:01 2005
-***************
-*** 20,28 ****
---- 20,34 ----
- # endif
-
- # if defined (__STL_USE_OWN_NAMESPACE) && defined (__STL_USE_NEW_IOSTREAMS)
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
- # include <using/streambuf>
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
- # endif /* __STL_OWN_NAMESPACE */
-
- // Local Variables:
-*** misc/STLport-4.0/stlport/wrap_std/strstream Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/wrap_std/strstream Thu Aug 25 15:55:01 2005
-***************
-*** 16,24 ****
---- 16,30 ----
- # include __STL_NATIVE_HEADER(strstream)
-
- # ifdef __STL_USE_OWN_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
- # include <using/strstream>
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
- #endif /* __STL_OWN_NAMESPACE */
-
-
-*** misc/STLport-4.0/stlport/wrap_std/h/fstream.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/wrap_std/h/fstream.h Thu Aug 25 15:55:01 2005
-***************
-*** 1,7 ****
---- 1,13 ----
- # include __STL_NATIVE_OLD_STREAMS_HEADER(fstream.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/fstream.h>
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
- # endif /* __STL_OWN_NAMESPACE */
-
-*** misc/STLport-4.0/stlport/wrap_std/h/iostream.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/wrap_std/h/iostream.h Thu Aug 25 15:55:01 2005
-***************
-*** 1,7 ****
---- 1,13 ----
- # include __STL_NATIVE_OLD_STREAMS_HEADER(iostream.h)
-
- # if defined (__STL_USE_OWN_NAMESPACE)
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
- # include <using/h/iostream.h>
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
- # endif /* __STL_USE_OWN_NAMESPACE */
-*** misc/STLport-4.0/stlport/wrap_std/h/strstream.h Fri Jul 14 03:53:26 2000
---- misc/build/STLport-4.0/stlport/wrap_std/h/strstream.h Thu Aug 25 15:55:01 2005
-***************
-*** 20,28 ****
---- 20,34 ----
- # endif
-
- # ifdef __STL_USE_OWN_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
- __STL_BEGIN_NAMESPACE
- # include <using/h/strstream.h>
- __STL_END_NAMESPACE
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-+ #endif
- #endif /* __STL_OWN_NAMESPACE */
-
-
diff --git a/stlport/STLport-4.5-0119.patch b/stlport/STLport-4.5-0119.patch
deleted file mode 100644
index bb17a11a6..000000000
--- a/stlport/STLport-4.5-0119.patch
+++ /dev/null
@@ -1,1348 +0,0 @@
---- misc/STLport-4.5-0119/src/vc7.mak Sun Jul 29 22:02:16 2001
-+++ misc/build/STLport-4.5-0119/src/vc7.mak Mon Jun 2 10:32:02 2008
-@@ -1,5 +1,5 @@
- #
--# STLport makefile for VC++ 7 (.NET)
-+# STLport makefile for VC++ 7/8/9 (.NET)
- #
-
- CXX=cl.exe
-@@ -6,15 +6,16 @@
- CC=cl.exe
- RC=rc
-
--LIB_BASENAME=stlport_vc7
-+LIB_BASENAME=stlport_vc71
-+
- COMP=VC7
-
- # EXTRA_COMMON_FLAGS=/D "_MBCS"
--EXTRA_COMMON_FLAGS=/FI "vc_warning_disable.h" /D "_MBCS"
-+EXTRA_COMMON_FLAGS=/TP /FI "vc_warning_disable.h" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
- EXTRA_DEBUG_FLAGS=
- EXTRA_NDEBUG_FLAGS=
-
--all: platform all_static all_dynamic
-+all: platform all_static all_dynamic
-
- !INCLUDE vc_common.mak
-
---- misc/STLport-4.5-0119/src/vc_common.mak Wed Apr 10 05:55:31 2002
-+++ misc/build/STLport-4.5-0119/src/vc_common.mak Mon Jun 2 10:32:02 2008
-@@ -27,7 +27,7 @@
- DYNEXT=dll
- STEXT=lib
-
--PATH_SEP=\\
-+PATH_SEP=\
-
- MKDIR=-mkdir
- LINK_OUT=/out:
-@@ -51,15 +51,15 @@
- #
-
- # FLAGS_COMMON =/nologo /c /W3 /GR /GX /D "WIN32" /D "_WINDOWS" /I "$(STLPORT_DIR)" $(EXTRA_COMMON_FLAGS)
--FLAGS_COMMON =/nologo /c /Zi /W3 /GR /GX /D "WIN32" /D "_WINDOWS" /I "$(STLPORT_DIR)" $(EXTRA_COMMON_FLAGS)
-+FLAGS_COMMON =/nologo /c /Zi /W3 /GR $(EXFLAGS) /D "WIN32" /D "_WINDOWS" /I "$(STLPORT_DIR)" $(EXTRA_COMMON_FLAGS)
- FLAGS_COMMON_static = $(FLAGS_COMMON) /FD /D "_STLP_NO_FORCE_INSTANTIATE"
- FLAGS_COMMON_dynamic = $(FLAGS_COMMON)
-
- FLAGS_DEBUG=/Gm /Od /D_DEBUG $(EXTRA_DEBUG_FLAGS)
- # FLAGS_DEBUG=/Zi /Gm /Od /D_DEBUG $(EXTRA_DEBUG_FLAGS)
- FLAGS_NDEBUG=/O2 /DNDEBUG $(EXTRA_NDEBUG_FLAGS)
-
--LDFLAGS_COMMON=/nologo /machine:I386 /debugtype:cv
-+LDFLAGS_COMMON=/nologo
- LDFLAGS_DEBUG=/debug
- LDFLAGS_RELEASE=/opt:ref
-
---- misc/STLport-4.5-0119/stlport/config/_epilog.h Thu Sep 6 00:11:36 2001
-+++ misc/build/STLport-4.5-0119/stlport/config/_epilog.h Mon Jun 2 10:32:02 2008
-@@ -4,6 +4,7 @@
- # pragma option pop
- # pragma option -w-8062
- # else
-+# pragma pack(push,8)
- # if !(defined (_STLP_MSVC) && (_STLP_MSVC < 1200))
- # pragma warning (pop)
- # endif
---- misc/STLport-4.5-0119/stlport/config/_prolog.h Sun Oct 28 21:26:44 2001
-+++ misc/build/STLport-4.5-0119/stlport/config/_prolog.h Mon Jun 2 10:32:02 2008
-@@ -7,10 +7,17 @@
- # endif
- # else
- # if !(defined (_STLP_MSVC) && (_STLP_MSVC < 1200))
--# pragma warning(push)
-+ // Disable "warning C4702: unreachable code" and "warning C4710: function not
-+ // inlined" globally, as they are only issued at the end of the compilation
-+ // unit. Then locally disable as many warnings as possible, plus "warning
-+ // C4555: expression has no effect; expected expression with side-effect":
-+# pragma warning(disable:4702 4710)
-+# pragma warning(push,1)
-+# pragma warning(disable:4555)
- # endif
- # pragma pack(push,8)
- # include <config/_msvc_warnings_off.h>
-+# pragma pack(pop)
- # endif
-
-
---- misc/STLport-4.5-0119/stlport/config/stl_msvc.h Sat Dec 28 07:12:58 2002
-+++ misc/build/STLport-4.5-0119/stlport/config/stl_msvc.h Mon Jun 2 10:34:54 2008
-@@ -66,10 +66,15 @@
- # define _STLP_DEFAULTCHAR __stl_char
- # endif /* (_STLP_MSVC < 1100 ) */
-
--# define _STLP_NO_TYPENAME_ON_RETURN_TYPE 1
-+# if (_STLP_MSVC <= 1300)
-+# define _STLP_NO_TYPENAME_ON_RETURN_TYPE 1
-+# endif
-+# if (_STLP_MSVC > 1300)
-+# define _STLP_NO_METHOD_SPECIALIZATION 1
-+# endif
- // using ::func_name results in ambiguity
-
--# if (_STLP_MSVC <= 1300)
-+# if (_STLP_MSVC <= 1310)
-
- // boris : not defining this macro for SP5 causes other problems
- // # if !defined (_MSC_FULL_VER) || (_MSC_FULL_VER < 12008804 )
-@@ -94,7 +99,7 @@
- # endif /* _STLP_MSVC */
-
-
--# if (_MSC_VER <= 1300)
-+# if (_MSC_VER <= 1500)
-
- # define _STLP_VENDOR_GLOBAL_CSTD
- // They included the necessary coding,
-@@ -129,7 +134,7 @@
- # if defined (_STLP_MSVC) && ( _STLP_MSVC < 1200 ) /* VC++ 6.0 */
- // # define _STLP_NO_MEMBER_TEMPLATES 1
- // # define _STLP_NO_EXPLICIT_FUNCTION_TMPL_ARGS 1
--# define _STLP_NON_TYPE_TMPL_PARAM_BUG 1
-+# define _STLP_NON_TYPE_TMPL_PARAM_BUG 1
- # define _STLP_THROW_RETURN_BUG 1
- # endif
-
-@@ -178,8 +183,8 @@
- # ifdef __ICL
- # define _STLP_LIB_BASENAME "stlport_icl"
- # else
--# if (_MSC_VER >= 1300)
--# define _STLP_LIB_BASENAME "stlport_vc7"
-+# if (_MSC_VER > 1300)
-+# define _STLP_LIB_BASENAME "stlport_vc71"
- # elif (_MSC_VER >= 1200)
- //# ifdef _UNICODE
- //# define _STLP_LIB_BASENAME "stlport_vc6_unicode"
---- misc/STLport-4.5-0119/stlport/cstdio Sun Dec 2 23:17:40 2001
-+++ misc/build/STLport-4.5-0119/stlport/cstdio Mon Jun 2 10:32:02 2008
-@@ -42,7 +42,7 @@
- # define stderr (&_STLP_VENDOR_CSTD::__files[2])
- # endif
-
--# if defined (_STLP_MSVC) || defined (__ICL)
-+# if defined (_STLP_MSVC) && (_MSC_VER <= 1310) || defined (__ICL)
- inline
- int vsnprintf(char *s1, size_t n, const char *s2, va_list v)
- {
-@@ -110,7 +110,7 @@
- using _STLP_VENDOR_CSTD::vfprintf;
- using _STLP_VENDOR_CSTD::vprintf;
- using _STLP_VENDOR_CSTD::vsprintf;
--# if (defined (__MWERKS__) || defined (_STLP_MSVC) || defined (__ICL) || \
-+# if (defined (__MWERKS__) || (defined (_STLP_MSVC) && (_MSC_VER <= 1310)) || defined (__ICL) || \
- ( defined (__BORLANDC__) && __BORLANDC__ > 0x530))
- using _STLP_VENDOR_CSTD::vsnprintf;
- # endif
---- misc/STLport-4.5-0119/stlport/list Wed Apr 10 05:55:34 2002
-+++ misc/build/STLport-4.5-0119/stlport/list Mon Jun 2 10:32:02 2008
-@@ -37,7 +37,14 @@
-
- #ifndef _STLP_INTERNAL_LIST_H
- # include <stl/_list.h>
-+#if ( _MSC_VER > 1200 )
-+_STLP_BEGIN_NAMESPACE
-+# if defined (_STLP_USE_TEMPLATE_EXPORT)
-+_STLP_EXPORT_TEMPLATE_CLASS allocator<void*>;
-+# endif
-+_STLP_END_NAMESPACE
- #endif
-+#endif
-
- #if defined (_STLP_WHOLE_VENDOR_STD)
- # include _STLP_NATIVE_HEADER(list)
---- misc/STLport-4.5-0119/stlport/stl/_cmath.h Mon Oct 28 17:18:49 2002
-+++ misc/build/STLport-4.5-0119/stlport/stl/_cmath.h Mon Jun 2 10:32:02 2008
-@@ -50,7 +50,7 @@
- static inline _Tp _do_tan(const _Tp& __x) { return _STLP_VENDOR_CSTD::tan(__x); }
- static inline _Tp _do_tanh(const _Tp& __x) { return _STLP_VENDOR_CSTD::tanh(__x); }
- static inline _Tp _do_exp(const _Tp& __x) { return _STLP_VENDOR_CSTD::exp(__x); }
-- static inline _Tp _do_hypot(const _Tp& __x, const _Tp& __y) { return _STLP_VENDOR_CSTD::hypot(__x, __y); }
-+ static inline _Tp _do_hypot(const _Tp& __x, const _Tp& __y) { return hypot(__x, __y); }
- };
-
- # define _STLP_DO_ABS(_Tp) _STL_math_proxy<_Tp>::_do_abs
---- misc/STLport-4.5-0119/stlport/stl/_deque.c Thu Sep 12 22:46:59 2002
-+++ misc/build/STLport-4.5-0119/stlport/stl/_deque.c Mon Jun 2 10:32:02 2008
-@@ -26,6 +26,10 @@
- #ifndef _STLP_DEQUE_C
- # define _STLP_DEQUE_C
-
-+#if defined(_MSC_VER) && (_MSC_VER > 1310)
-+#pragma warning(disable:4701)
-+#endif
-+
- # ifndef _STLP_INTERNAL_DEQUE_H
- # include <stl/_deque.h>
- # endif
---- misc/STLport-4.5-0119/stlport/stl/_hashtable.h Thu Sep 12 22:46:59 2002
-+++ misc/build/STLport-4.5-0119/stlport/stl/_hashtable.h Mon Jun 2 10:32:02 2008
-@@ -9,13 +9,13 @@
- * Copyright (c) 1997
- * Moscow Center for SPARC Technology
- *
-- * Copyright (c) 1999
-+ * Copyright (c) 1999
- * Boris Fomitchev
- *
- * This material is provided "as is", with absolutely no warranty expressed
- * or implied. Any use is at your own risk.
- *
-- * Permission to use or copy this software for any purpose is hereby granted
-+ * Permission to use or copy this software for any purpose is hereby granted
- * without fee, provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
-@@ -66,7 +66,7 @@
- _Self* _M_next;
- _Val _M_val;
- __TRIVIAL_STUFF(_Hashtable_node)
--};
-+};
-
- // some compilers require the names of template parameters to be the same
- template <class _Val, class _Key, class _HF,
-@@ -84,7 +84,7 @@
- _Node* _M_cur;
- _Hashtable* _M_ht;
-
-- _Hashtable_iterator(_Node* __n, _Hashtable* __tab)
-+ _Hashtable_iterator(_Node* __n, _Hashtable* __tab)
- : _M_cur(__n), _M_ht(__tab) {}
- _Hashtable_iterator() {}
-
-@@ -96,7 +96,7 @@
- class _ExK, class _EqK, class _All>
- struct _Ht_iterator : public _Hashtable_iterator< _Val, _Key,_HF, _ExK,_EqK,_All>
- {
--
-+
- typedef _Hashtable_iterator<_Val,_Key,_HF,_ExK,_EqK,_All> _Base;
-
- // typedef _Ht_iterator<_Val, _Nonconst_traits<_Val>,_Key,_HF,_ExK,_EqK,_All> iterator;
-@@ -116,11 +116,11 @@
- _Ht_iterator(const _Node* __n, const _Hashtable* __tab) :
- _Hashtable_iterator<_Val,_Key,_HF,_ExK,_EqK,_All>((_Node*)__n, (_Hashtable*)__tab) {}
- _Ht_iterator() {}
-- _Ht_iterator(const _Ht_iterator<_Val, _Nonconst_traits<_Val>,_Key,_HF,_ExK,_EqK,_All>& __it) :
-+ _Ht_iterator(const _Ht_iterator<_Val, _Nonconst_traits<_Val>,_Key,_HF,_ExK,_EqK,_All>& __it) :
- _Hashtable_iterator<_Val,_Key,_HF,_ExK,_EqK,_All>(__it) {}
-
-- reference operator*() const {
-- return this->_M_cur->_M_val;
-+ reference operator*() const {
-+ return this->_M_cur->_M_val;
- }
- _STLP_DEFINE_ARROW_OPERATOR
-
-@@ -138,19 +138,19 @@
-
- template <class _Val, class _Traits, class _Traits1, class _Key, class _HF,
- class _ExK, class _EqK, class _All>
--inline bool
--operator==(const _Ht_iterator<_Val, _Traits,_Key,_HF,_ExK,_EqK,_All>& __x,
-- const _Ht_iterator<_Val, _Traits1,_Key,_HF,_ExK,_EqK,_All>& __y) {
-- return __x._M_cur == __y._M_cur;
-+inline bool
-+operator==(const _Ht_iterator<_Val, _Traits,_Key,_HF,_ExK,_EqK,_All>& __x,
-+ const _Ht_iterator<_Val, _Traits1,_Key,_HF,_ExK,_EqK,_All>& __y) {
-+ return __x._M_cur == __y._M_cur;
- }
-
- #ifdef _STLP_USE_SEPARATE_RELOPS_NAMESPACE
- template <class _Val, class _Key, class _HF,
- class _ExK, class _EqK, class _All>
--inline bool
--operator!=(const _Hashtable_iterator<_Val,_Key,_HF,_ExK,_EqK,_All>& __x,
-- const _Hashtable_iterator<_Val,_Key,_HF,_ExK,_EqK,_All>& __y) {
-- return __x._M_cur != __y._M_cur;
-+inline bool
-+operator!=(const _Hashtable_iterator<_Val,_Key,_HF,_ExK,_EqK,_All>& __x,
-+ const _Hashtable_iterator<_Val,_Key,_HF,_ExK,_EqK,_All>& __y) {
-+ return __x._M_cur != __y._M_cur;
- }
- #else
-
-@@ -166,10 +166,10 @@
-
- template <class _Val, class _Key, class _HF,
- class _ExK, class _EqK, class _All>
--inline bool
--operator!=(const _Ht_iterator<_Val, _Nonconst_traits<_Val>,_Key,_HF,_ExK,_EqK,_All>& __x,
-- const _Ht_iterator<_Val, _Const_traits<_Val>,_Key,_HF,_ExK,_EqK,_All>& __y) {
-- return __x._M_cur != __y._M_cur;
-+inline bool
-+operator!=(const _Ht_iterator<_Val, _Nonconst_traits<_Val>,_Key,_HF,_ExK,_EqK,_All>& __x,
-+ const _Ht_iterator<_Val, _Const_traits<_Val>,_Key,_HF,_ExK,_EqK,_All>& __y) {
-+ return __x._M_cur != __y._M_cur;
- }
- #endif
-
-@@ -189,8 +189,10 @@
- static const size_t _M_list[__stl_num_primes];
- };
-
--# if defined (_STLP_USE_TEMPLATE_EXPORT)
-+# if defined (_STLP_USE_TEMPLATE_EXPORT)
-+#if ( _MSC_VER < 1300 )
- _STLP_EXPORT_TEMPLATE_CLASS _Stl_prime<bool>;
-+#endif
- # endif
-
- typedef _Stl_prime<bool> _Stl_prime_type;
-@@ -200,8 +202,8 @@
- // do. If we're using standard-conforming allocators, then a hashtable
- // unconditionally has a member variable to hold its allocator, even if
- // it so happens that all instances of the allocator type are identical.
--// This is because, for hashtables, this extra storage is negligible.
--// Additionally, a base class wouldn't serve any other purposes; it
-+// This is because, for hashtables, this extra storage is negligible.
-+// Additionally, a base class wouldn't serve any other purposes; it
- // wouldn't, for example, simplify the exception-handling code.
- template <class _Val, class _Key, class _HF,
- class _ExK, class _EqK, class _All>
---- misc/STLport-4.5-0119/stlport/stl/_istream.h Sun Apr 7 04:35:42 2002
-+++ misc/build/STLport-4.5-0119/stlport/stl/_istream.h Mon Jun 2 10:32:02 2008
-@@ -257,44 +257,44 @@
-
- template <class _CharT, class _Traits>
- inline basic_istream<_CharT, _Traits>& _STLP_CALL
--operator>>(basic_istream<_CharT, _Traits>& __in, _CharT& __c) {
-- __in._M_formatted_get(__c);
-- return __in;
-+operator>>(basic_istream<_CharT, _Traits>& ___in, _CharT& __c) {
-+ ___in._M_formatted_get(__c);
-+ return ___in;
- }
-
- template <class _Traits>
- inline basic_istream<char, _Traits>& _STLP_CALL
--operator>>(basic_istream<char, _Traits>& __in, unsigned char& __c) {
-- __in._M_formatted_get(__REINTERPRET_CAST(char&,__c));
-- return __in;
-+operator>>(basic_istream<char, _Traits>& ___in, unsigned char& __c) {
-+ ___in._M_formatted_get(__REINTERPRET_CAST(char&,__c));
-+ return ___in;
- }
-
- template <class _Traits>
- inline basic_istream<char, _Traits>& _STLP_CALL
--operator>>(basic_istream<char, _Traits>& __in, signed char& __c) {
-- __in._M_formatted_get(__REINTERPRET_CAST(char&,__c));
-- return __in;
-+operator>>(basic_istream<char, _Traits>& ___in, signed char& __c) {
-+ ___in._M_formatted_get(__REINTERPRET_CAST(char&,__c));
-+ return ___in;
- }
-
- template <class _CharT, class _Traits>
- inline basic_istream<_CharT, _Traits>& _STLP_CALL
--operator>>(basic_istream<_CharT, _Traits>& __in, _CharT* __s) {
-- __in._M_formatted_get(__s);
-- return __in;
-+operator>>(basic_istream<_CharT, _Traits>& ___in, _CharT* __s) {
-+ ___in._M_formatted_get(__s);
-+ return ___in;
- }
-
- template <class _Traits>
- inline basic_istream<char, _Traits>& _STLP_CALL
--operator>>(basic_istream<char, _Traits>& __in, unsigned char* __s) {
-- __in._M_formatted_get(__REINTERPRET_CAST(char*,__s));
-- return __in;
-+operator>>(basic_istream<char, _Traits>& ___in, unsigned char* __s) {
-+ ___in._M_formatted_get(__REINTERPRET_CAST(char*,__s));
-+ return ___in;
- }
-
- template <class _Traits>
- inline basic_istream<char, _Traits>& _STLP_CALL
--operator>>(basic_istream<char, _Traits>& __in, signed char* __s) {
-- __in._M_formatted_get(__REINTERPRET_CAST(char*,__s));
-- return __in;
-+operator>>(basic_istream<char, _Traits>& ___in, signed char* __s) {
-+ ___in._M_formatted_get(__REINTERPRET_CAST(char*,__s));
-+ return ___in;
- }
-
- //----------------------------------------------------------------------
---- misc/STLport-4.5-0119/stlport/stl/_monetary.c Thu Sep 12 22:47:00 2002
-+++ misc/build/STLport-4.5-0119/stlport/stl/_monetary.c Mon Jun 2 10:32:02 2008
-@@ -86,7 +86,7 @@
-
- template <class _InIt, class _OuIt, class _CharT>
- bool
--__get_monetary_value(_InIt& __first, _InIt __last, _OuIt __out,
-+__get_monetary_value(_InIt& __first, _InIt __last, _OuIt ___out,
- const ctype<_CharT>& _c_type,
- _CharT __point,
- int __frac_digits,
-@@ -104,7 +104,7 @@
- while (__first != __last) {
- if (_c_type.is(ctype_base::digit, *__first)) {
- ++__current_group_size;
-- *__out++ = *__first++;
-+ *___out++ = *__first++;
- }
- else if (__group_sizes_end) {
- if (*__first == __sep) {
-@@ -129,7 +129,7 @@
-
- if (__first == __last || *__first != __point) {
- for (int __digits = 0; __digits != __frac_digits; ++__digits)
-- *__out++ = _CharT('0');
-+ *___out++ = _CharT('0');
- return true; // OK not to have decimal point
- }
- }
-@@ -139,7 +139,7 @@
- size_t __digits = 0;
-
- while (__first != __last && _c_type.is(ctype_base::digit, *__first)) {
-- *__out++ = *__first++;
-+ *___out++ = *__first++;
- ++__digits;
- }
-
-@@ -202,7 +202,7 @@
- bool __is_positive = true;
- bool __symbol_required = (__str.flags() & ios_base::showbase) !=0;
- string_type __buf;
-- back_insert_iterator<string_type> __out(__buf);
-+ back_insert_iterator<string_type> ___out(__buf);
- // pair<iter_type, bool> __result;
-
- for (__i = 0; __i < 4; ++__i) {
-@@ -293,7 +293,7 @@
- _CharT __sep = __grouping.size() == 0 ? _CharT() :
- __intl ? __punct_intl.thousands_sep() : __punct.thousands_sep();
-
-- __result = __get_monetary_value(__s, __end, __out, __c_type,
-+ __result = __get_monetary_value(__s, __end, ___out, __c_type,
- __point, __frac_digits,
- __sep,
- __grouping, __syntax_ok);
---- misc/STLport-4.5-0119/stlport/stl/_num_get.c Thu Sep 12 22:47:00 2002
-+++ misc/build/STLport-4.5-0119/stlport/stl/_num_get.c Mon Jun 2 10:32:02 2008
-@@ -60,7 +60,7 @@
-
- template <class _InputIter, class _CharT>
- int
--_M_get_base_or_zero(_InputIter& __in, _InputIter& __end, ios_base& __str, _CharT*)
-+_M_get_base_or_zero(_InputIter& ___in, _InputIter& __end, ios_base& __str, _CharT*)
- {
- _CharT __atoms[5];
- const ctype<_CharT>& __c_type = *(const ctype<_CharT>*)__str._M_ctype_facet();
-@@ -68,14 +68,14 @@
- __c_type.widen(__narrow_atoms, __narrow_atoms + 5, __atoms);
-
- bool __negative = false;
-- _CharT __c = *__in;
-+ _CharT __c = *___in;
-
- if (__c == __atoms[1] /* __xminus_char */ ) {
- __negative = true;
-- ++__in;
-+ ++___in;
- }
- else if (__c == __atoms[0] /* __xplus_char */ )
-- ++__in;
-+ ++___in;
-
-
- int __base;
-@@ -92,21 +92,21 @@
- break;
- case ios_base::hex:
- __base = 16;
-- if (__in != __end && *__in == __atoms[2] /* __zero_char */ ) {
-- ++__in;
-- if (__in != __end &&
-- (*__in == __atoms[3] /* __x_char */ || *__in == __atoms[4] /* __X_char */ ))
-- ++__in;
-+ if (___in != __end && *___in == __atoms[2] /* __zero_char */ ) {
-+ ++___in;
-+ if (___in != __end &&
-+ (*___in == __atoms[3] /* __x_char */ || *___in == __atoms[4] /* __X_char */ ))
-+ ++___in;
- else
- __valid_zero = 1; // That zero is valid by itself.
- }
- break;
- default:
-- if (__in != __end && *__in == __atoms[2] /* __zero_char */ ) {
-- ++__in;
-- if (__in != __end &&
-- (*__in == __atoms[3] /* __x_char */ || *__in == __atoms[4] /* __X_char */ )) {
-- ++__in;
-+ if (___in != __end && *___in == __atoms[2] /* __zero_char */ ) {
-+ ++___in;
-+ if (___in != __end &&
-+ (*___in == __atoms[3] /* __x_char */ || *___in == __atoms[4] /* __X_char */ )) {
-+ ++___in;
- __base = 16;
- }
- else
-@@ -252,7 +252,7 @@
-
- template <class _InputIter, class _Integer, class _CharT>
- _InputIter _STLP_CALL
--_M_do_get_integer(_InputIter& __in, _InputIter& __end, ios_base& __str,
-+_M_do_get_integer(_InputIter& ___in, _InputIter& __end, ios_base& __str,
- ios_base::iostate& __err, _Integer& __val, _CharT* __pc)
- {
-
-@@ -265,12 +265,12 @@
- const numpunct<_CharT>& __numpunct = *(const numpunct<_CharT>*)__str._M_numpunct_facet();
- const string& __grouping = __str._M_grouping(); // cached copy
-
-- const int __base_or_zero = _M_get_base_or_zero(__in, __end, __str, __pc);
-+ const int __base_or_zero = _M_get_base_or_zero(___in, __end, __str, __pc);
- int __got = __base_or_zero & 1;
-
- bool __result;
-
-- if (__in == __end) { // We may have already read a 0. If so,
-+ if (___in == __end) { // We may have already read a 0. If so,
-
- if (__got > 0) { // the result is 0 even if we're at eof.
- __val = 0;
-@@ -285,19 +285,19 @@
-
- #if defined(__HP_aCC) && (__HP_aCC == 1)
- if (_IsSigned)
-- __result = __get_integer(__in, __end, __base, __val, __got, __negative, __numpunct.thousands_sep(), __grouping, __true_type() );
-+ __result = __get_integer(___in, __end, __base, __val, __got, __negative, __numpunct.thousands_sep(), __grouping, __true_type() );
- else
-- __result = __get_integer(__in, __end, __base, __val, __got, __negative, __numpunct.thousands_sep(), __grouping, __false_type() );
-+ __result = __get_integer(___in, __end, __base, __val, __got, __negative, __numpunct.thousands_sep(), __grouping, __false_type() );
- #else
-- __result = __get_integer(__in, __end, __base, __val, __got, __negative, __numpunct.thousands_sep(), __grouping, _IsSigned());
-+ __result = __get_integer(___in, __end, __base, __val, __got, __negative, __numpunct.thousands_sep(), __grouping, _IsSigned());
- # endif
- }
-
- __err = __STATIC_CAST(ios_base::iostate, __result ? ios_base::goodbit : ios_base::failbit);
-
-- if (__in == __end)
-+ if (___in == __end)
- __err |= ios_base::eofbit;
-- return __in;
-+ return ___in;
- }
-
- // _M_read_float and its helper functions.
-@@ -376,7 +376,7 @@
-
- template <class _InputIter, class _CharT>
- bool _STLP_CALL
--_M_read_float(string& __buf, _InputIter& __in, _InputIter& __end, ios_base& __s, _CharT*)
-+_M_read_float(string& __buf, _InputIter& ___in, _InputIter& __end, ios_base& __s, _CharT*)
- {
- // Create a string, copying characters of the form
- // [+-]? [0-9]* .? [0-9]* ([eE] [+-]? [0-9]+)?
-@@ -404,20 +404,20 @@
- _Initialize_get_float(__ct, __xplus, __xminus, __pow_e, __pow_E, __digits);
-
- // Get an optional sign
-- __in = __copy_sign(__in, __end, __buf, __xplus, __xminus);
-+ ___in = __copy_sign(___in, __end, __buf, __xplus, __xminus);
-
- // Get an optional string of digits.
- if (__grouping.size() != 0)
-- __digits_before_dot = __copy_grouped_digits(__in, __end, __buf, __digits,
-+ __digits_before_dot = __copy_grouped_digits(___in, __end, __buf, __digits,
- __sep, __grouping, __grouping_ok);
- else
-- __digits_before_dot = __copy_digits(__in, __end, __buf, __digits);
-+ __digits_before_dot = __copy_digits(___in, __end, __buf, __digits);
-
- // Get an optional decimal point, and an optional string of digits.
-- if (__in != __end && *__in == __dot) {
-+ if (___in != __end && *___in == __dot) {
- __buf.push_back('.');
-- ++__in;
-- __digits_after_dot = __copy_digits(__in, __end, __buf, __digits);
-+ ++___in;
-+ __digits_after_dot = __copy_digits(___in, __end, __buf, __digits);
- }
-
- // There have to be some digits, somewhere.
-@@ -424,11 +424,11 @@
- __ok = __digits_before_dot || __digits_after_dot;
-
- // Get an optional exponent.
-- if (__ok && __in != __end && (*__in == __pow_e || *__in == __pow_E)) {
-+ if (__ok && ___in != __end && (*___in == __pow_e || *___in == __pow_E)) {
- __buf.push_back('e');
-- ++__in;
-- __in = __copy_sign(__in, __end, __buf, __xplus, __xminus);
-- __ok = __copy_digits(__in, __end, __buf, __digits);
-+ ++___in;
-+ ___in = __copy_sign(___in, __end, __buf, __xplus, __xminus);
-+ __ok = __copy_digits(___in, __end, __buf, __digits);
- // If we have an exponent then the sign
- // is optional but the digits aren't.
- }
-@@ -466,7 +466,7 @@
- # ifndef _STLP_NO_BOOL
- template <class _CharT, class _InputIter>
- _InputIter
--num_get<_CharT, _InputIter>::do_get(_InputIter __in, _InputIter __end,
-+num_get<_CharT, _InputIter>::do_get(_InputIter ___in, _InputIter __end,
- ios_base& __s,
- ios_base::iostate& __err, bool& __x) const
- {
-@@ -482,8 +482,8 @@
- bool __false_ok = true;
-
- size_t __n = 0;
-- for ( ; __in != __end; ++__in) {
-- _CharT __c = *__in;
-+ for ( ; ___in != __end; ++___in) {
-+ _CharT __c = *___in;
- __true_ok = __true_ok && (__c == __truename[__n]);
- __false_ok = __false_ok && (__c == __falsename[__n]);
- ++__n;
-@@ -491,7 +491,7 @@
- if ((!__true_ok && !__false_ok) ||
- (__true_ok && __n >= __truename.size()) ||
- (__false_ok && __n >= __falsename.size())) {
-- ++__in;
-+ ++___in;
- break;
- }
- }
-@@ -505,15 +505,15 @@
- else
- __err = ios_base::failbit;
-
-- if (__in == __end)
-+ if (___in == __end)
- __err |= ios_base::eofbit;
-
-- return __in;
-+ return ___in;
- }
-
- else {
- long __lx;
-- _InputIter __tmp = this->do_get(__in, __end, __s, __err, __lx);
-+ _InputIter __tmp = this->do_get(___in, __end, __s, __err, __lx);
- if (!(__err & ios_base::failbit)) {
- if (__lx == 0)
- __x = false;
-@@ -531,16 +531,16 @@
- # ifdef _STLP_FIX_LIBRARY_ISSUES
- template <class _CharT, class _InputIter>
- _InputIter
--num_get<_CharT, _InputIter>::do_get(_InputIter __in, _InputIter __end, ios_base& __str,
-+num_get<_CharT, _InputIter>::do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
- ios_base::iostate& __err, short& __val) const {
-- return _M_do_get_integer(__in, __end, __str, __err, __val, (_CharT*)0 );
-+ return _M_do_get_integer(___in, __end, __str, __err, __val, (_CharT*)0 );
- }
-
- template <class _CharT, class _InputIter>
- _InputIter
--num_get<_CharT, _InputIter>::do_get(_InputIter __in, _InputIter __end, ios_base& __str,
-+num_get<_CharT, _InputIter>::do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
- ios_base::iostate& __err, int& __val) const {
-- return _M_do_get_integer(__in, __end, __str, __err, __val, (_CharT*)0 );
-+ return _M_do_get_integer(___in, __end, __str, __err, __val, (_CharT*)0 );
- }
-
- # endif
-@@ -547,83 +547,83 @@
-
- template <class _CharT, class _InputIter>
- _InputIter
--num_get<_CharT, _InputIter>::do_get(_InputIter __in, _InputIter __end, ios_base& __str,
-+num_get<_CharT, _InputIter>::do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
- ios_base::iostate& __err, long& __val) const {
-- return _M_do_get_integer(__in, __end, __str, __err, __val, (_CharT*)0 );
-+ return _M_do_get_integer(___in, __end, __str, __err, __val, (_CharT*)0 );
- }
-
- template <class _CharT, class _InputIter>
- _InputIter
--num_get<_CharT, _InputIter>::do_get(_InputIter __in, _InputIter __end, ios_base& __str,
-+num_get<_CharT, _InputIter>::do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
- ios_base::iostate& __err,
- unsigned short& __val) const {
-- return _M_do_get_integer(__in, __end, __str, __err, __val, (_CharT*)0 );
-+ return _M_do_get_integer(___in, __end, __str, __err, __val, (_CharT*)0 );
- }
-
- template <class _CharT, class _InputIter>
- _InputIter
--num_get<_CharT, _InputIter>::do_get(_InputIter __in, _InputIter __end, ios_base& __str,
-+num_get<_CharT, _InputIter>::do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
- ios_base::iostate& __err,
- unsigned int& __val) const {
-- return _M_do_get_integer(__in, __end, __str, __err, __val, (_CharT*)0 );
-+ return _M_do_get_integer(___in, __end, __str, __err, __val, (_CharT*)0 );
- }
-
- template <class _CharT, class _InputIter>
- _InputIter
--num_get<_CharT, _InputIter>::do_get(_InputIter __in, _InputIter __end, ios_base& __str,
-+num_get<_CharT, _InputIter>::do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
- ios_base::iostate& __err,
- unsigned long& __val) const {
-- return _M_do_get_integer(__in, __end, __str, __err, __val, (_CharT*)0 );
-+ return _M_do_get_integer(___in, __end, __str, __err, __val, (_CharT*)0 );
- }
-
-
- template <class _CharT, class _InputIter>
- _InputIter
--num_get<_CharT, _InputIter>::do_get(_InputIter __in, _InputIter __end, ios_base& __str,
-+num_get<_CharT, _InputIter>::do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
- ios_base::iostate& __err,
- float& __val) const {
- string __buf ;
-- bool __ok = _M_read_float(__buf, __in, __end, __str, (_CharT*)0 );
-+ bool __ok = _M_read_float(__buf, ___in, __end, __str, (_CharT*)0 );
- __string_to_float(__buf, __val);
- __err = __STATIC_CAST(ios_base::iostate, __ok ? ios_base::goodbit : ios_base::failbit);
-- if (__in == __end)
-+ if (___in == __end)
- __err |= ios_base::eofbit;
-- return __in;
-+ return ___in;
- }
-
- template <class _CharT, class _InputIter>
- _InputIter
--num_get<_CharT, _InputIter>::do_get(_InputIter __in, _InputIter __end, ios_base& __str,
-+num_get<_CharT, _InputIter>::do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
- ios_base::iostate& __err,
- double& __val) const {
- string __buf ;
-- bool __ok = _M_read_float(__buf, __in, __end, __str, (_CharT*)0 );
-+ bool __ok = _M_read_float(__buf, ___in, __end, __str, (_CharT*)0 );
- __string_to_float(__buf, __val);
- __err = __STATIC_CAST(ios_base::iostate, __ok ? ios_base::goodbit : ios_base::failbit);
-- if (__in == __end)
-+ if (___in == __end)
- __err |= ios_base::eofbit;
-- return __in;
-+ return ___in;
- }
-
- #ifndef _STLP_NO_LONG_DOUBLE
- template <class _CharT, class _InputIter>
- _InputIter
--num_get<_CharT, _InputIter>::do_get(_InputIter __in, _InputIter __end, ios_base& __str,
-+num_get<_CharT, _InputIter>::do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
- ios_base::iostate& __err,
- long double& __val) const {
- string __buf ;
-- bool __ok = _M_read_float(__buf, __in, __end, __str, (_CharT*)0 );
-+ bool __ok = _M_read_float(__buf, ___in, __end, __str, (_CharT*)0 );
- __string_to_float(__buf, __val);
- __err = __STATIC_CAST(ios_base::iostate, __ok ? ios_base::goodbit : ios_base::failbit);
-- if (__in == __end)
-+ if (___in == __end)
- __err |= ios_base::eofbit;
-- return __in;
-+ return ___in;
- }
- #endif /* _STLP_LONG_DOUBLE */
-
- template <class _CharT, class _InputIter>
- _InputIter
--num_get<_CharT, _InputIter>::do_get(_InputIter __in, _InputIter __end, ios_base& __str,
-+num_get<_CharT, _InputIter>::do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
- ios_base::iostate& __err,
- void*& __p) const {
- # if defined(_STLP_LONG_LONG)&&!defined(__MRC__) //*ty 12/07/2001 - MrCpp can not cast from long long to void*
-@@ -631,7 +631,7 @@
- # else
- unsigned long __val;
- # endif
-- iter_type __tmp = _M_do_get_integer(__in, __end, __str, __err, __val, (_CharT*)0 );
-+ iter_type __tmp = _M_do_get_integer(___in, __end, __str, __err, __val, (_CharT*)0 );
- if (!(__err & ios_base::failbit))
- __p = __REINTERPRET_CAST(void*,__val);
- return __tmp;
-@@ -642,18 +642,18 @@
-
- template <class _CharT, class _InputIter>
- _InputIter
--num_get<_CharT, _InputIter>::do_get(_InputIter __in, _InputIter __end, ios_base& __str,
-+num_get<_CharT, _InputIter>::do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
- ios_base::iostate& __err,
- _STLP_LONG_LONG& __val) const {
-- return _M_do_get_integer(__in, __end, __str, __err, __val, (_CharT*)0 );
-+ return _M_do_get_integer(___in, __end, __str, __err, __val, (_CharT*)0 );
- }
-
- template <class _CharT, class _InputIter>
- _InputIter
--num_get<_CharT, _InputIter>::do_get(_InputIter __in, _InputIter __end, ios_base& __str,
-+num_get<_CharT, _InputIter>::do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
- ios_base::iostate& __err,
- unsigned _STLP_LONG_LONG& __val) const {
-- return _M_do_get_integer(__in, __end, __str, __err, __val, (_CharT*)0 );
-+ return _M_do_get_integer(___in, __end, __str, __err, __val, (_CharT*)0 );
- }
-
- #endif /* _STLP_LONG_LONG */
---- misc/STLport-4.5-0119/stlport/stl/_num_get.h Mon Nov 26 19:37:00 2001
-+++ misc/build/STLport-4.5-0119/stlport/stl/_num_get.h Mon Jun 2 10:32:02 2008
-@@ -58,79 +58,79 @@
- explicit num_get(size_t __refs = 0): locale::facet(__refs) {}
-
- # ifndef _STLP_NO_BOOL
-- _InputIter get(_InputIter __in, _InputIter __end, ios_base& __str,
-+ _InputIter get(_InputIter ___in, _InputIter __end, ios_base& __str,
- ios_base::iostate& __err, bool& __val) const {
-- return do_get(__in, __end, __str, __err, __val);
-+ return do_get(___in, __end, __str, __err, __val);
- }
- # endif
-
- # ifdef _STLP_FIX_LIBRARY_ISSUES
-- _InputIter get(_InputIter __in, _InputIter __end, ios_base& __str,
-+ _InputIter get(_InputIter ___in, _InputIter __end, ios_base& __str,
- ios_base::iostate& __err, short& __val) const {
-- return do_get(__in, __end, __str, __err, __val);
-+ return do_get(___in, __end, __str, __err, __val);
- }
-
-- _InputIter get(_InputIter __in, _InputIter __end, ios_base& __str,
-+ _InputIter get(_InputIter ___in, _InputIter __end, ios_base& __str,
- ios_base::iostate& __err, int& __val) const {
-- return do_get(__in, __end, __str, __err, __val);
-+ return do_get(___in, __end, __str, __err, __val);
- }
- # endif
-
-- _InputIter get(_InputIter __in, _InputIter __end, ios_base& __str,
-+ _InputIter get(_InputIter ___in, _InputIter __end, ios_base& __str,
- ios_base::iostate& __err, long& __val) const {
-- return do_get(__in, __end, __str, __err, __val);
-+ return do_get(___in, __end, __str, __err, __val);
- }
-
-- _InputIter get(_InputIter __in, _InputIter __end, ios_base& __str,
-+ _InputIter get(_InputIter ___in, _InputIter __end, ios_base& __str,
- ios_base::iostate& __err, unsigned short& __val) const {
-- return do_get(__in, __end, __str, __err, __val);
-+ return do_get(___in, __end, __str, __err, __val);
- }
-
-- _InputIter get(_InputIter __in, _InputIter __end, ios_base& __str,
-+ _InputIter get(_InputIter ___in, _InputIter __end, ios_base& __str,
- ios_base::iostate& __err, unsigned int& __val) const {
-- return do_get(__in, __end, __str, __err, __val);
-+ return do_get(___in, __end, __str, __err, __val);
- }
-
-- _InputIter get(_InputIter __in, _InputIter __end, ios_base& __str,
-+ _InputIter get(_InputIter ___in, _InputIter __end, ios_base& __str,
- ios_base::iostate& __err, unsigned long& __val) const {
-- return do_get(__in, __end, __str, __err, __val);
-+ return do_get(___in, __end, __str, __err, __val);
- }
-
- #ifdef _STLP_LONG_LONG
-
-- _InputIter get(_InputIter __in, _InputIter __end, ios_base& __str,
-+ _InputIter get(_InputIter ___in, _InputIter __end, ios_base& __str,
- ios_base::iostate& __err, _STLP_LONG_LONG& __val) const {
-- return do_get(__in, __end, __str, __err, __val);
-+ return do_get(___in, __end, __str, __err, __val);
- }
-
-- _InputIter get(_InputIter __in, _InputIter __end, ios_base& __str,
-+ _InputIter get(_InputIter ___in, _InputIter __end, ios_base& __str,
- ios_base::iostate& __err, unsigned _STLP_LONG_LONG& __val) const {
-- return do_get(__in, __end, __str, __err, __val);
-+ return do_get(___in, __end, __str, __err, __val);
- }
-
- #endif /* _STLP_LONG_LONG */
-
-- _InputIter get(_InputIter __in, _InputIter __end, ios_base& __str,
-+ _InputIter get(_InputIter ___in, _InputIter __end, ios_base& __str,
- ios_base::iostate& __err, float& __val) const {
-- return do_get(__in, __end, __str, __err, __val);
-+ return do_get(___in, __end, __str, __err, __val);
- }
-
-- _InputIter get(_InputIter __in, _InputIter __end, ios_base& __str,
-+ _InputIter get(_InputIter ___in, _InputIter __end, ios_base& __str,
- ios_base::iostate& __err, double& __val) const {
-- return do_get(__in, __end, __str, __err, __val);
-+ return do_get(___in, __end, __str, __err, __val);
- }
-
- # ifndef _STLP_NO_LONG_DOUBLE
-
-- _InputIter get(_InputIter __in, _InputIter __end, ios_base& __str,
-+ _InputIter get(_InputIter ___in, _InputIter __end, ios_base& __str,
- ios_base::iostate& __err, long double& __val) const {
-- return do_get(__in, __end, __str, __err, __val);
-+ return do_get(___in, __end, __str, __err, __val);
- }
- # endif
-
-- _InputIter get(_InputIter __in, _InputIter __end, ios_base& __str,
-+ _InputIter get(_InputIter ___in, _InputIter __end, ios_base& __str,
- ios_base::iostate& __err, void*& __val) const {
-- return do_get(__in, __end, __str, __err, __val);
-+ return do_get(___in, __end, __str, __err, __val);
- }
-
- _STLP_STATIC_MEMBER_DECLSPEC static locale::id id;
-@@ -143,43 +143,43 @@
- typedef numpunct<_CharT> _Numpunct;
-
- # ifndef _STLP_NO_BOOL
-- virtual _InputIter do_get(_InputIter __in, _InputIter __end,
-+ virtual _InputIter do_get(_InputIter ___in, _InputIter __end,
- ios_base& __str, ios_base::iostate& __err, bool& __val) const;
- # endif
-
-- virtual _InputIter do_get(_InputIter __in, _InputIter __end, ios_base& __str,
-+ virtual _InputIter do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
- ios_base::iostate& __err, long& __val) const;
-- virtual _InputIter do_get(_InputIter __in, _InputIter __end, ios_base& __str,
-+ virtual _InputIter do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
- ios_base::iostate& __err, unsigned short& __val) const;
-- virtual _InputIter do_get(_InputIter __in, _InputIter __end, ios_base& __str,
-+ virtual _InputIter do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
- ios_base::iostate& __err, unsigned int& __val) const;
-- virtual _InputIter do_get(_InputIter __in, _InputIter __end, ios_base& __str,
-+ virtual _InputIter do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
- ios_base::iostate& __err, unsigned long& __val) const;
- # ifdef _STLP_FIX_LIBRARY_ISSUES
- // issue 118 : those are actually not supposed to be here
-- virtual _InputIter do_get(_InputIter __in, _InputIter __end, ios_base& __str,
-+ virtual _InputIter do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
- ios_base::iostate& __err, short& __val) const;
-- virtual _InputIter do_get(_InputIter __in, _InputIter __end, ios_base& __str,
-+ virtual _InputIter do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
- ios_base::iostate& __err, int& __val) const;
- # endif
-- virtual _InputIter do_get(_InputIter __in, _InputIter __end, ios_base& __str,
-+ virtual _InputIter do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
- ios_base::iostate& __err, float& __val) const;
-- virtual _InputIter do_get(_InputIter __in, _InputIter __end, ios_base& __str,
-+ virtual _InputIter do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
- ios_base::iostate& __err, double& __val) const;
-- virtual _InputIter do_get(_InputIter __in, _InputIter __end, ios_base& __str,
-+ virtual _InputIter do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
- ios_base::iostate& __err,
- void*& __p) const;
-
- #ifndef _STLP_NO_LONG_DOUBLE
-- virtual _InputIter do_get(_InputIter __in, _InputIter __end, ios_base& __str,
-+ virtual _InputIter do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
- ios_base::iostate& __err, long double& __val) const;
- #endif /* _STLP_LONG_DOUBLE */
-
- #ifdef _STLP_LONG_LONG
-
-- virtual _InputIter do_get(_InputIter __in, _InputIter __end, ios_base& __str,
-+ virtual _InputIter do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
- ios_base::iostate& __err, _STLP_LONG_LONG& __val) const;
-- virtual _InputIter do_get(_InputIter __in, _InputIter __end, ios_base& __str,
-+ virtual _InputIter do_get(_InputIter ___in, _InputIter __end, ios_base& __str,
- ios_base::iostate& __err, unsigned _STLP_LONG_LONG& __val) const;
- #endif /* _STLP_LONG_LONG */
-
---- misc/STLport-4.5-0119/stlport/stl/_num_put.c Thu Sep 12 22:47:01 2002
-+++ misc/build/STLport-4.5-0119/stlport/stl/_num_put.c Mon Jun 2 10:32:02 2008
-@@ -45,29 +45,29 @@
- template <class _CharT, class _OutputIter>
- _OutputIter _STLP_CALL
- __copy_float_and_fill(const _CharT* __first, const _CharT* __last,
-- _OutputIter __out,
-+ _OutputIter ___out,
- ios_base::fmtflags __flags,
- streamsize __width, _CharT __fill,
- _CharT __xplus, _CharT __xminus) {
- if (__width <= __last - __first)
-- return copy(__first, __last, __out);
-+ return copy(__first, __last, ___out);
- else {
- streamsize __pad = __width - (__last - __first);
- ios_base::fmtflags __dir = __flags & ios_base::adjustfield;
-
- if (__dir == ios_base::left) {
-- __out = copy(__first, __last, __out);
-- return fill_n(__out, __pad, __fill);
-+ ___out = copy(__first, __last, ___out);
-+ return fill_n(___out, __pad, __fill);
- }
- else if (__dir == ios_base::internal && __first != __last &&
- (*__first == __xplus || *__first == __xminus)) {
-- *__out++ = *__first++;
-- __out = fill_n(__out, __pad, __fill);
-- return copy(__first, __last, __out);
-+ *___out++ = *__first++;
-+ ___out = fill_n(___out, __pad, __fill);
-+ return copy(__first, __last, ___out);
- }
- else {
-- __out = fill_n(__out, __pad, __fill);
-- return copy(__first, __last, __out);
-+ ___out = fill_n(___out, __pad, __fill);
-+ return copy(__first, __last, ___out);
- }
- }
- }
-@@ -76,7 +76,7 @@
- // Helper routine for wchar_t
- template <class _OutputIter>
- _OutputIter _STLP_CALL
--__put_float(char* __ibuf, char* __iend, _OutputIter __out,
-+__put_float(char* __ibuf, char* __iend, _OutputIter ___out,
- ios_base& __f, wchar_t __fill,
- wchar_t __decimal_point,
- wchar_t __sep, const string& __grouping)
-@@ -107,7 +107,7 @@
- __eend = __wbuf + __len;
- }
-
-- return __copy_float_and_fill(__wbuf, __eend, __out,
-+ return __copy_float_and_fill(__wbuf, __eend, ___out,
- __f.flags(), __f.width(0), __fill,
- __ct.widen('+'), __ct.widen('-'));
- }
-@@ -116,7 +116,7 @@
- // Helper routine for char
- template <class _OutputIter>
- _OutputIter _STLP_CALL
--__put_float(char* __ibuf, char* __iend, _OutputIter __out,
-+__put_float(char* __ibuf, char* __iend, _OutputIter ___out,
- ios_base& __f, char __fill,
- char __decimal_point,
- char __sep, const string& __grouping)
-@@ -133,7 +133,7 @@
- __iend = __ibuf + __len;
- }
-
-- return __copy_float_and_fill(__ibuf, __iend, __out,
-+ return __copy_float_and_fill(__ibuf, __iend, ___out,
- __f.flags(), __f.width(0), __fill, '+', '-');
- }
-
-@@ -158,37 +158,37 @@
- template <class _CharT, class _OutputIter>
- _OutputIter _STLP_CALL
- __copy_integer_and_fill(const _CharT* __buf, ptrdiff_t __len,
-- _OutputIter __out,
-+ _OutputIter ___out,
- ios_base::fmtflags __flg, streamsize __wid, _CharT __fill,
- _CharT __xplus, _CharT __xminus)
- {
- if (__len >= __wid)
-- return copy(__buf, __buf + __len, __out);
-+ return copy(__buf, __buf + __len, ___out);
- else {
- ptrdiff_t __pad = __wid - __len;
- ios_base::fmtflags __dir = __flg & ios_base::adjustfield;
-
- if (__dir == ios_base::left) {
-- __out = copy(__buf, __buf + __len, __out);
-- return fill_n(__out, __pad, __fill);
-+ ___out = copy(__buf, __buf + __len, ___out);
-+ return fill_n(___out, __pad, __fill);
- }
- else if (__dir == ios_base::internal && __len != 0 &&
- (__buf[0] == __xplus || __buf[0] == __xminus)) {
-- *__out++ = __buf[0];
-- __out = fill_n(__out, __pad, __fill);
-- return copy(__buf + 1, __buf + __len, __out);
-+ *___out++ = __buf[0];
-+ ___out = fill_n(___out, __pad, __fill);
-+ return copy(__buf + 1, __buf + __len, ___out);
- }
- else if (__dir == ios_base::internal && __len >= 2 &&
- (__flg & ios_base::showbase) &&
- (__flg & ios_base::basefield) == ios_base::hex) {
-- *__out++ = __buf[0];
-- *__out++ = __buf[1];
-- __out = fill_n(__out, __pad, __fill);
-- return copy(__buf + 2, __buf + __len, __out);
-+ *___out++ = __buf[0];
-+ *___out++ = __buf[1];
-+ ___out = fill_n(___out, __pad, __fill);
-+ return copy(__buf + 2, __buf + __len, ___out);
- }
- else {
-- __out = fill_n(__out, __pad, __fill);
-- return copy(__buf, __buf + __len, __out);
-+ ___out = fill_n(___out, __pad, __fill);
-+ return copy(__buf, __buf + __len, ___out);
- }
- }
- }
---- misc/STLport-4.5-0119/stlport/stl/_sstream.c Thu Sep 12 22:47:04 2002
-+++ misc/build/STLport-4.5-0119/stlport/stl/_sstream.c Mon Jun 2 10:32:02 2008
-@@ -337,22 +337,22 @@
- ios_base::seekdir __dir,
- ios_base::openmode __mode)
- {
-- bool __in = false;
-- bool __out = false;
-+ bool ___in = false;
-+ bool ___out = false;
-
- if ((__mode & (ios_base::in | ios_base::out)) == (ios_base::in | ios_base::out) ) {
- if (__dir == ios_base::beg || __dir == ios_base::end)
-- __in = __out = true;
-+ ___in = ___out = true;
- }
- else if (__mode & ios_base::in)
-- __in = true;
-+ ___in = true;
- else if (__mode & ios_base::out)
-- __out = true;
-+ ___out = true;
-
-- if (!__in && !__out)
-+ if (!___in && !___out)
- return pos_type(off_type(-1));
-- else if ((__in && (!(_M_mode & ios_base::in) || this->gptr() == 0)) ||
-- (__out && (!(_M_mode & ios_base::out) || this->pptr() == 0)))
-+ else if ((___in && (!(_M_mode & ios_base::in) || this->gptr() == 0)) ||
-+ (___out && (!(_M_mode & ios_base::out) || this->pptr() == 0)))
- return pos_type(off_type(-1));
-
- if ((_M_mode & ios_base::out) && !(_M_mode & ios_base::in))
-@@ -367,7 +367,7 @@
- __newoff = _M_str.size();
- break;
- case ios_base::cur:
-- __newoff = __in ? this->gptr() - this->eback()
-+ __newoff = ___in ? this->gptr() - this->eback()
- : this->pptr() - this->pbase();
- break;
- default:
-@@ -376,7 +376,7 @@
-
- __off += __newoff;
-
-- if (__in) {
-+ if (___in) {
- ptrdiff_t __n = this->egptr() - this->eback();
-
- if (__off < 0 || __off > __n)
-@@ -385,7 +385,7 @@
- this->setg(this->eback(), this->eback() + __off, this->eback() + __n);
- }
-
-- if (__out) {
-+ if (___out) {
- ptrdiff_t __n = this->epptr() - this->pbase();
-
- if (__off < 0 || __off > __n)
-@@ -404,11 +404,11 @@
- basic_stringbuf<_CharT, _Traits, _Alloc>
- ::seekpos(pos_type __pos, ios_base::openmode __mode)
- {
-- bool __in = (__mode & ios_base::in) != 0;
-- bool __out = (__mode & ios_base::out) != 0;
-+ bool ___in = (__mode & ios_base::in) != 0;
-+ bool ___out = (__mode & ios_base::out) != 0;
-
-- if ((__in && (!(_M_mode & ios_base::in) || this->gptr() == 0)) ||
-- (__out && (!(_M_mode & ios_base::out) || this->pptr() == 0)))
-+ if ((___in && (!(_M_mode & ios_base::in) || this->gptr() == 0)) ||
-+ (___out && (!(_M_mode & ios_base::out) || this->pptr() == 0)))
- return pos_type(off_type(-1));
-
- const off_type __n = __pos - pos_type(off_type(0));
-@@ -415,13 +415,13 @@
- if ((_M_mode & ios_base::out) && !(_M_mode & ios_base::in))
- _M_append_buffer();
-
-- if (__in) {
-+ if (___in) {
- if (__n < 0 || __n > this->egptr() - this->eback())
- return pos_type(off_type(-1));
- this->setg(this->eback(), this->eback() + __n, this->egptr());
- }
-
-- if (__out) {
-+ if (___out) {
- if (__n < 0 || size_t(__n) > _M_str.size())
- return pos_type(off_type(-1));
-
---- misc/STLport-4.5-0119/stlport/stl/_time_facets.c Thu Sep 12 22:47:07 2002
-+++ misc/build/STLport-4.5-0119/stlport/stl/_time_facets.c Mon Jun 2 10:32:02 2008
-@@ -328,7 +328,7 @@
- # ifndef _STLP_NO_WCHAR_T
- template <class _OuIt>
- _OuIt _STLP_CALL
--__put_time(char * __first, char * __last, _OuIt __out,
-+__put_time(char * __first, char * __last, _OuIt ___out,
- const ios_base& __s, wchar_t) {
- const ctype<wchar_t>& __ct = *(ctype<wchar_t>*)__s._M_ctype_facet();
- wchar_t __wbuf[64];
-@@ -335,7 +335,7 @@
- __ct.widen(__first, __last, __wbuf);
- ptrdiff_t __len = __last - __first;
- wchar_t * __eend = __wbuf + __len;
-- return copy((wchar_t*)__wbuf, __eend, __out);
-+ return copy((wchar_t*)__wbuf, __eend, ___out);
- }
- # endif
-
---- misc/STLport-4.5-0119/stlport/stl/_time_facets.h Wed Aug 29 00:55:47 2001
-+++ misc/build/STLport-4.5-0119/stlport/stl/_time_facets.h Mon Jun 2 10:32:02 2008
-@@ -198,14 +198,14 @@
- const _Time_Info& __table, const tm* __t);
-
- template <class _OuIt>
--inline _OuIt _STLP_CALL __put_time(char * __first, char * __last, _OuIt __out,
-+inline _OuIt _STLP_CALL __put_time(char * __first, char * __last, _OuIt ___out,
- const ios_base& /* __loc */, char) {
-- return copy(__first, __last, __out);
-+ return copy(__first, __last, ___out);
- }
-
- # ifndef _STLP_NO_WCHAR_T
- template <class _OuIt>
--_OuIt _STLP_CALL __put_time(char * __first, char * __last, _OuIt __out,
-+_OuIt _STLP_CALL __put_time(char * __first, char * __last, _OuIt ___out,
- const ios_base& __s, wchar_t);
- # endif
-
---- misc/STLport-4.5-0119/stlport/stl/debug/_debug.c Thu Sep 12 22:47:08 2002
-+++ misc/build/STLport-4.5-0119/stlport/stl/debug/_debug.c Mon Jun 2 10:32:02 2008
-@@ -82,7 +82,7 @@
- template <class _Iterator>
- bool _STLP_CALL __check_range(const _Iterator& __it,
- const _Iterator& __start, const _Iterator& __finish) {
-- _STLP_VERBOSE_RETURN(__in_range(__it,__start, __finish),
-+ _STLP_VERBOSE_RETURN(___in_range(__it,__start, __finish),
- _StlMsg_NOT_IN_RANGE_1)
- return true;
- }
-@@ -90,7 +90,7 @@
- template <class _Iterator>
- bool _STLP_CALL __check_range(const _Iterator& __first, const _Iterator& __last,
- const _Iterator& __start, const _Iterator& __finish) {
-- _STLP_VERBOSE_RETURN(__in_range(__first, __last, __start, __finish),
-+ _STLP_VERBOSE_RETURN(___in_range(__first, __last, __start, __finish),
- _StlMsg_NOT_IN_RANGE_2)
- return true;
- }
---- misc/STLport-4.5-0119/stlport/stl/debug/_debug.h Thu Sep 12 22:47:09 2002
-+++ misc/build/STLport-4.5-0119/stlport/stl/debug/_debug.h Mon Jun 2 10:32:03 2008
-@@ -227,7 +227,7 @@
-
- // Note : that means in range [i1, i2].
- template <class _Iterator>
--inline bool _STLP_CALL __in_range(const _Iterator& _It, const _Iterator& __i1,
-+inline bool _STLP_CALL ___in_range(const _Iterator& _It, const _Iterator& __i1,
- const _Iterator& __i2) {
- return __valid_range(__i1,_It,_STLP_ITERATOR_CATEGORY(__i1, _Iterator)) &&
- __valid_range(_It,__i2,_STLP_ITERATOR_CATEGORY(_It, _Iterator));
-@@ -234,7 +234,7 @@
- }
-
- template <class _Iterator>
--inline bool _STLP_CALL __in_range(const _Iterator& __first, const _Iterator& __last,
-+inline bool _STLP_CALL ___in_range(const _Iterator& __first, const _Iterator& __last,
- const _Iterator& __start, const _Iterator& __finish) {
- return __valid_range(__first,__last,_STLP_ITERATOR_CATEGORY(__first, _Iterator)) &&
- __valid_range(__start,__first,_STLP_ITERATOR_CATEGORY(__first, _Iterator)) &&
---- misc/STLport-4.5-0119/stlport/stl/debug/_deque.h Fri May 4 04:11:54 2001
-+++ misc/build/STLport-4.5-0119/stlport/stl/debug/_deque.h Mon Jun 2 10:32:03 2008
-@@ -121,9 +121,9 @@
- explicit _DBG_deque(const allocator_type& __a = allocator_type()) :
- _STLP_DEQUE_SUPER(__a), _M_iter_list(_Get_base()) {}
- _DBG_deque(const _Self& __x) : _STLP_DEQUE_SUPER(__x), _M_iter_list(_Get_base()) {}
-- _DBG_deque(size_type __n, const value_type& __value,
-+ _DBG_deque(size_type __n, const value_type& ___value,
- const allocator_type& __a = allocator_type()) :
-- _STLP_DEQUE_SUPER(__n, __value, __a), _M_iter_list(_Get_base()) {}
-+ _STLP_DEQUE_SUPER(__n, ___value, __a), _M_iter_list(_Get_base()) {}
- explicit _DBG_deque(size_type __n) : _STLP_DEQUE_SUPER(__n), _M_iter_list(_Get_base()) {}
-
- #ifdef _STLP_MEMBER_TEMPLATES
---- misc/STLport-4.5-0119/stlport/stl/debug/_list.h Wed May 30 05:45:43 2001
-+++ misc/build/STLport-4.5-0119/stlport/stl/debug/_list.h Mon Jun 2 10:32:03 2008
-@@ -79,9 +79,9 @@
- _Base* _Get_base() { return (_Base*)this; }
- explicit _DBG_list(const allocator_type& __a = allocator_type()) :
- _STLP_DBG_LIST_BASE(__a), _M_iter_list(_Get_base()) {}
-- _DBG_list(size_type __n, const _Tp& __value,
-+ _DBG_list(size_type __n, const _Tp& ___value,
- const allocator_type& __a = allocator_type())
-- : _STLP_DBG_LIST_BASE(__n, __value, __a), _M_iter_list(_Get_base()) {}
-+ : _STLP_DBG_LIST_BASE(__n, ___value, __a), _M_iter_list(_Get_base()) {}
- explicit _DBG_list(size_type __n)
- : _STLP_DBG_LIST_BASE(__n), _M_iter_list(_Get_base()) {}
-
-@@ -219,13 +219,13 @@
-
- void resize(size_type __new_size) { this->resize(__new_size, _Tp()); }
-
-- void remove(const _Tp& __value) {
-+ void remove(const _Tp& ___value) {
- typename _Base::iterator __first = _Base::begin();
- typename _Base::iterator __last = _Base::end();
- while (__first != __last) {
- typename _Base::iterator __next = __first;
- ++__next;
-- if (__value == *__first) erase(iterator(&_M_iter_list,__first));
-+ if (___value == *__first) erase(iterator(&_M_iter_list,__first));
- __first = __next;
- }
- }
---- misc/STLport-4.5-0119/stlport/stl/debug/_vector.h Mon Oct 28 16:09:32 2002
-+++ misc/build/STLport-4.5-0119/stlport/stl/debug/_vector.h Mon Jun 2 10:32:03 2008
-@@ -141,9 +141,9 @@
- explicit _DBG_vector(const allocator_type& __a = allocator_type())
- : _STLP_DBG_VECTOR_BASE(__a), _M_iter_list((const _Base*)this) {}
-
-- _DBG_vector(size_type __n, const _Tp& __value,
-+ _DBG_vector(size_type __n, const _Tp& ___value,
- const allocator_type& __a = allocator_type())
-- : _STLP_DBG_VECTOR_BASE(__n, __value, __a), _M_iter_list((const _Base*)this) {}
-+ : _STLP_DBG_VECTOR_BASE(__n, ___value, __a), _M_iter_list((const _Base*)this) {}
-
- explicit _DBG_vector(size_type __n)
- : _STLP_DBG_VECTOR_BASE(__n), _M_iter_list((const _Base*)this) {}
---- misc/build/STLport-4.5-0119/stlport/stl/_threads.h
-+++ misc/build/STLport-4.5-0119/stlport/stl/_threads.h
-@@ -99,7 +99,7 @@
- # else
- // This section serves as a replacement for windows.h header for Visual C++
- extern "C" {
--# if (defined(_M_MRX000) || defined(_M_ALPHA) \
-+# if (defined(_M_MRX000) || defined(_M_ALPHA) || defined(_M_AMD64) \
- || (defined(_M_PPC) && (_MSC_VER >= 1000))) && !defined(RC_INVOKED)
- # define InterlockedIncrement _InterlockedIncrement
- # define InterlockedDecrement _InterlockedDecrement
diff --git a/stlport/STLport-4.5-cxx0x.patch b/stlport/STLport-4.5-cxx0x.patch
deleted file mode 100644
index 88d96d0df..000000000
--- a/stlport/STLport-4.5-cxx0x.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- misc/STLport-4.5/stlport/config/stl_gcc.h
-+++ misc/build/STLport-4.5/stlport/config/stl_gcc.h
-@@ -239,10 +239,10 @@
-
-
- /* strict ANSI prohibits "long long" ( gcc) */
--# if defined ( __STRICT_ANSI__ )
--# undef _STLP_LONG_LONG
--// # define _STLP_STRICT_ANSI 1
--# endif
-+//# if defined ( __STRICT_ANSI__ )
-+//# undef _STLP_LONG_LONG
-+//// # define _STLP_STRICT_ANSI 1
-+//# endif
-
- //# if !defined (__STRICT_ANSI__) || defined (__BUILDING_STLPORT)
- //# define _STLP_USE_TEMPLATE_EXPORT
diff --git a/stlport/STLport-4.5-gcc43_warnings.patch b/stlport/STLport-4.5-gcc43_warnings.patch
deleted file mode 100644
index f5e1d4b5c..000000000
--- a/stlport/STLport-4.5-gcc43_warnings.patch
+++ /dev/null
@@ -1,113 +0,0 @@
---- misc/STLport-4.5/src/num_get_float.cpp 2001-05-03 09:40:43.000000000 +0200
-+++ misc/build/STLport-4.5/src/num_get_float.cpp 2009-03-22 17:31:30.000000000 +0100
-@@ -484,7 +484,7 @@
- else { /* not zero or denorm */
- /* Round to 53 bits */
-
-- rest = value & (1<<10)-1;
-+ rest = value & ((1<<10)-1);
- value >>= 10;
- #if !defined(__SC__)
- guard = (uint32) value & 1;
---- misc/STLport-4.5/src/strstream.cpp 2001-01-27 02:39:29.000000000 +0100
-+++ misc/build/STLport-4.5/src/strstream.cpp 2009-03-22 17:26:32.000000000 +0100
-@@ -284,11 +284,12 @@
-
- void strstreambuf::_M_free(char* p)
- {
-- if (p)
-+ if (p) {
- if (_M_free_fun)
- _M_free_fun(p);
- else
- delete[] p;
-+ }
- }
-
- void strstreambuf::_M_setup(char* get, char* put, streamsize n)
---- misc/STLport-4.5/stlport/stl/_list.c 2001-05-11 04:20:07.000000000 +0200
-+++ misc/build/STLport-4.5/stlport/stl/_list.c 2009-03-22 17:26:32.000000000 +0100
-@@ -82,7 +82,7 @@
- {
- iterator __i = begin();
- size_type __len = 0;
-- for ( ; __i != end() && __len < __new_size; ++__i, ++__len);
-+ for ( ; __i != end() && __len < __new_size; ++__i, ++__len) ;
-
- if (__len == __new_size)
- erase(__i, end());
---- misc/STLport-4.5/stlport/stl/_time_facets.c 2001-03-19 08:01:09.000000000 +0100
-+++ misc/build/STLport-4.5/stlport/stl/_time_facets.c 2009-03-22 17:26:32.000000000 +0100
-@@ -101,7 +101,7 @@
-
- while (__first != __last) {
- for (__i = 0; __i < __n; ++__i)
-- if (__do_check[__i])
-+ if (__do_check[__i]) {
- if (*__first == __name[__i][__pos]) {
- if (__pos == _DiffType(__name[__i].size()) - 1) {
- __do_check[__i] = 0;
-@@ -119,6 +119,7 @@
- if (__check_count == 0)
- return __matching_name[__pos];
- }
-+ }
-
- ++__first; ++__pos;
- }
---- misc/STLport-4.5/stlport/stl/_tree.c 2009-03-22 17:04:36.000000000 +0100
-+++ misc/build/STLport-4.5/stlport/stl/_tree.c 2009-03-22 17:26:32.000000000 +0100
-@@ -186,18 +186,20 @@
- __z->_M_parent->_M_left = __x;
- else
- __z->_M_parent->_M_right = __x;
-- if (__leftmost == __z)
-+ if (__leftmost == __z) {
- if (__z->_M_right == 0) // __z->_M_left must be null also
- __leftmost = __z->_M_parent;
- // makes __leftmost == _M_header if __z == __root
- else
- __leftmost = _Rb_tree_node_base::_S_minimum(__x);
-- if (__rightmost == __z)
-+ }
-+ if (__rightmost == __z) {
- if (__z->_M_left == 0) // __z->_M_right must be null also
- __rightmost = __z->_M_parent;
- // makes __rightmost == _M_header if __z == __root
- else // __x == __z->_M_left
- __rightmost = _Rb_tree_node_base::_S_maximum(__x);
-+ }
- }
- if (__y->_M_color != _S_rb_tree_red) {
- while (__x != __root && (__x == 0 || __x->_M_color == _S_rb_tree_black))
---- misc/STLport-4.5/stlport/stl/debug/_debug.c 2001-05-30 05:45:43.000000000 +0200
-+++ misc/build/STLport-4.5/stlport/stl/debug/_debug.c 2009-03-22 17:26:32.000000000 +0100
-@@ -58,7 +58,7 @@
- # endif
- const _Iterator& __last, const forward_iterator_tag &) {
- _Iterator1 __i(__first);
-- for (; __i != __last && __i != __it; ++__i);
-+ for (; __i != __last && __i != __it; ++__i) ;
- return (__i!=__last);
- }
-
-@@ -68,7 +68,7 @@
- __in_range_aux(const _Iterator1& __it, const _Iterator& __first,
- const _Iterator& __last, const bidirectional_iterator_tag &) {
- _Iterator1 __i(__first);
-- for (; __i != __last && __i != __it; ++__i);
-+ for (; __i != __last && __i != __it; ++__i) ;
- return (__i !=__last);
- }
- # endif
---- misc/STLport-4.5/stlport/stl/debug/_list.h 2001-05-30 05:45:43.000000000 +0200
-+++ misc/build/STLport-4.5/stlport/stl/debug/_list.h 2009-03-22 17:26:32.000000000 +0100
-@@ -209,7 +209,7 @@
- void resize(size_type __new_size, const _Tp& __x) {
- typename _Base::iterator __i = _Base::begin();
- size_type __len = 0;
-- for ( ; __i != _Base::end() && __len < __new_size; ++__i, ++__len);
-+ for ( ; __i != _Base::end() && __len < __new_size; ++__i, ++__len) ;
-
- if (__len == __new_size)
- erase(iterator(&_M_iter_list,__i), end());
diff --git a/stlport/STLport-4.5.patch b/stlport/STLport-4.5.patch
deleted file mode 100644
index 0a0027594..000000000
--- a/stlport/STLport-4.5.patch
+++ /dev/null
@@ -1,1047 +0,0 @@
---- misc/STLport-4.5/src/common_macros_os2.mak 2008-07-18 14:14:27.000000000 +0200
-+++ misc/build/STLport-4.5/src/common_macros_os2.mak 2008-07-18 14:14:05.000000000 +0200
-@@ -1 +1,37 @@
--dummy
-+SHELL=/bin/sh
-+
-+# INSTALLDIR=/usr/local
-+# INSTALLDIR_INC=$(INSTALLDIR)/include/stlport
-+# INSTALLDIR_LIB=$(INSTALLDIR)/lib
-+
-+# RM = rm -fr
-+
-+# INSTALL = ./install.sh -c
-+# INSTALL_LIB = $(INSTALL)
-+# INSTALL_H = $(INSTALL) -m 444
-+
-+#
-+#
-+# Targets
-+#
-+
-+VERSION_SUFFIX= $(VERSION_MAJOR)$(VERSION_MINOR)$(BETA_SUFFIX)
-+DYNAMIC_SUFFIX= $(VERSION_SUFFIX)$(PATCH_SUFFIX)
-+DYNAMIC_SUFFIX= $(VERSION_SUFFIX)$(PATCH_SUFFIX)
-+
-+# those are defined "Unix way" in common_macros.mak; redefine them here
-+RELEASE_DYNLIB=$(RELEASE_NAME)$(DYNAMIC_SUFFIX).$(DYNEXT)
-+DEBUG_DYNLIB=$(DEBUG_NAME)$(DYNAMIC_SUFFIX).$(DYNEXT)
-+STLDEBUG_DYNLIB=$(STLDEBUG_NAME)$(DYNAMIC_SUFFIX).$(DYNEXT)
-+
-+RELEASE_DYNLIB_SONAME=$(RELEASE_NAME)$(VERSION_SUFFIX).$(DYNEXT)
-+DEBUG_DYNLIB_SONAME=$(DEBUG_NAME)$(VERSION_SUFFIX).$(DYNEXT)
-+STLDEBUG_DYNLIB_SONAME=$(STLDEBUG_NAME)$(VERSION_SUFFIX).$(DYNEXT)
-+
-+ALL_DYNAMIC_LIBS=$(OUTDIR)$(PATH_SEP)$(RELEASE_DYNLIB) $(OUTDIR)$(PATH_SEP)$(STLDEBUG_DYNLIB)
-+ALL_DYNAMIC_LIBS=$(OUTDIR)$(PATH_SEP)$(RELEASE_DYNLIB)
-+DEBUG_DYNAMIC_LIBS=$(OUTDIR)$(PATH_SEP)$(RELEASE_DYNLIB) $(OUTDIR)$(PATH_SEP)$(STLDEBUG_DYNLIB)
-+
-+RELEASE_LIB=$(RELEASE_NAME)$(STATIC_SUFFIX).$(STEXT)
-+DEBUG_LIB=$(DEBUG_NAME)$(STATIC_SUFFIX).$(STEXT)
-+STLDEBUG_LIB=$(STLDEBUG_NAME)$(STATIC_SUFFIX).$(STEXT)
---- misc/STLport-4.5/src/common_percent_rules.mak 2001-05-19 05:04:20.000000000 +0200
-+++ misc/build/STLport-4.5/src/common_percent_rules.mak 2008-07-18 14:13:49.000000000 +0200
-@@ -1,45 +1,52 @@
-
- .SUFFIXES: .cpp .c .o .so .a
-
-+CFLAGS_RELEASE_static*= $(CXXFLAGS_RELEASE_static)
-+CFLAGS_RELEASE_dynamic*= $(CXXFLAGS_RELEASE_dynamic)
-+CFLAGS_DEBUG_static*= $(CXXFLAGS_DEBUG_static)
-+CFLAGS_DEBUG_dynamic*= $(CXXFLAGS_DEBUG_dynamic)
-+CFLAGS_STLDEBUG_static*= $(CXXFLAGS_STLDEBUG_static)
-+CFLAGS_STLDEBUG_dynamic*= $(CXXFLAGS_STLDEBUG_dynamic)
-+
- $(RELEASE_OBJDIR_static)/%.o: %.cpp
- $(CXX) $(CXXFLAGS_RELEASE_static) $< -c -o $@
- $(RELEASE_OBJDIR_static)/%.o: %.c
-- $(CC) $(CXXFLAGS_RELEASE_static) $< -c -o $@
-+ $(CC) $(CFLAGS_RELEASE_static) $< -c -o $@
- $(RELEASE_OBJDIR_static)/%.i : %.cpp
- $(CXX) $(CXXFLAGS_RELEASE_static) $< -E $@
-
- $(RELEASE_OBJDIR_dynamic)/%.o : %.cpp
- $(CXX) $(CXXFLAGS_RELEASE_dynamic) $< -c -o $@
- $(RELEASE_OBJDIR_dynamic)/%.o : %.c
-- $(CC) $(CXXFLAGS_RELEASE_dynamic) $< -c -o $@
-+ $(CC) $(CFLAGS_RELEASE_dynamic) $< -c -o $@
- $(RELEASE_OBJDIR_dynamic)/%.i : %.cpp
- $(CXX) $(CXXFLAGS_RELEASE_dynamic) $< -E $@
-
- $(DEBUG_OBJDIR_static)/%.o : %.cpp
- $(CXX) $(CXXFLAGS_DEBUG_static) $< -c -o $@
- $(DEBUG_OBJDIR_static)/%.o : %.c
-- $(CC) $(CXXFLAGS_DEBUG_static) $< -c -o $@
-+ $(CC) $(CFLAGS_DEBUG_static) $< -c -o $@
- $(DEBUG_OBJDIR_static)/%.i : %.cpp
- $(CXX) $(CXXFLAGS_DEBUG_static) $< -E $@
-
- $(DEBUG_OBJDIR_dynamic)/%.o : %.cpp
- $(CXX) $(CXXFLAGS_DEBUG_dynamic) $< -c -o $@
- $(DEBUG_OBJDIR_dynamic)/%.o : %.c
-- $(CC) $(CXXFLAGS_DEBUG_dynamic) $< -c -o $@
-+ $(CC) $(CFLAGS_DEBUG_dynamic) $< -c -o $@
- $(DEBUG_OBJDIR_dynamic)/%.i : %.cpp
- $(CXX) $(CXXFLAGS_DEBUG_dynamic) $< -E $@
-
- $(STLDEBUG_OBJDIR_static)/%.o : %.cpp
- $(CXX) $(CXXFLAGS_STLDEBUG_static) $< -c -o $@
- $(STLDEBUG_OBJDIR_static)/%.o : %.c
-- $(CC) $(CXXFLAGS_STLDEBUG_static) $< -c -o $@
-+ $(CC) $(CFLAGS_STLDEBUG_static) $< -c -o $@
- $(STLDEBUG_OBJDIR_static)/%.i : %.cpp
- $(CXX) $(CXXFLAGS_STLDEBUG_static) $< -E $@
-
- $(STLDEBUG_OBJDIR_dynamic)/%.o : %.cpp
- $(CXX) $(CXXFLAGS_STLDEBUG_dynamic) $< -c -o $@
- $(STLDEBUG_OBJDIR_dynamic)/%.o : %.c
-- $(CC) $(CXXFLAGS_STLDEBUG_dynamic) $< -c -o $@
-+ $(CC) $(CFLAGS_STLDEBUG_dynamic) $< -c -o $@
- $(STLDEBUG_OBJDIR_dynamic)/%.i : %.cpp
- $(CXX) $(CXXFLAGS_STLDEBUG_dynamic) $< -E $@
-
---- misc/STLport-4.5/src/dll_main.cpp 2001-08-25 03:14:19.000000000 +0200
-+++ misc/build/STLport-4.5/src/dll_main.cpp 2008-07-18 14:13:49.000000000 +0200
-@@ -147,6 +147,10 @@
- template struct _STLP_CLASS_DECLSPEC __stl_debug_engine<bool>;
- # endif
-
-+#ifdef __APPLE__
-+template class _STLP_CLASS_DECLSPEC _Node_Alloc_Lock<false,0>;
-+template class _STLP_CLASS_DECLSPEC _Node_Alloc_Lock<true,0>;
-+#endif
- template class _STLP_CLASS_DECLSPEC __node_alloc<false,0>;
- template class _STLP_CLASS_DECLSPEC __node_alloc<true,0>;
- template class _STLP_CLASS_DECLSPEC __debug_alloc< __node_alloc<true,0> >;
---- misc/STLport-4.5/src/gcc-3.0-freebsd.mak 2008-07-18 14:14:26.000000000 +0200
-+++ misc/build/STLport-4.5/src/gcc-3.0-freebsd.mak 2008-07-18 14:13:49.000000000 +0200
-@@ -1 +1,69 @@
--dummy
-+#
-+# Note : this makefile is for gcc-3 !
-+#
-+
-+#
-+# compiler
-+# take these from the OOo build environment
-+CC*= gcc
-+CXX*= g++
-+
-+#
-+# Basename for libraries
-+#
-+LIB_BASENAME = libstlport_gcc
-+
-+#
-+# guts for common stuff
-+#
-+#
-+LINK=ar cr
-+DYN_LINK=${CXX} -Wl,-rpath,'$$ORIGIN' ${PTHREAD_LIBS} -fexceptions -shared -o
-+
-+OBJEXT=o
-+DYNEXT=so
-+STEXT=a
-+RM=rm -rf
-+PATH_SEP=/
-+MKDIR=mkdir -p
-+COMP=GCC$(ARCH)
-+INSTALL_STEP = install_unix
-+
-+all: all_dynamic all_static symbolic_links
-+
-+include common_macros.mak
-+
-+WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized
-+
-+CXXFLAGS_COMMON = ${PTHREAD_CFLAGS} -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} -fexceptions -ftemplate-depth-32 -I${STLPORT_DIR} ${WARNING_FLAGS} ${ARCH_FLAGS}
-+CFLAGS_COMMON = ${PTHREAD_CFLAGS} -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} -fexceptions -I${STLPORT_DIR} ${WARNING_FLAGS} ${ARCH_FLAGS}
-+
-+CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2 -fPIC
-+CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
-+
-+CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g -fPIC
-+CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
-+
-+CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_DEBUG_RUNTIME
-+CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_DEBUG_RUNTIME
-+
-+CFLAGS_RELEASE_static = $(CFLAGS_COMMON) -O2 -fPIC
-+CFLAGS_RELEASE_dynamic = $(CFLAGS_COMMON) -O2 -fPIC
-+
-+CFLAGS_DEBUG_static = $(CFLAGS_COMMON) -g -fPIC
-+CFLAGS_DEBUG_dynamic = $(CFLAGS_COMMON) -g -fPIC
-+
-+CFLAGS_STLDEBUG_static = $(CFLAGS_DEBUG_static) -D_DEBUG_RUNTIME
-+CFLAGS_STLDEBUG_dynamic = $(CFLAGS_DEBUG_dynamic) -D_DEBUG_RUNTIME
-+
-+include common_percent_rules.mak
-+include common_rules.mak
-+
-+
-+#install: all
-+# cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib
-+
-+#%.s: %.cpp
-+# $(CXX) $(CXXFLAGS) -O4 -S -pto $< -o $@
-+
-+
---- misc/STLport-4.5/src/gcc-3.0-mingw.mak 2008-07-18 14:14:26.000000000 +0200
-+++ misc/build/STLport-4.5/src/gcc-3.0-mingw.mak 2008-07-18 14:13:49.000000000 +0200
-@@ -1 +1,108 @@
--dummy
-+#
-+# Note : this makefile is for gcc-3 !
-+#
-+
-+#
-+# compiler
-+# take these from the OOo build environment
-+CC*= gcc
-+CXX*= g++
-+
-+#
-+# Basename for libraries
-+#
-+LIB_BASENAME = libstlport_gcc
-+
-+#
-+# guts for common stuff
-+#
-+#
-+LINK=ar crv
-+DYN_LINK=$(CXX) -fexceptions -shared -o
-+
-+OBJEXT=o
-+DYNEXT=dll
-+STEXT=a
-+RM=rm -rf
-+PATH_SEP=/
-+MKDIR=mkdir -p
-+COMP=MINGW32
-+STATIC_SUFFIX=_static
-+
-+
-+all: all_dynamic debug_dynamic all_static debug_static
-+
-+include common_macros.mak
-+
-+# those are defined "Unix way" in common_macros.mak; redefine them here
-+RELEASE_DYNLIB=$(RELEASE_NAME).$(DYNEXT)
-+DEBUG_DYNLIB=$(DEBUG_NAME).$(DYNEXT)
-+STLDEBUG_DYNLIB=$(STLDEBUG_NAME).$(DYNEXT)
-+
-+RELEASE_DYNLIB_SONAME=$(RELEASE_DYNLIB)
-+DEBUG_DYNLIB_SONAME=$(DEBUG_DYNLIB)
-+STLDEBUG_DYNLIB_SONAME=$(STLDEBUG_DYNLIB)
-+
-+ALL_DYNAMIC_LIBS=$(OUTDIR)$(PATH_SEP)$(RELEASE_DYNLIB) $(OUTDIR)$(PATH_SEP)$(STLDEBUG_DYNLIB)
-+DEBUG_DYNAMIC_LIBS=$(OUTDIR)$(PATH_SEP)$(RELEASE_DYNLIB) $(OUTDIR)$(PATH_SEP)$(STLDEBUG_DYNLIB)
-+
-+RESFILE=$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)stlport.o
-+RESFILE_debug=$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)stlport.o
-+RESFILE_stldebug=$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)stlport.o
-+
-+WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized
-+
-+CXXFLAGS_COMMON = -mthreads -fexceptions -ftemplate-depth-32 -I${STLPORT_DIR} -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} ${WARNING_FLAGS}
-+CFLAGS_COMMON = -mthreads -fexceptions -I${STLPORT_DIR} -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} ${WARNING_FLAGS}
-+
-+LDFLAGS_COMMON_dynamic+= -enable-runtime-pseudo-reloc -Wl,--export-all-symbols -Wl,-d -mthreads
-+
-+CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2
-+CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -shared -O2 -D_DLL -D_STLP_USE_DYNAMIC_LIB -D_STLP_DLLEXPORT_NEEDS_PREDECLARATION
-+
-+CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
-+CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -shared -g -D_DLL -D_STLP_USE_DYNAMIC_LIB -D_STLP_DLLEXPORT_NEEDS_PREDECLARATION
-+
-+CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_DEBUG_RUNTIME
-+CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_DEBUG_RUNTIME
-+
-+CFLAGS_RELEASE_static = $(CFLAGS_COMMON) -O2
-+CFLAGS_RELEASE_dynamic = $(CFLAGS_COMMON) -shared -O2 -D_DLL -D_STLP_USE_DYNAMIC_LIB -D_STLP_DLLEXPORT_NEEDS_PREDECLARATION
-+
-+CFLAGS_DEBUG_static = $(CFLAGS_COMMON) -g
-+CFLAGS_DEBUG_dynamic = $(CFLAGS_COMMON) -shared -g -D_DLL -D_STLP_USE_DYNAMIC_LIB -D_STLP_DLLEXPORT_NEEDS_PREDECLARATION
-+
-+CFLAGS_STLDEBUG_static = $(CFLAGS_DEBUG_static) -D_DEBUG_RUNTIME
-+CFLAGS_STLDEBUG_dynamic = $(CFLAGS_DEBUG_dynamic) -D_DEBUG_RUNTIME
-+
-+LDLIBS_RELEASE_dynamic = ${LDLIBS_COMMON_dynamic}
-+LDFLAGS_RELEASE_dynamic = ${CXXFLAGS_RELEASE_dynamic} ${LDFLAGS_COMMON_dynamic} -Wl,-Map,${OUTDIR}/${RELEASE_NAME}.map -Wl,--out-implib,${OUTDIR}/${RELEASE_NAME}.a
-+
-+LDLIBS_DEBUG_dynamic = ${LDLIBS_COMMON_dynamic}
-+LDFLAGS_DEBUG_dynamic = ${CXXFLAGS_DEBUG_dynamic} ${LDFLAGS_COMMON_dynamic} -Wl,-Map,${OUTDIR}/${DEBUG_NAME}.map -Wl,--out-implib,${OUTDIR}/${DEBUG_NAME}.a
-+
-+LDLIBS_STLDEBUG_dynamic = ${LDLIBS_COMMON_dynamic}
-+LDFLAGS_STLDEBUG_dynamic = ${CXXFLAGS_STLDEBUG_dynamic} ${LDFLAGS_COMMON_dynamic} -Wl,-Map,${OUTDIR}/${STLDEBUG_NAME}.map -Wl,--out-implib,${OUTDIR}/${STLDEBUG_NAME}.a
-+
-+
-+include common_percent_rules.mak
-+include common_rules.mak
-+
-+
-+
-+${RESFILE}: stlport.rc
-+ windres -O coff --define COMP=${COMP} --define BUILD= -o $(RELEASE_OBJDIR_dynamic)$(PATH_SEP)stlport.o stlport.rc
-+
-+${RESFILE_debug}: stlport.rc
-+ windres -O coff --define COMP=${COMP} --define BUILD=_DEBUG -o $(DEBUG_OBJDIR_dynamic)$(PATH_SEP)stlport.o stlport.rc
-+
-+${RESFILE_stldebug}: stlport.rc
-+ windres -O coff --define COMP=${COMP} --define BUILD=_STLDEBUG -o $(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)stlport.o stlport.rc
-+
-+#install: all
-+# cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib
-+
-+#%.s: %.cpp
-+# $(CXX) $(CXXFLAGS) -O4 -S -pto $< -o $@
-+
-+
---- misc/STLport-4.5/src/gcc-3.0-os2.def 2008-11-26 12:40:40.000000000 +0100
-+++ misc/build/STLport-4.5/src/gcc-3.0-os2.def 2008-10-10 15:05:36.000000000 +0200
-@@ -1 +1,40 @@
--dummy
-+LIBRARY stlp45 INITINSTANCE TERMINSTANCE
-+DATA MULTIPLE
-+EXPORTS
-+;exports manually added for transex3 project
-+__ZN4_STL15basic_streambufIcNS_11char_traitsIcEEE10_M_xsputncEci
-+__ZN4_STL8numpunctIcE2idE
-+__ZN4_STL15basic_streambufIcNS_11char_traitsIcEEE6xsgetnEPci
-+__ZN4_STL15basic_streambufIcNS_11char_traitsIcEEEC2Ev
-+__ZN4_STL15basic_streambufIcNS_11char_traitsIcEEE8pubimbueERKNS_6localeE
-+__ZN4_STL15basic_streambufIcNS_11char_traitsIcEEE6xsputnEPKci
-+__ZN4_STL15basic_streambufIcNS_11char_traitsIcEEE5uflowEv
-+__ZN4_STL15basic_streambufIcNS_11char_traitsIcEEED2Ev
-+__ZN4_STL7codecvtIcc15__stl_mbstate_tE2idE
-+__ZN4_STL5ctypeIcE2idE
-+__ZN4_STL5_LimGIbE6_D_infE
-+;hwpfilter
-+ __ZN4_STL15basic_streambufIcNS_11char_traitsIcEEE4syncEv
-+ __ZN4_STL15basic_streambufIcNS_11char_traitsIcEEE9showmanycEv
-+ __ZN4_STL15basic_streambufIcNS_11char_traitsIcEEE5imbueERKNS_6localeE
-+;testshl2
-+__ZNK4_STL5ctypeIcE8scan_notENS_10ctype_base4maskEPKcS5_
-+;xml2cmp
-+__ZN4_STL15basic_streambufIcNS_11char_traitsIcEEE13_M_snextc_auxEv
-+__ZNK4_STL5ctypeIcE7scan_isENS_10ctype_base4maskEPKcS5_
-+__ZN4_STL10_UnderflowIcNS_11char_traitsIcEEE7_M_doitEPNS_13basic_filebufIcS2_EE
-+__ZN4_STL13_Filebuf_base12_M_page_sizeE
-+
-+;cppu
-+__ZN4_STL12__node_allocILb1ELi0EE11_M_allocateEj
-+__ZN4_STL12__node_allocILb1ELi0EE13_M_deallocateEPvj
-+__ZN4_STL10_Rb_globalIbE12_M_decrementEPNS_18_Rb_tree_node_baseE
-+__ZN4_STL10_Rb_globalIbE10_RebalanceEPNS_18_Rb_tree_node_baseERS3_
-+__ZN4_STL10_Rb_globalIbE12_M_incrementEPNS_18_Rb_tree_node_baseE
-+__ZN4_STL10_Rb_globalIbE20_Rebalance_for_eraseEPNS_18_Rb_tree_node_baseERS3_S4_S4_
-+
-+;vcl
-+__ZN4_STL12_List_globalIbE9_TransferEPNS_15_List_node_baseES3_S3_
-+
-+;comphelper
-+__ZTVN4_STL13runtime_errorE
---- misc/STLport-4.5/src/gcc-3.0-os2.mak 2008-11-26 12:40:40.000000000 +0100
-+++ misc/build/STLport-4.5/src/gcc-3.0-os2.mak 2008-11-03 15:56:24.000000000 +0100
-@@ -1 +1,79 @@
--dummy
-+#
-+# Note : this makefile is for gcc-3 !
-+#
-+
-+#
-+# compiler
-+# take these from the OOo build environment
-+CC*= gcc
-+CXX*= g++
-+
-+#
-+# Basename for libraries
-+#
-+LIB_BASENAME = stlp
-+STATIC_SUFFIX=_s
-+
-+#
-+# guts for common stuff
-+#
-+#
-+LINK=emxomfar cr
-+DYN_LINK=$(CXX) -Zlinker "DISABLE 1121" -Zomf -Zmap -Zhigh-mem -Zbin-files -Zdll gcc-3.0-os2.def -o
-+
-+OBJEXT=o
-+DYNEXT=so
-+DYNEXT=dll
-+STEXT=a
-+RM=rm -rf
-+PATH_SEP=/
-+MKDIR=mkdir -p
-+COMP=GCC$(ARCH)
-+INSTALL_STEP = install_unix
-+LN_S = cp
-+LDLIBS_RELEASE_dynamic = -lgcc_eh
-+LDLIBS_RELEASE_static = -lgcc_eh
-+
-+#all_static symbolic_links
-+all: all_dynamic all_import
-+
-+include common_macros.mak
-+include common_macros_os2.mak
-+
-+WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -ftemplate-depth-32
-+
-+CXXFLAGS_COMMON = -Zomf -D_REENTRANT -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} -fexceptions -I${STLPORT_DIR} ${WARNING_FLAGS} ${ARCH_FLAGS}
-+CFLAGS_COMMON = -Zomf -D_REENTRANT -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} -fexceptions -I${STLPORT_DIR} ${WARNING_FLAGS} ${ARCH_FLAGS}
-+
-+CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -DSTL_OS2_BUILDING -O3 -march=pentium -mtune=pentium4
-+CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -DSTL_OS2_BUILDING -O3 -march=pentium -mtune=pentium4
-+
-+CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
-+CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g
-+
-+CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_DEBUG_RUNTIME
-+CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_DEBUG_RUNTIME
-+
-+CFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -DSTL_OS2_BUILDING -O3 -march=pentium -mtune=pentium4
-+CFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -DSTL_OS2_BUILDING -O3 -march=pentium -mtune=pentium4
-+
-+CFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
-+CFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g
-+
-+CFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_DEBUG_RUNTIME
-+CFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_DEBUG_RUNTIME
-+
-+include common_percent_rules.mak
-+include common_rules.mak
-+
-+all_import:
-+ emximp -o ..\lib\$(RELEASE_NAME)$(DYNAMIC_SUFFIX).a ..\lib\$(RELEASE_NAME)$(DYNAMIC_SUFFIX).$(DYNEXT)
-+ emximp -o ..\lib\$(RELEASE_NAME)$(DYNAMIC_SUFFIX).lib ..\lib\$(RELEASE_NAME)$(DYNAMIC_SUFFIX).$(DYNEXT)
-+
-+#install: all
-+# cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib
-+
-+#%.s: %.cpp
-+# $(CXX) $(CXXFLAGS) -O4 -S -pto $< -o $@
-+
-+
---- misc/STLport-4.5/src/gcc-3.0.mak 2008-07-18 14:14:26.000000000 +0200
-+++ misc/build/STLport-4.5/src/gcc-3.0.mak 2008-07-18 14:13:49.000000000 +0200
-@@ -1 +1,69 @@
--dummy
-+#
-+# Note : this makefile is for gcc-3 !
-+#
-+
-+#
-+# compiler
-+# take these from the OOo build environment
-+CC*= gcc
-+CXX*= g++
-+
-+#
-+# Basename for libraries
-+#
-+LIB_BASENAME = libstlport_gcc
-+
-+#
-+# guts for common stuff
-+#
-+#
-+LINK=ar cr
-+DYN_LINK=$(CXX) -Wl,-rpath,'$$ORIGIN' -fexceptions -shared -o
-+
-+OBJEXT=o
-+DYNEXT=so
-+STEXT=a
-+RM=rm -rf
-+PATH_SEP=/
-+MKDIR=mkdir -p
-+COMP=GCC$(ARCH)
-+INSTALL_STEP = install_unix
-+
-+all: all_dynamic all_static symbolic_links
-+
-+include common_macros.mak
-+
-+WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized
-+
-+CXXFLAGS_COMMON = -D_REENTRANT -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} -fexceptions -ftemplate-depth-32 -I${STLPORT_DIR} ${WARNING_FLAGS} ${ARCH_FLAGS}
-+CFLAGS_COMMON = -D_REENTRANT -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} -fexceptions -I${STLPORT_DIR} ${WARNING_FLAGS} ${ARCH_FLAGS}
-+
-+CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2 -fPIC
-+CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
-+
-+CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g -fPIC
-+CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
-+
-+CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_DEBUG_RUNTIME
-+CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_DEBUG_RUNTIME
-+
-+CFLAGS_RELEASE_static = $(CFLAGS_COMMON) -O2 -fPIC
-+CFLAGS_RELEASE_dynamic = $(CFLAGS_COMMON) -O2 -fPIC
-+
-+CFLAGS_DEBUG_static = $(CFLAGS_COMMON) -g -fPIC
-+CFLAGS_DEBUG_dynamic = $(CFLAGS_COMMON) -g -fPIC
-+
-+CFLAGS_STLDEBUG_static = $(CFLAGS_DEBUG_static) -D_DEBUG_RUNTIME
-+CFLAGS_STLDEBUG_dynamic = $(CFLAGS_DEBUG_dynamic) -D_DEBUG_RUNTIME
-+
-+include common_percent_rules.mak
-+include common_rules.mak
-+
-+
-+#install: all
-+# cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib
-+
-+#%.s: %.cpp
-+# $(CXX) $(CXXFLAGS) -O4 -S -pto $< -o $@
-+
-+
---- misc/STLport-4.5/src/gcc-freebsd.mak 2001-07-29 05:36:25.000000000 +0200
-+++ misc/build/STLport-4.5/src/gcc-freebsd.mak 2008-07-18 14:13:49.000000000 +0200
-@@ -5,8 +5,8 @@
- #
- # compiler
- #
--CC = gcc -pthread
--CXX = c++ -pthread -fexceptions
-+CC+= ${PTHREAD_CFLAGS} -D_REENTRANT
-+CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions
-
- #
- # Basename for libraries
-@@ -19,7 +19,7 @@
- #
- LINK=ar cr
- # 2.95 flag
--DYN_LINK=c++ -pthread -fexceptions -shared -o
-+DYN_LINK=${CXX} ${PTHREAD_LIBS} -fexceptions -shared -o
-
- OBJEXT=o
- DYNEXT=so
-@@ -39,10 +39,10 @@
-
- WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -ftemplate-depth-32
-
--CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
-+CXXFLAGS_COMMON = -I${STLPORT_DIR} -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} ${WARNING_FLAGS} ${ARCH_FLAGS}
-
--CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2
--CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
-+CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${CXXFLAGS}
-+CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${CXXFLAGS} -fPIC
-
- CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
- CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
---- misc/STLport-4.5/stlport/config/stl_gcc.h 2001-09-04 19:10:16.000000000 +0200
-+++ misc/build/STLport-4.5/stlport/config/stl_gcc.h 2008-11-14 17:23:02.000000000 +0100
-@@ -7,7 +7,9 @@
- # define _STLP_USE_GLIBC
- #endif
-
-+# if (__GNUC_MINOR__ < 4) && (__GNUC__ == 3)
- # define _STLP_NO_MEMBER_TEMPLATE_KEYWORD
-+# endif
-
- # if defined(__FreeBSD__) || defined (__hpux)
- # define _STLP_NO_WCHAR_T
-@@ -51,13 +53,42 @@
- # define _STLP_CLASS_EXPORT_DECLSPEC __attribute__((dllexport))
- # define _STLP_CALL
-
--# if defined (_STLP_USE_DYNAMIC_LIB)
--# define _STLP_USE_DECLSPEC 1
--# define _STLP_USE_TEMPLATE_EXPORT 1
--# endif
-+# if !defined (_STLP_NO_OWN_IOSTREAMS)
-+
-+# if ( defined (__DLL) || defined (_DLL) || defined (_WINDLL) || defined (_RTLDLL) \
-+ || defined(_AFXDLL) || defined (_STLP_USE_DYNAMIC_LIB) ) \
-+ && ! defined (_STLP_USE_STATIC_LIB)
-+# undef _STLP_USE_DECLSPEC
-+# define _STLP_USE_DECLSPEC 1
-+/* Using dynamic library in MinGW requires _STLP_NO_CUSTOM_IO */
-+# define _STLP_NO_CUSTOM_IO
-+# endif
-+
-+# ifndef _STLP_IMPORT_TEMPLATE_KEYWORD
-+# define _STLP_IMPORT_TEMPLATE_KEYWORD extern
-+# endif
-+# define _STLP_EXPORT_TEMPLATE_KEYWORD
-+
-+# endif /* _STLP_OWN_IOSTREAMS */
-
- # endif
-
-+# if defined(__EMX__)
-+# define _STLP_EXPORT_DECLSPEC __declspec(dllexport)
-+# define _STLP_IMPORT_DECLSPEC __declspec(dllimport)
-+# define _STLP_CLASS_IMPORT_DECLSPEC __declspec(dllimport)
-+# define _STLP_CLASS_EXPORT_DECLSPEC __declspec(dllexport)
-+# define _STLP_CALL
-+//YD 29/03/2006 disable automatic export (generate too many exports/imports)
-+//YD 13/04/2006 back again
-+//# define _STLP_EXPORT_DECLSPEC
-+//# define _STLP_IMPORT_DECLSPEC
-+//# define _STLP_CLASS_IMPORT_DECLSPEC
-+//# define _STLP_CLASS_EXPORT_DECLSPEC
-+//# define _STLP_CALL
-+# define _STLP_USE_DECLSPEC 1
-+# endif
-+
- #if (defined(__linux__) /* && ! defined (_GNU_SOURCE) */ ) || \
- defined (__CYGWIN__) || defined (__MINGW32__) || !(defined (_STLP_USE_GLIBC) || defined (__sun))
- # define _STLP_NO_NATIVE_MBSTATE_T 1
-@@ -226,8 +257,45 @@
-
- # if (__GNUC__ >= 3)
-
--# define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
--# define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward
-+/* properly determine the STLP_NATIVE_INCLUDE_PATH */
-+#ifdef i386
-+#undef i386
-+#define i386 i386
-+#endif
-+
-+#ifdef linux
-+#undef linux
-+#define linux linux
-+#endif
-+
-+#ifdef mips
-+#undef mips
-+#define mips mips
-+#endif
-+
-+#ifdef sgi
-+#undef sgi
-+#define sgi sgi
-+#endif
-+
-+#ifdef sun
-+#undef sun
-+#define sun sun
-+#endif
-+
-+#ifdef sparc
-+#undef sparc
-+#define sparc sparc
-+#endif
-+
-+#ifdef powerpc
-+#undef powerpc
-+#define powerpc powerpc
-+#endif
-+
-+# define _STLP_NATIVE_INCLUDE_PATH GXX_INCLUDE_PATH
-+# define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH \
-+ GXX_INCLUDE_PATH/backward
-
- # elif (__GNUC_MINOR__ < 8)
-
-@@ -312,6 +380,7 @@
- # define _STLP_STATIC_TEMPLATE_DATA 1
- # endif
-
--
--
--
-+#if defined(__sun__) && defined(__GNUC__)
-+# undef _STLP_HAS_NATIVE_FLOAT_ABS
-+# define _STLP_VENDOR_GLOBAL_CSTD 1
-+#endif
---- misc/STLport-4.5/stlport/cwchar 2001-01-27 02:39:42.000000000 +0100
-+++ misc/build/STLport-4.5/stlport/cwchar 2008-07-18 14:13:49.000000000 +0200
-@@ -21,6 +21,9 @@
- # include <stl/_prolog.h>
- # endif
-
-+#ifdef __FreeBSD__
-+#include _STLP_NATIVE_C_HEADER(wchar.h)
-+#endif
- # include <stl/_cwchar.h>
-
- # if (_STLP_OUTERMOST_HEADER_ID == 0x120)
---- misc/STLport-4.5/stlport/stdexcept 2001-05-22 02:50:21.000000000 +0200
-+++ misc/build/STLport-4.5/stlport/stdexcept 2008-07-18 14:13:49.000000000 +0200
-@@ -49,6 +49,13 @@
-
- _STLP_BEGIN_NAMESPACE
-
-+
-+#if defined( __GNUC__)
-+#undef _STLP_NOTHROW_INHERENTLY
-+#define _STLP_NOTHROW_INHERENTLY throw()
-+#endif
-+
-+
- class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE {
- public:
- __Named_exception(const string& __str)
---- misc/STLport-4.5/stlport/stl/_bvector.h 2001-05-30 05:45:41.000000000 +0200
-+++ misc/build/STLport-4.5/stlport/stl/_bvector.h 2008-07-18 14:13:49.000000000 +0200
-@@ -34,7 +34,7 @@
- # include <stl/_vector.h>
- # endif
-
--#define __WORD_BIT (int(CHAR_BIT*sizeof(unsigned int)))
-+#define ___WORD_BIT (int(CHAR_BIT*sizeof(unsigned int)))
-
- _STLP_BEGIN_NAMESPACE
-
-@@ -80,7 +80,7 @@
- unsigned int _M_offset;
-
- void _M_bump_up() {
-- if (_M_offset++ == __WORD_BIT - 1) {
-+ if (_M_offset++ == ___WORD_BIT - 1) {
- _M_offset = 0;
- ++_M_p;
- }
-@@ -88,7 +88,7 @@
-
- void _M_bump_down() {
- if (_M_offset-- == 0) {
-- _M_offset = __WORD_BIT - 1;
-+ _M_offset = ___WORD_BIT - 1;
- --_M_p;
- }
- }
-@@ -100,17 +100,17 @@
-
- void _M_advance (difference_type __i) {
- difference_type __n = __i + _M_offset;
-- _M_p += __n / __WORD_BIT;
-- __n = __n % __WORD_BIT;
-+ _M_p += __n / ___WORD_BIT;
-+ __n = __n % ___WORD_BIT;
- if (__n < 0) {
-- _M_offset = (unsigned int) __n + __WORD_BIT;
-+ _M_offset = (unsigned int) __n + ___WORD_BIT;
- --_M_p;
- } else
- _M_offset = (unsigned int) __n;
- }
-
- difference_type _M_subtract(const _Bit_iterator_base& __x) const {
-- return __WORD_BIT * (_M_p - __x._M_p) + _M_offset - __x._M_offset;
-+ return ___WORD_BIT * (_M_p - __x._M_p) + _M_offset - __x._M_offset;
- }
- };
-
-@@ -242,7 +242,7 @@
- protected:
-
- unsigned int* _M_bit_alloc(size_t __n)
-- { return _M_end_of_storage.allocate((__n + __WORD_BIT - 1)/__WORD_BIT); }
-+ { return _M_end_of_storage.allocate((__n + ___WORD_BIT - 1)/___WORD_BIT); }
- void _M_deallocate() {
- if (_M_start._M_p)
- _M_end_of_storage.deallocate(_M_start._M_p,
-@@ -341,7 +341,7 @@
-
- void _M_initialize(size_type __n) {
- unsigned int* __q = this->_M_bit_alloc(__n);
-- this->_M_end_of_storage._M_data = __q + (__n + __WORD_BIT - 1)/__WORD_BIT;
-+ this->_M_end_of_storage._M_data = __q + (__n + ___WORD_BIT - 1)/___WORD_BIT;
- this->_M_start = iterator(__q, 0);
- this->_M_finish = this->_M_start + difference_type(__n);
- }
-@@ -352,13 +352,13 @@
- ++this->_M_finish;
- }
- else {
-- size_type __len = size() ? 2 * size() : __WORD_BIT;
-+ size_type __len = size() ? 2 * size() : ___WORD_BIT;
- unsigned int* __q = this->_M_bit_alloc(__len);
- iterator __i = copy(begin(), __position, iterator(__q, 0));
- *__i++ = __x;
- this->_M_finish = copy(__position, end(), __i);
- this->_M_deallocate();
-- this->_M_end_of_storage._M_data = __q + (__len + __WORD_BIT - 1)/__WORD_BIT;
-+ this->_M_end_of_storage._M_data = __q + (__len + ___WORD_BIT - 1)/___WORD_BIT;
- this->_M_start = iterator(__q, 0);
- }
- }
-@@ -411,7 +411,7 @@
- __i = copy(__first, __last, __i);
- this->_M_finish = copy(__position, end(), __i);
- this->_M_deallocate();
-- this->_M_end_of_storage._M_data = __q + (__len + __WORD_BIT - 1)/__WORD_BIT;
-+ this->_M_end_of_storage._M_data = __q + (__len + ___WORD_BIT - 1)/___WORD_BIT;
- this->_M_start = iterator(__q, 0);
- }
- }
-@@ -609,7 +609,7 @@
- this->_M_finish = copy(begin(), end(), __z);
- this->_M_deallocate();
- this->_M_start = iterator(__q, 0);
-- this->_M_end_of_storage._M_data = __q + (__n + __WORD_BIT - 1)/__WORD_BIT;
-+ this->_M_end_of_storage._M_data = __q + (__n + ___WORD_BIT - 1)/___WORD_BIT;
- }
- }
-
-@@ -681,7 +681,7 @@
- __i = copy(__first, __last, __i);
- this->_M_finish = copy(__position, end(), __i);
- this->_M_deallocate();
-- this->_M_end_of_storage._M_data = __q + (__len + __WORD_BIT - 1)/__WORD_BIT;
-+ this->_M_end_of_storage._M_data = __q + (__len + ___WORD_BIT - 1)/___WORD_BIT;
- this->_M_start = iterator(__q, 0);
- }
- }
-@@ -702,7 +702,7 @@
- __i = copy(__first, __last, __i);
- this->_M_finish = copy(__position, end(), __i);
- this->_M_deallocate();
-- this->_M_end_of_storage._M_data = __q + (__len + __WORD_BIT - 1)/__WORD_BIT;
-+ this->_M_end_of_storage._M_data = __q + (__len + ___WORD_BIT - 1)/___WORD_BIT;
- this->_M_start = iterator(__q, 0);
- }
- }
-@@ -722,7 +722,7 @@
- fill_n(__i, __n, __x);
- this->_M_finish = copy(__position, end(), __i + difference_type(__n));
- this->_M_deallocate();
-- this->_M_end_of_storage._M_data = __q + (__len + __WORD_BIT - 1)/__WORD_BIT;
-+ this->_M_end_of_storage._M_data = __q + (__len + ___WORD_BIT - 1)/___WORD_BIT;
- this->_M_start = iterator(__q, 0);
- }
- }
-@@ -799,7 +799,7 @@
- #undef __BVECTOR_QUALIFIED
- #undef __BVEC_TMPL_HEADER
-
--# undef __WORD_BIT
-+# undef ___WORD_BIT
-
- #endif /* _STLP_INTERNAL_BVECTOR_H */
-
---- misc/STLport-4.5/stlport/stl/_complex.h 2001-07-06 06:16:17.000000000 +0200
-+++ misc/build/STLport-4.5/stlport/stl/_complex.h 2008-07-18 14:13:49.000000000 +0200
-@@ -18,6 +18,10 @@
- #ifndef _STLP_internal_complex_h
- #define _STLP_internal_complex_h
-
-+#if defined __GNUC__
-+#pragma GCC system_header
-+#endif
-+
- // This header declares the template class complex, as described in
- // in the draft C++ standard. Single-precision complex numbers
- // are complex<float>, double-precision are complex<double>, and
---- misc/STLport-4.5/stlport/stl/_config.h 2001-09-04 19:10:18.000000000 +0200
-+++ misc/build/STLport-4.5/stlport/stl/_config.h 2008-07-18 14:14:05.000000000 +0200
-@@ -938,7 +938,7 @@
-
- # define _STLP_EXPORT_TEMPLATE_CLASS _STLP_EXPORT template class _STLP_CLASS_DECLSPEC
-
--# if defined (_STLP_MSVC) || defined (__ICL)
-+# if defined (_STLP_MSVC) || defined (__ICL) || defined (__EMX__)
- # define _STLP_STATIC_MEMBER_DECLSPEC
- # else
- # define _STLP_STATIC_MEMBER_DECLSPEC _STLP_DECLSPEC
---- misc/STLport-4.5/stlport/stl/_fstream.h 2001-05-29 01:29:41.000000000 +0200
-+++ misc/build/STLport-4.5/stlport/stl/_fstream.h 2008-07-18 14:14:05.000000000 +0200
-@@ -45,7 +45,7 @@
- #if !defined (_STLP_USE_UNIX_IO) && !defined(_STLP_USE_WIN32_IO) \
- && ! defined (_STLP_USE_UNIX_EMULATION_IO) && !defined (_STLP_USE_STDIO_IO)
-
--# if defined (_STLP_UNIX) || defined (__CYGWIN__)
-+# if defined (_STLP_UNIX) || defined (__CYGWIN__) || defined (__EMX__)
- // open/close/read/write
- # define _STLP_USE_UNIX_IO
- # elif defined (_STLP_WIN32) && ! defined (__CYGWIN__)
-@@ -107,7 +107,7 @@
- streamoff _M_get_offset(char* __first, char* __last) {
- #if defined (_STLP_UNIX) || defined (_STLP_MAC)
- return __last - __first;
--#else // defined (_STLP_WIN32) || defined (_STLP_WIN16) || defined (_STLP_DOS)
-+#else // defined (_STLP_WIN32) || defined (_STLP_WIN16) || defined (_STLP_DOS) || defined (__EMX__)
- return ( (_M_openmode & ios_base::binary) != 0 )
- ? (__last - __first)
- : count(__first, __last, '\n') + (__last - __first);
-@@ -119,7 +119,7 @@
- bool _M_in_binary_mode() const {
- # if defined (_STLP_UNIX) || defined (_STLP_MAC) || defined(__BEOS__)
- return true;
--# elif defined (_STLP_WIN32) || defined (_STLP_WIN16) || defined (_STLP_DOS) || defined (_STLP_VM)
-+# elif defined (_STLP_WIN32) || defined (_STLP_WIN16) || defined (_STLP_DOS) || defined (_STLP_VM) || defined (__EMX__)
- return (_M_openmode & ios_base::binary) != 0;
- # else
- # error "Port!"
---- misc/STLport-4.5/stlport/stl/_ios_base.h 2001-09-04 19:10:18.000000000 +0200
-+++ misc/build/STLport-4.5/stlport/stl/_ios_base.h 2008-07-18 14:13:49.000000000 +0200
-@@ -291,7 +291,7 @@
- template <class Facet>
- locale::facet* _M_get_facet(ios_base& __i, Facet*)
- {
--
-+ return NULL;
- }
-
- // ----------------------------------------------------------------------
---- misc/STLport-4.5/stlport/stl/_rope.h 2001-08-06 04:21:25.000000000 +0200
-+++ misc/build/STLport-4.5/stlport/stl/_rope.h 2008-07-18 14:13:49.000000000 +0200
-@@ -1470,7 +1470,7 @@
- rope<_CharT,_Alloc> __remainder_rope;
-
- // gcc-2.7.2 bugs
-- typedef _Rope_Concat_fn<_CharT,_Alloc> _Concat_fn;
-+ typedef _Rope_Concat_fn<_CharT,_Alloc> __Concat_fn;
-
- if (0 == __n)
- return;
-@@ -1510,7 +1510,7 @@
- // One each for base_rope and __result
- # endif
- } else {
-- __result = power(__base_rope, __exponent, _Concat_fn());
-+ __result = power(__base_rope, __exponent, __Concat_fn());
- }
- if (0 != __remainder) {
- __result += __remainder_rope;
---- misc/STLport-4.5/stlport/stl/_stdio_file.h 2001-03-19 08:01:09.000000000 +0100
-+++ misc/build/STLport-4.5/stlport/stl/_stdio_file.h 2008-07-18 14:14:05.000000000 +0200
-@@ -154,8 +154,45 @@
-
- # define _STLP_FILE_I_O_IDENTICAL
-
-+#elif defined(__EMX__)
-+
-+inline int _FILE_fd(const FILE& __f) { return __f._handle; }
-+inline char* _FILE_I_begin(const FILE& __f) { return (char*) __f._buffer; }
-+inline char* _FILE_I_next(const FILE& __f) { return (char*) __f._ptr; }
-+inline char* _FILE_I_end(const FILE& __f) { return (char *) __f._ptr + __f._rcount; }
-+inline ptrdiff_t _FILE_I_avail(const FILE& __f) { return __f._rcount; }
-+inline char& _FILE_I_preincr(FILE& __f) { --__f._rcount; return *(char*) (++__f._ptr); }
-+inline char& _FILE_I_postincr(FILE& __f) { --__f._rcount; return *(char*) (__f._ptr++); }
-+inline char& _FILE_I_predecr(FILE& __f) { ++__f._rcount; return *(char*) (--__f._ptr); }
-+inline char& _FILE_I_postdecr(FILE& __f) { ++__f._rcount; return *(char*) (__f._ptr--); }
-+inline void _FILE_I_bump(FILE& __f, int __n) { __f._ptr += __n; __f._rcount -= __n; }
-+inline void _FILE_I_set(FILE& __f, char* __begin, char* __next, char* __end) {
-+ __f._buffer = __begin;
-+ __f._ptr = __next;
-+ __f._rcount = __end - __next;
-+}
-+
-+inline char* _FILE_O_begin(const FILE& __f) { return (char*) __f._buffer; }
-+inline char* _FILE_O_next(const FILE& __f) { return (char*) __f._ptr; }
-+inline char* _FILE_O_end(const FILE& __f) { return (char*) __f._ptr + __f._wcount; }
-+inline ptrdiff_t _FILE_O_avail(const FILE& __f) { return __f._wcount; }
-+inline char& _FILE_O_preincr(FILE& __f) { --__f._wcount; return *(char*) (++__f._ptr); }
-+inline char& _FILE_O_postincr(FILE& __f) { --__f._wcount; return *(char*) (__f._ptr++); }
-+inline char& _FILE_O_predecr(FILE& __f) { ++__f._wcount; return *(char*) (--__f._ptr); }
-+inline char& _FILE_O_postdecr(FILE& __f) { ++__f._wcount; return *(char*) (__f._ptr--); }
-+inline void _FILE_O_bump(FILE& __f, int __n) { __f._ptr += __n; __f._wcount -= __n; }
-+inline void _FILE_O_set(FILE& __f, char* __begin, char* __next, char* __end) {
-+ __f._buffer = __begin;
-+ __f._ptr = __next;
-+ __f._wcount = __end - __next;
-+}
-+
-+
-+# undef _STLP_FILE_I_O_IDENTICAL
-+
- #elif defined (__CYGWIN__) || defined(__FreeBSD__) || defined(__NetBSD__) || ( defined(__GNUC__) && defined(__APPLE__) )
-
-+#include <stdio.h>
- # if 0
- inline int _FILE_fd(const FILE& __f) { return __f._file; }
- inline char* _FILE_I_begin(const FILE& __f) { return (char*) __f._bf._base; }
---- misc/STLport-4.5/stlport/stl/_threads.h 2001-09-04 19:10:20.000000000 +0200
-+++ misc/build/STLport-4.5/stlport/stl/_threads.h 2008-07-18 14:14:05.000000000 +0200
-@@ -164,6 +164,15 @@
- #include <stdio.h>
- # define _STLP_MUTEX_INITIALIZER = { 0 }
- #elif defined(_STLP_OS2THREADS)
-+
-+#define INCL_DOSSEMAPHORES
-+#ifndef STL_OS2_BUILDING
-+#include <svpm.h>
-+#else
-+#include <os2.h>
-+#endif
-+
-+#if 0 // YD
- // This section serves to replace os2.h for VisualAge C++
- typedef unsigned long ULONG;
- #ifndef __HEV__ /* INCL_SEMAPHORE may also define HEV */
-@@ -181,6 +190,8 @@
- APIRET _System DosRequestMutexSem(HMTX hmtx, ULONG ulTimeout);
- APIRET _System DosReleaseMutexSem(HMTX hmtx);
- APIRET _System DosCloseMutexSem(HMTX hmtx);
-+#endif
-+
- # define _STLP_MUTEX_INITIALIZER = { 0 };
-
- # endif
-@@ -296,7 +307,7 @@
- inline void _M_destroy() { DosCloseMutexSem(_M_lock); }
- inline void _M_acquire_lock() {
- if(!_M_lock) _M_initialize();
-- DosRequestMutexSem(_M_lock, -1);
-+ DosRequestMutexSem(_M_lock, ((ULONG)-1));
- }
- inline void _M_release_lock() { DosReleaseMutexSem(_M_lock); }
- #elif defined(_STLP_BETHREADS)
-@@ -372,7 +383,7 @@
- }
- inline void _M_acquire_lock() {
- if(!_M_lock) _M_initialize();
-- DosRequestMutexSem(*(HMTX*)_M_lock, -1);
-+ DosRequestMutexSem(*(HMTX*)_M_lock, ((ULONG)-1));
- }
- inline void _M_release_lock() { DosReleaseMutexSem(*(HMTX*)_M_lock); }
- # else /* No threads */
---- misc/STLport-4.5/stlport/stl/_tree.c 2001-08-25 03:14:30.000000000 +0200
-+++ misc/build/STLport-4.5/stlport/stl/_tree.c 2008-12-02 17:14:29.035425872 +0100
-@@ -404,10 +404,12 @@
- }
- iterator __j = iterator(__y);
- if (__comp)
-+ {
- if (__j == begin())
- return pair<iterator,bool>(_M_insert(__x, __y, __v), true);
- else
- --__j;
-+ }
- if (_M_key_compare(_S_key(__j._M_node), _KeyOfValue()(__v)))
- return pair<iterator,bool>(_M_insert(__x, __y, __v), true);
- return pair<iterator,bool>(__j, false);
---- misc/STLport-4.5/stlport/stl/_valarray.h 2001-05-30 05:45:42.000000000 +0200
-+++ misc/build/STLport-4.5/stlport/stl/_valarray.h 2008-07-18 14:13:49.000000000 +0200
-@@ -19,6 +19,10 @@
- #ifndef _STLP_VALARRAY_H
- #define _STLP_VALARRAY_H
-
-+#if defined __GNUC__
-+#pragma GCC system_header
-+#endif
-+
- #ifndef _STLP_CMATH
- #include <cmath>
- #endif
---- misc/STLport-4.5/stlport/stl/c_locale.h 2001-05-31 05:24:41.000000000 +0200
-+++ misc/build/STLport-4.5/stlport/stl/c_locale.h 2008-07-18 14:14:05.000000000 +0200
-@@ -167,6 +167,18 @@
- # define _Locale_ALPHA (_Locale_UPPER | _Locale_LOWER)
- # define _Locale_PRINT (_Locale_ALPHA | _Locale_DIGIT | _Locale_PUNCT | 0200 )
-
-+# elif defined (__EMX__) // YD
-+
-+# define _Locale_CNTRL __CT_CNTRL
-+# define _Locale_UPPER __CT_UPPER
-+# define _Locale_LOWER __CT_LOWER
-+# define _Locale_DIGIT __CT_DIGIT
-+# define _Locale_XDIGIT __CT_XDIGIT
-+# define _Locale_PUNCT __CT_PUNCT
-+# define _Locale_SPACE __CT_SPACE
-+# define _Locale_PRINT __CT_PRINT
-+# define _Locale_ALPHA __CT_ALPHA
-+
- # elif defined (__FreeBSD__)
-
- # define _Locale_CNTRL _CTYPE_C
diff --git a/stlport/dos_lineends.patch b/stlport/dos_lineends.patch
deleted file mode 100644
index 572c158c4..000000000
--- a/stlport/dos_lineends.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-*** ./unxsols3.pro/misc/STLport-4.0/src/vc_common.mak Fri Jul 14 03:53:26 2000
---- build/unxsols3.pro/STLport-4.0/src/vc_common.mak Fri Oct 5 15:34:10 2001
-***************
-*** 42,48 ****
-
-
- LDFLAGS_COMMON_static=/nologo /machine:I386
-! LDFLAGS_COMMON_dynamic=/nologo /dll /incremental:no /machine:I386
-
- CXXFLAGS_DEBUG_static=$(FLAGS_COMMON_static) /MTd /Zi /Yd /Gm /Od /D "_DEBUG" /Fo"$(DEBUG_OBJDIR_static)\\" /Fd"$(DEBUG_OBJDIR_static)\\" /YXstlport_prefix.h /Fp$(DEBUG_OBJDIR_static)\stlport.pch /c
-
---- 42,48 ----
-
-
- LDFLAGS_COMMON_static=/nologo /machine:I386
-! LDFLAGS_COMMON_dynamic=/nologo /nodefaultlib oldnames.lib kernel32.lib /dll /incremental:no /machine:I386
-
- CXXFLAGS_DEBUG_static=$(FLAGS_COMMON_static) /MTd /Zi /Yd /Gm /Od /D "_DEBUG" /Fo"$(DEBUG_OBJDIR_static)\\" /Fd"$(DEBUG_OBJDIR_static)\\" /YXstlport_prefix.h /Fp$(DEBUG_OBJDIR_static)\stlport.pch /c
-
-***************
-*** 53,62 ****
- CXXFLAGS_STLDEBUG_dynamic=$(FLAGS_COMMON_dynamic) /MDd /Zi /Yd /Gm /Od /D "_DEBUG" /D "__STL_DEBUG" /Fo"$(STLDEBUG_OBJDIR_dynamic)\\" /Fd"$(STLDEBUG_OBJDIR_dynamic)\\" /YXstlport_prefix.h /Fp$(STLDEBUG_OBJDIR_dynamic)\stlport.pch /c
-
- LDFLAGS_DEBUG_static=$(LDFLAGS_COMMON_static) /NODEFAULTLIB:MTD /DEBUGTYPE:CV
-! LDFLAGS_DEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) /DEBUG /DEBUGTYPE:CV /implib:"$(OUTDIR)\$(DEBUG_NAME).$(STEXT)"
-
- LDFLAGS_STLDEBUG_static=$(LDFLAGS_COMMON_static) /NODEFAULTLIB:MTD /DEBUGTYPE:CV
-! LDFLAGS_STLDEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) /DEBUG /DEBUGTYPE:CV /implib:"$(OUTDIR)\$(STLDEBUG_NAME).$(STEXT)"
-
- CXXFLAGS_RELEASE_static=$(FLAGS_COMMON_static) /O2 /MT /D "NDEBUG" /Fo"$(RELEASE_OBJDIR_static)\\" /Fd"$(RELEASE_OBJDIR_static)\\" /YXstlport_prefix.h /Fp$(RELEASE_OBJDIR_static)\stlport.pch /c
-
---- 53,62 ----
- CXXFLAGS_STLDEBUG_dynamic=$(FLAGS_COMMON_dynamic) /MDd /Zi /Yd /Gm /Od /D "_DEBUG" /D "__STL_DEBUG" /Fo"$(STLDEBUG_OBJDIR_dynamic)\\" /Fd"$(STLDEBUG_OBJDIR_dynamic)\\" /YXstlport_prefix.h /Fp$(STLDEBUG_OBJDIR_dynamic)\stlport.pch /c
-
- LDFLAGS_DEBUG_static=$(LDFLAGS_COMMON_static) /NODEFAULTLIB:MTD /DEBUGTYPE:CV
-! LDFLAGS_DEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) msvcrtd.lib /DEBUG /DEBUGTYPE:CV /implib:"$(OUTDIR)\$(DEBUG_NAME).$(STEXT)"
-
- LDFLAGS_STLDEBUG_static=$(LDFLAGS_COMMON_static) /NODEFAULTLIB:MTD /DEBUGTYPE:CV
-! LDFLAGS_STLDEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) msvcrtd.lib /DEBUG /DEBUGTYPE:CV /implib:"$(OUTDIR)\$(STLDEBUG_NAME).$(STEXT)"
-
- CXXFLAGS_RELEASE_static=$(FLAGS_COMMON_static) /O2 /MT /D "NDEBUG" /Fo"$(RELEASE_OBJDIR_static)\\" /Fd"$(RELEASE_OBJDIR_static)\\" /YXstlport_prefix.h /Fp$(RELEASE_OBJDIR_static)\stlport.pch /c
-
-***************
-*** 63,69 ****
- CXXFLAGS_RELEASE_dynamic=$(FLAGS_COMMON_dynamic) /O2 /MD /D "NDEBUG" /Fo"$(RELEASE_OBJDIR_dynamic)\\" /Fd"$(RELEASE_OBJDIR_dynamic)\\" /YXstlport_prefix.h /Fp$(RELEASE_OBJDIR_dynamic)\stlport.pch /c
-
- LDFLAGS_RELEASE_static=$(LDFLAGS_COMMON_static)
-! LDFLAGS_RELEASE_dynamic=$(LDFLAGS_COMMON_dynamic) /implib:"$(OUTDIR)\$(RELEASE_NAME).$(STEXT)"
-
- RESFILE=$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)stlport.res
- RESFILE_debug=$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)stlport.res
---- 63,69 ----
- CXXFLAGS_RELEASE_dynamic=$(FLAGS_COMMON_dynamic) /O2 /MD /D "NDEBUG" /Fo"$(RELEASE_OBJDIR_dynamic)\\" /Fd"$(RELEASE_OBJDIR_dynamic)\\" /YXstlport_prefix.h /Fp$(RELEASE_OBJDIR_dynamic)\stlport.pch /c
-
- LDFLAGS_RELEASE_static=$(LDFLAGS_COMMON_static)
-! LDFLAGS_RELEASE_dynamic=$(LDFLAGS_COMMON_dynamic) msvcrt.lib /implib:"$(OUTDIR)\$(RELEASE_NAME).$(STEXT)"
-
- RESFILE=$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)stlport.res
- RESFILE_debug=$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)stlport.res
-
diff --git a/stlport/makefile.mk b/stlport/makefile.mk
deleted file mode 100644
index 9211a5e11..000000000
--- a/stlport/makefile.mk
+++ /dev/null
@@ -1,178 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=.
-
-PRJNAME=so_stlport
-TARGET=so_stlport
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-.IF "$(WITH_STLPORT)"!="YES"
-
-all:
- @echo "Nothing to do"
-
-.ELSE # "$(WITH_STLPORT)"!="YES"
-
-# --- Files --------------------------------------------------------
-.EXPORT : CC CXX
-.IF "$(COMID)"=="gcc3"
- TARFILE_NAME=STLport-4.5
- TARFILE_MD5=18f577b374d60b3c760a3a3350407632
- PATCH_FILES=\
- STLport-4.5.patch \
- STLport-4.5-gcc43_warnings.patch \
- STLport-4.5-cxx0x.patch
-.ELIF "$(GUI)"=="WNT"
- TARFILE_NAME=STLport-4.5-0119
- TARFILE_MD5=7376930b0d3f3d77a685d94c4a3acda8
- PATCH_FILES=STLport-4.5-0119.patch
-.ELSE
- TARFILE_NAME=STLport-4.0
- TARFILE_MD5=c441926f3a552ed3e5b274b62e86af16
- PATCH_FILES=STLport-4.0.patch STLport-4.0-sunstudio12u1.patch
- # To disable warnings from within STLport headers on unxsoli4 and
- # unxsols4, STLport-4.0.patch had to be extended mechanically by
- #
- # cd unxsol.../misc/build/STLport-4.0/stlport && \
- # find . -type f -exec sed -i \
- # -e 's/^\([ \t]*__STL_BEGIN_NAMESPACE[ \t]*\)$/#if defined \
- # __SUNPRO_CC\n#pragma disable_warn\n#endif\n&/' \
- # -e 's/^\([ \t]*__STL_END_NAMESPACE[ \t]*\)$/&\n#if defined \
- # __SUNPRO_CC\n#pragma enable_warn\n#endif/' {} \;
- #
- # (causing lots of files to become modified) and by additionally
- # changing unxsol.../misc/build/STLport-4.0/stlport/math.h,
- # unxsol.../misc/build/STLport-4.0/stlport/stl/_config.h,
- # unxsol.../misc/build/STLport-4.0/stlport/stl/_list.h, and
- # unxsol.../misc/build/STLport-4.0/stlport/stl/type_traits.h manually.
- # (Obviously due to the way the C++ compiler generates code for
- # instantiations of inline function templates from STLport headers, it
- # does not work to simply add "#pragma disable_warn" to stl/_prolog.h
- # and "#pragma enable_warn" to stl/_epilog.h, as seemingly some internal
- # STLport headers are read in by the compiler only at the end of a
- # compilation unit, outside the scope of stl/_prolog.h and
- # stl/_epilog.h.)
-.ENDIF
-
-ADDITIONAL_FILES=src$/gcc-3.0.mak src$/gcc-3.0-freebsd.mak src$/sunpro8.mak src$/sunpro11.mak src$/gcc-3.0-mingw.mak \
- src$/gcc-3.0-os2.mak src$/gcc-3.0-os2.def src$/common_macros_os2.mak
-
-
-CONFIGURE_ACTION=none
-CONFIGURE_FLAGS=
-
-BUILD_DIR=src
-
-.IF "$(COM)"=="MSC"
-BUILD_ACTION=nmake
-BUILD_FLAGS=-f vc7.mak EXFLAGS="/EHa /Zc:wchar_t-" CCNUMVER=$(CCNUMVER)
-.ENDIF
-
-.IF "$(COM)"=="GCC"
- .IF "$(COMID)"=="gcc3"
- # FreeBSD needs a special makefile
- .IF "$(OS)"=="FREEBSD"
- BUILD_FLAGS=-f gcc-3.0-freebsd.mak
- .ELIF "$(GUI)"=="WNT"
- BUILD_FLAGS=-f gcc-3.0-mingw.mak
- .ELSE
- BUILD_FLAGS=-f gcc-3.0.mak
- .ENDIF
- .ELSE # "$(COMID)"=="gcc3"
- .IF "$(OS)"=="FREEBSD"
- BUILD_FLAGS=-f gcc-freebsd.mak
- .ELSE
- BUILD_FLAGS=-f gcc.mak
- .ENDIF
- .ENDIF # "$(COMID)"=="gcc3"
- BUILD_ACTION=$(GNUMAKE)
- # build in parallel
- BUILD_FLAGS+= -j$(MAXPROCESS)
-.ENDIF
-.IF "$(HAVE_LD_HASH_STYLE)" == "TRUE"
-CXX+= -Wl,--hash-style=$(WITH_LINKER_HASH_STYLE)
-.ENDIF
-
-.IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)" == "TRUE"
-CXX+= -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo
-.ENDIF
-
-.IF "$(COM)"=="C52"
-BUILD_ACTION=make
-.IF "$(CCNUMVER)">="00050008"
-BUILD_FLAGS=-f sunpro11.mak
-.ELIF "$(CCNUMVER)">="00050005"
-BUILD_FLAGS=-f sunpro8.mak
-.ELSE
-BUILD_FLAGS=-f sunpro6.mak
-.ENDIF # "$(CCNUMVER)">="00050008"
-
-OUT2INC= \
- stlport$/SC5$/*.SUNWCCh
-.ENDIF
-
-OUTDIR2INC= \
- stlport
-
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"=="GCC"
-
-OUT2LIB= \
- lib$/lib*_static.a
-
-OUT2BIN= \
- lib$/*.dll
-
-.ELSE
-
-OUT2LIB= \
- lib$/*.lib
-
-OUT2BIN= \
- lib$/*.dll \
- lib$/*.pdb
-
-.ENDIF # "$(COM)"=="GCC"
-
-.ELSE # "$(GUI)"=="WNT"
-
-OUT2LIB= \
- lib$/lib*
-
-.ENDIF # "$(GUI)"=="WNT"
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.INCLUDE : tg_ext.mk
-
-.ENDIF # "$(WITH_STLPORT)"!="YES"
diff --git a/stlport/prj/build.lst b/stlport/prj/build.lst
deleted file mode 100644
index 2a6ec0dda..000000000
--- a/stlport/prj/build.lst
+++ /dev/null
@@ -1,2 +0,0 @@
-sl stlport : solenv NULL
-sl stlport nmake - all sl_mkout NULL
diff --git a/stlport/prj/d.lst b/stlport/prj/d.lst
deleted file mode 100644
index 88478cef7..000000000
--- a/stlport/prj/d.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-..\%__SRC%\lib\lib*.so %_DEST%\lib\lib*.so
-..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll
-
diff --git a/stlport/win32_custom.bat b/stlport/win32_custom.bat
deleted file mode 100644
index 83a430de7..000000000
--- a/stlport/win32_custom.bat
+++ /dev/null
@@ -1,11 +0,0 @@
-rem parameters in order of their apearance:
-rem - path to unpacked tarball
-rem - relative path back to module root
-
-setlocal
-
-cd %1
-
-rem type %2\dos_lineends.patch | patch -b -p2
-patch -i %2\dos_lineends.patch -b -p2
-
diff --git a/stlport/win32_custom.sh b/stlport/win32_custom.sh
deleted file mode 100755
index 5c125481b..000000000
--- a/stlport/win32_custom.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-#rem parameters in order of their apearance:
-#rem - path to unpacked tarball
-#rem - relative path back to module root
-
-cd $1
-
-patch -i $2/dos_lineends.patch -b -p2
-
diff --git a/stlport/win32_sdk.bat b/stlport/win32_sdk.bat
deleted file mode 100755
index cfaf6c029..000000000
--- a/stlport/win32_sdk.bat
+++ /dev/null
@@ -1,11 +0,0 @@
-rem parameters in order of their apearance:
-rem - path to unpacked tarball
-rem - relative path back to module root
-
-setlocal
-
-cd %1
-
-rem type %2\dos_lineends.patch | patch -b -p2
-patch -i %2\STLport-4.0_SDK.patch -b -p2
-
diff --git a/stlport/win32_sdk.sh b/stlport/win32_sdk.sh
deleted file mode 100644
index 434890730..000000000
--- a/stlport/win32_sdk.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-#rem parameters in order of their apearance:
-#rem - path to unpacked tarball
-#rem - relative path back to module root
-
-cd $1
-
-patch -i $2/STLport-4.0_SDK.patch -b -p2
-
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-20 14:03:04 +0000