Commit 4ecbb018ea6fb54b20390d8b8b6a8fba945825a1

Petr Ovtchenkov (Committer)
Wed Oct 08 18:39:23 CEST 2008
Rick Weisner <rick.weisner @s…n.com> (Author)
Wed Oct 08 18:16:06 CEST 2008

Tree SHA1: 54612e1
Parent SHA1: 2587f7a (STLport 5.1.6 release)
raw diff | raw patch

SunPro's CC on 64-bit Solaris 10 and 11

Pay attention to -m64 option in CC.mak, this may break 32-bit
Solaris builds; in STLport 5.2 it should processed via CXX_EXTRA_FLAGS.

Diff rendering mode:
inline
side by side


25	25	CPPFLAGS = $(DEFS) $(INCLUDES)
26	26
27	27	OPT += -mt +w2
28		CCFLAGS = -erroff=doubunder -qoption ccfe -expand=1000 -library=no%Cstd,no%iostream,no%rwtools7-xildoff $(OPT)
	28	CCFLAGS = -instances=global -erroff=doubunder -qoption ccfe -expand=1000 -library=no%Cstd,no%iostream,no%rwtools7 -xildoff $(OPT)
29	29	CFLAGS = $(OPT)
30		CXXFLAGS = -erroff=doubunder -qoption ccfe -expand=1000 -library=no%Cstd,no%iostream,no%rwtools7 -xildoff $(OPT)
	30	CXXFLAGS = -instances=global -erroff=doubunder -qoption ccfe -expand=1000 -library=no%Cstd,no%iostream,no%rwtools7 -xildoff $(OPT)
31	31	CDEPFLAGS = -xM
32	32	CCDEPFLAGS = -xM
33	33


21	21	${PRG_STLDBG}: $(OBJ_STLDBG) $(LIBSDEP)
22	22	$(LINK.cc) $(LINK_OUTPUT_OPTION) ${START_OBJ} $(OBJ_STLDBG) $(LDLIBS) ${STDLIBS} ${END_OBJ}
23	23
	24	endif
	25
	26	ifeq (CC, $(COMPILER_NAME))
	27
	28	${PRG}: $(OBJ) $(LIBSDEP)
	29	$(LINK.cc) $(LINK_OUTPUT_OPTION) ${START_OBJ} $(OBJ) $(LDLIBS) ${STDLIBS} ${END_OBJ}
	30
	31	${PRG_DBG}: $(OBJ_DBG) $(LIBSDEP)
	32	$(LINK.cc) $(LINK_OUTPUT_OPTION) ${START_OBJ} $(OBJ_DBG) $(LDLIBS) ${STDLIBS} ${END_OBJ}
	33
	34	${PRG_STLDBG}: $(OBJ_STLDBG) $(LIBSDEP)
	35	$(LINK.cc) $(LINK_OUTPUT_OPTION) ${START_OBJ} $(OBJ_STLDBG) $(LDLIBS) ${STDLIBS} ${END_OBJ}
	36
24	37	else
25	38
	39	ifneq (gcc, $(COMPILER_NAME))
26	40	# Original Borland and Digital Mars linkers
27	41
28	42	${PRG}: $(OBJ) $(LIBSDEP)
…	…
48	48	${PRG_STLDBG}: $(OBJ_STLDBG) $(LIBSDEP)
49	49	$(LINK.cc) $(subst /,\,$(START_OBJ) $(OBJ_STLDBG) $(END_OBJ),$(LINK_OUTPUT_OPTION),$(MAP_OUTPUT_OPTION),$(LDLIBS) $(STDLIBS),,)
50	50
	51	endif
51	52	endif
52	53
53	54


1	1	# -- makefile -- Time-stamp: <04/08/23 23:07:35 ptr>
2	2
3		OPT += -xcode=pic32
	3	#OPT += -xcode=pic32
	4	OPT += -m64 -KPIC
4	5
5	6	dbg-shared: LDFLAGS += -G -Qoption ld -z,initfirst -h$(SO_NAME_DBGxx) ${LDSEARCH} ${NOSTDLIB}
6	7	stldbg-shared: LDFLAGS += -G -Qoption ld -z,initfirst -h$(SO_NAME_STLDBGxx) ${LDSEARCH} ${NOSTDLIB}


1		# -- Makefile -- Time-stamp: <06/01/11 09:53:41 ptr>
	1	# -- Makefile -- Time-stamp: <08/10/08 20:28:41 ptr>
2	2
3	3	LIBNAME = stlport
4	4	MAJOR = 5
5	5	MINOR = 1
6		PATCH = 6
	6	PATCH = 7
7	7	SRC_CPP = ../../src/dll_main.cpp \
8	8	../../src/fstream.cpp \
9	9	../../src/strstream.cpp \


2	2
3	3	SRCROOT := ../..
4	4	COMPILER_NAME := CC
	5	OPT= -m64 -xO2
5	6
6	7	ALL_TAGS := release-shared stldbg-shared
7	8	STLPORT_DIR := ../../..
…	…
28	28	dbg-shared: LDFLAGS += -R${INSTALL_LIB_DIR}
29	29	stldbg-shared: LDFLAGS += -R${INSTALL_LIB_DIR}
30	30
31		release-shared : LDLIBS = -lstlport
32		dbg-shared : LDLIBS = -lstlportg
33		stldbg-shared : LDLIBS = -lstlportstlg
	31	release-shared : LDLIBS = -lstlport -lrt
	32	dbg-shared : LDLIBS = -lstlportg -lrt
	33	stldbg-shared : LDLIBS = -lstlportstlg -lrt


	1	2008-10-08 Petr Ovtchenkov <complement@users.sourceforge.net>
	2
	3	* Repository: support 64-bit Solaris 10 and 11 with SunPro's
	4	CC; derived from patch #2152319, thanks Rick Weisner.
	5
1	6	2008-10-07 Petr Ovtchenkov <complement@users.sourceforge.net>
2	7
3	8	* 5.1.6 release.


37	37
38	38	// Absolute value
39	39	_STLP_TEMPLATE_NULL
	40	#if defined(__SunOS_5_11) \|\| defined(__SunOS_5_10)
40	41	_STLP_DECLSPEC float _STLP_CALL abs(const complex<float>& __z)
	42	{ return ::hypotf(__z._M_re, __z._M_im); }
	43	#else
	44	_STLP_DECLSPEC float _STLP_CALL abs(const complex<float>& __z)
41	45	{ return ::hypot(__z._M_re, __z._M_im); }
	46	#endif
42	47	_STLP_TEMPLATE_NULL
43	48	_STLP_DECLSPEC double _STLP_CALL abs(const complex<double>& __z)
44	49	{ return ::hypot(__z._M_re, __z._M_im); }
45	50
46	51	#if !defined (_STLP_NO_LONG_DOUBLE)
47	52	_STLP_TEMPLATE_NULL
	53	#if defined(__SunOS_5_11) \|\| defined(__SunOS_5_10)
48	54	_STLP_DECLSPEC long double _STLP_CALL abs(const complex<long double>& __z)
	55	{ return ::hypotl(__z._M_re, __z._M_im); }
	56	#else
	57	_STLP_DECLSPEC long double _STLP_CALL abs(const complex<long double>& __z)
49	58	{ return ::hypot(__z._M_re, __z._M_im); }
	59	#endif
50	60	#endif
51	61
52	62	// Phase


24	24	// For sunpro, it chokes if time.h is included through stat.h
25	25	#endif
26	26
	27	#if defined(SunOS_5_11) \|\| defined(__SunOS_5_10)
	28	#include <stdlib.h>
	29	#endif
	30
27	31	#include <fstream>
28	32
29	33	#ifdef __CYGWIN__


55	55	# define FPOS_T fpos_t
56	56	#elif defined(_LARGEFILE_SOURCE) \|\| defined(_LARGEFILE64_SOURCE) /* \|\| defined(__USE_FILE_OFFSET64) */ \
57	57	/* \|\| (defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64)) / / \|\| defined(__sgi) */
	58	#if defined(__SunOS_5_11) \|\| defined(__SunOS_5_10)
	59	#include <stdio.h>
	60	# define FSEEK fseeko
	61	# define FTELL ftello
	62	# define FSTAT fstat
	63	# define STAT stat
	64	# define FSETPOS fsetpos
	65	# define FGETPOS fgetpos
	66	# define FPOS_T fpos_t
	67	#else
58	68	# define FSEEK fseeko64
59	69	# define FTELL ftello64
60	70	# define FSTAT fstat64
…	…
72	72	# define FSETPOS fsetpos64
73	73	# define FGETPOS fgetpos64
74	74	# define FPOS_T fpos64_t
	75	#endif
75	76	#else
76	77	# define FSEEK fseek
77	78	# define FTELL ftell


34	34	# include <stl/_vector.h>
35	35	#endif
36	36
	37	#if defined(__SunOS_5_11) \|\| defined(__SunOS_5_10)
	38	# include <stl/_range_errors.h>
	39	#endif
	40
37	41	#define _STLP_WORD_BIT (int(CHAR_BIT*sizeof(unsigned int)))
38	42
39	43	_STLP_BEGIN_NAMESPACE


41	41	# ifndef _STLP_HAS_NO_NAMESPACES
42	42	namespace std {
43	43	# endif
	44	#if !defined(__SunOS_5_11) && !defined(__SunOS_5_10)
44	45	extern "C" double hypot(double x, double y);
	46	#endif
	47
45	48	# ifndef _STLP_HAS_NO_NAMESPACES
46	49	}
47	50	# endif
…	…
144	144	extern long double __sqrtl(long double);
145	145	extern long double __tanl(long double);
146	146	extern long double __tanhl(long double);
	147	#if defined(__SunOS_5_11) \|\| defined(__SunOS_5_10)
	148	# include <math.h>
	149	#endif
147	150	}
148	151	#endif
149	152
…	…
415	415	* in global namespace.
416	416	* HP-UX native lib has math functions in the global namespace.
417	417	*/
418		#if (!defined (_STLP_MSVC_LIB) \|\| (_STLP_MSVC_LIB < 1310) \|\| defined(UNDER_CE)) && \
419		(!defined (__HP_aCC) \|\| (__HP_aCC < 30000))
	418	#if (!defined (_STLP_MSVC_LIB) \|\| (_STLP_MSVC_LIB < 1310) \|\| defined(UNDER_CE) ) && !defined(__SunOS_5_11) && \
	419	!defined(__SunOS_5_10) && (!defined (__HP_aCC) \|\| (__HP_aCC < 30000))
420	420	inline double abs(double __x)
421	421	{ return ::fabs(__x); }
422	422	# if !defined (__MVS__)
…	…
490	490	# pragma warning (push)
491	491	# pragma warning (disable : 4996) // hypot is deprecated.
492	492	# endif
	493	#if defined(__SunOS_5_11) \|\| defined(__SunOS_5_10)
	494	inline float hypot(float x, float y) { return hypotf(x, y); }
	495	inline long double hypot(long double x, long double y) { return hypotl( x, y); }
	496	#else
493	497	_STLP_MATH_INLINE2XX(float, hypot, hypot)
494	498	inline long double hypot(long double x, long double y) { return sqrt(x * x + y * y); }
	499	#endif
495	500	# if defined (_STLP_MSVC) && (_STLP_MSVC >= 1400)
496	501	# pragma warning (pop)
497	502	# endif


100	100	using _STLP_VENDOR_CSTD::lldiv_t;
101	101	using _STLP_VENDOR_CSTD::lldiv;
102	102	# else
	103	# if !defined(__SunOS_5_11) && !defined(__SunOS_5_10)
	104	#include <stdlib.h>
103	105	using ::llabs;
104	106	using ::lldiv_t;
105	107	using ::lldiv;
	108	else
	109	using ::llabs;
	110	using ::lldiv_t;
	111	using ::lldiv;
	112	# endif
106	113	# endif
107	114	# endif
108	115	using _STLP_VENDOR_CSTD::rand;
…	…
136	136	#if !defined (__HP_aCC) \|\| (__HP_aCC < 30000)
137	137
138	138	//MSVC starting with .Net 2003 already define all math functions in global namespace:
139		# if !defined (_STLP_MSVC_LIB) \|\| (_STLP_MSVC_LIB < 1310) \|\| defined(UNDER_CE)
	139	# if (!defined (_STLP_MSVC_LIB) \|\| (_STLP_MSVC_LIB < 1310) \|\| defined(UNDER_CE)) && !defined(__SunOS_5_11) && !defined(__SunOS_5_10)
140	140	inline long abs(long __x) { return _STLP_VENDOR_CSTD::labs(__x); }
141	141	# endif
142	142
143	143	/** VC since version 8 has this, the platform SDK and CE SDKs hanging behind. */
144		# if !defined (_STLP_MSVC_LIB) \|\| (_STLP_MSVC_LIB < 1400) \|\| defined (_STLP_USING_PLATFORM_SDK_COMPILER) \|\| defined(UNDER_CE)
	144	# if (!defined (_STLP_MSVC_LIB) \|\| (_STLP_MSVC_LIB < 1400) \|\| defined (_STLP_USING_PLATFORM_SDK_COMPILER) \|\| defined(UNDER_CE)) && !defined(__SunOS_5_10)
145	145	inline _STLP_VENDOR_CSTD::ldiv_t div(long __x, long __y) { return _STLP_VENDOR_CSTD::ldiv(__x, __y); }
146	146	# endif
147	147
…	…
159	159	inline _STLP_LONG_LONG abs(_STLP_LONG_LONG __x) { return _STLP_VENDOR_CSTD::llabs(__x); }
160	160	inline lldiv_t div(_STLP_LONG_LONG __x, _STLP_LONG_LONG __y) { return _STLP_VENDOR_CSTD::lldiv(__x, __y); }
161	161	# else
	162	#if !defined(__SunOS_5_11) && !defined(__SunOS_5_10)
162	163	inline _STLP_LONG_LONG abs(_STLP_LONG_LONG __x) { return ::llabs(__x); }
163	164	inline lldiv_t div(_STLP_LONG_LONG __x, _STLP_LONG_LONG __y) { return ::lldiv(__x, __y); }
	165	#endif
164	166	# endif
165	167	# else
166	168	inline _STLP_LONG_LONG abs(_STLP_LONG_LONG __x) { return __x < 0 ? -__x : __x; }
…	…
182	182	#if defined (_STLP_IMPORT_VENDOR_CSTD) && !defined (_STLP_NO_CSTD_FUNCTION_IMPORTS)
183	183	// ad hoc, don't replace with _STLP_VENDOR_CSTD::abs here! - ptr 2005-03-05
184	184	_STLP_BEGIN_NAMESPACE
	185	#if !defined(__SunOS_5_11) && !defined(__SunOS_5_10)
185	186	using ::abs;
	187	#endif
186	188	# if !defined (N_PLAT_NLM)
187	189	using ::div;
188	190	# else


23	23	/* STLport version */
24	24	#define _STLPORT_MAJOR 5
25	25	#define _STLPORT_MINOR 1
26		#define _STLPORT_PATCHLEVEL 6
	26	#define _STLPORT_PATCHLEVEL 7
27	27
28		#define _STLPORT_VERSION 0x516
	28	#define _STLPORT_VERSION 0x517
29	29
30	30	#endif /* _STLP_STLPORT_VERSION_H */


52	52	template<int __32bits>
53	53	_STLP_STATIC_MUTEX
54	54	_Atomic_swap_struct<__32bits>::_S_swap_lock _STLP_MUTEX_INITIALIZER;
	55	#if (defined(__SunOS_5_11) \|\| defined(__SunOS_5_10)) && defined(__amd64)
	56	template<int __64bits>
	57	_STLP_STATIC_MUTEX
	58	_Atomic_swap_struct<__64bits>::_S_swap_lock _STLP_MUTEX_INITIALIZER;
	59	#else
55	60	# undef _STLP_USE_ATOMIC_SWAP_MUTEX
	61	#endif
56	62	# endif
57	63
58	64	# if defined (_STLP_THREADS) && !defined (_STLP_USE_PTHREAD_SPINLOCK)


23	23
24	24	#ifndef _STLP_INTERNAL_THREADS_H
25	25	#define _STLP_INTERNAL_THREADS_H
	26	#if defined(__SunOS_5_11) \|\| defined(__SunOS_5_10)
	27	typedef unsigned long size_t;
	28	#endif
26	29
27	30	// Supported threading models are native SGI, pthreads, uithreads
28	31	// (similar to pthreads, but based on an earlier draft of the Posix
…	…
111	111	# endif
112	112	# endif // _STLP_USE_PTHREAD_SPINLOCK
113	113
114		# if defined (__GNUC__) && defined (__i386__)
	114	# if (defined (__GNUC__) && defined (__i386__)) \|\| (defined(_SunOS_5_11) \|\| defined(__SunOS_5_10)) && (defined(__i386) \|\| defined(__amd64))
115	115
116	116	# if !defined (_STLP_ATOMIC_INCREMENT)
117	117	inline long _STLP_atomic_increment_gcc_x86(long volatile* p) {
…	…
153	153	# endif
154	154
155	155	# endif /* if defined(__GNUC__) && defined(__i386__) */
	156	/* \|\| (defined(_SunOS_5_11) \|\| (defined(__SunOS_5_10)) && (defined(__i386) \|\| defined(__amd64))) */
156	157
157	158	# elif defined (_STLP_WIN32THREADS)
158	159
…	…
188	188	# elif defined(_STLP_SPARC_SOLARIS_THREADS)
189	189
190	190	# include <stl/_sparc_atomic.h>
	191
	192	# elif defined(_STLP_AMD_SOLARIS_THREADS)
	193	# include <atomic.h>
	194
	195	inline __stl_atomic_t stlp_atomic_increment(volatile __stl_atomic_t* __ptr) { atomic_inc_ulong(__ptr); return(*__ptr);}
	196	# define _STLP_ATOMIC_INCREMENT(__pvalue1) stlp_atomic_increment(__pvalue1)
	197
	198	inline __stl_atomic_t stlp_atomic_decrement(volatile __stl_atomic_t* __ptr) { atomic_dec_ulong(__ptr); return(*__ptr);}
	199	# define _STLP_ATOMIC_DECREMENT(__pvalue1) stlp_atomic_decrement(__pvalue1)
	200
	201	inline __stl_atomic_t stlp_atomic_exchange(volatile __stl_atomic_t* __target, __stl_atomic_t __val) {atomic_swap_ulong(__target,__val); return *__target;}
	202	# define _STLP_ATOMIC_EXCHANGE(__pvalue1, __value2) stlp_atomic_exchange(__pvalue1,__value2)
191	203
192	204	# elif defined (_STLP_UITHREADS)
193	205


19	19	#ifndef _STLP_VALARRAY_H
20	20	#define _STLP_VALARRAY_H
21	21
	22	#if defined(__SunOS_5_11) \|\| defined(__SunOS_5_10)
	23	#ifndef _STLP_INTERNAL_CONSTRUCT_H
	24	# include <stl/_construct.h>
	25	#endif
	26	#ifndef _STLP_INTERNAL_UNINITIALIZED_H
	27	# include <stl/_uninitialized.h>
	28	#endif
	29	#endif
	30
	31
22	32	#ifndef _STLP_INTERNAL_CMATH
23	33	# include <stl/_cmath.h>
24	34	#endif


7	7	#include <sys/feature_tests.h>
8	8
9	9	/* system-dependent defines */
	10	/* For SunOS greater than 5.7: */
10	11
11		/*
12		* Should be fixed:
13		* 1. __SunOS_5_x not defined, and no way to derive this from headers only;
14		* define it with -D on compiler command line is a bad idea too.
15		*
16		* 2. Solaris may has, but may hasn't MATH_F and MATH_L functions (even with two
17		* underscores)---this depends upon system update level and seems legally present
18		* only in Solaris 10 (i.e. I saw Solaris 9 with and without __acosf in libm.so.1)
19		*
20		* - ptr
21		*/
22
23		#if defined (__SunOS_5_8) && ! defined (_STLP_HAS_NO_NEW_C_HEADERS) && ( __cplusplus >= 199711L)
	12	# if defined (__SunOS_GT_7) && ! defined (_STLP_HAS_NO_NEW_C_HEADERS) && ( __cplusplus >= 199711L) && !defined (__linux__)
24	13	# define _STLP_HAS_NATIVE_FLOAT_ABS
25		#endif
	14	# endif
26	15
27	16	#if defined(_XOPEN_SOURCE) && (_XOPEN_VERSION - 0 >= 4)
28	17	# define _STLP_RAND48 1
…	…
40	40	# endif
41	41	#endif
42	42
	43	#if defined (__sun ) && (defined(__SunOS_5_10) \|\| defined(__SunOS_5_11))
	44	#define _STLP_AMD_SOLARIS_THREADS
	45	#undef _STLP_SPARC_SOLARIS_THREADS
	46	# define _STLP_THREADS_DEFINED
	47	#endif
	48
43	49	/* gcc does not support ELF64 yet ; however; it supports ultrasparc + v8plus.
44	50	* limits.h contains invalid values for this combination
45	51	*/
…	…
67	67	* P.S. That's why I add two defines:
68	68	*/
69	69
70		/* #ifdef __GNUC__ */
	70	#ifdef __GNUC__
71	71	#define _STLP_NO_VENDOR_MATH_F
72	72	#define _STLP_NO_VENDOR_MATH_L
73		/* #endif */
	73	#endif
74	74
75	75	#ifdef __GNUC__
76	76	# define _STLP_WCHAR_BORLAND_EXCLUDE
77	77	# define _STLP_NO_NATIVE_WIDE_FUNCTIONS 1
78	78	#endif
	79
	80	#define _STLP_USE_MALLOC
79	81
80	82	#endif /* __stl_config__solaris_h */


17	17	# define _STLP_NO_BOOL 1
18	18	#endif
19	19
	20	/*
	21	# if ! defined(_TEMPLATE_NO_EXTDEF)
	22	# define _STLP_LINK_TIME_INSTANTIATION 1
	23	# endif
	24	*/
	25
	26	# if ! defined(_BOOL)
	27	# define _STLP_NO_BOOL 1
	28	# endif
	29
	30	# if (__SUNPRO_CC >= 0x500 ) && (!defined (__SUNPRO_CC_COMPAT) \|\| (__SUNPRO_CC_COMPAT == 5 )) \
	31	&& defined (_STLP_NO_OWN_IOSTREAMS) && ! defined (_STLP_HAS_NO_NEW_IOSTREAMS)
	32	# error "The wrapper (_STLP_NO_OWN_IOSTREAMS) mode does not work well without _STLP_HAS_NO_NEW_IOSTREAMS. Please set this flag. You will also have to use -liostream option on link phase."
	33	/* # define _STLP_HAS_NO_NEW_IOSTREAMS */
	34	# endif
	35
20	36	// compatibility mode stuff
21		#if (__SUNPRO_CC >= 0x510) && (!defined (__SUNPRO_CC_COMPAT) \|\| (__SUNPRO_CC_COMPAT == 5 ))
	37	# if (__SUNPRO_CC >= 0x510) && (!defined (__SUNPRO_CC_COMPAT) \|\| (__SUNPRO_CC_COMPAT == 5 ))
22	38	# define _STLP_NATIVE_INCLUDE_PATH ../CC/Cstd
23	39	# define _STLP_NATIVE_CPP_RUNTIME_INCLUDE_PATH ../CC
24		#elif (__SUNPRO_CC >= 0x500) && (!defined (__SUNPRO_CC_COMPAT) \|\| (__SUNPRO_CC_COMPAT == 5 ))
	40	# elif (__SUNPRO_CC >= 0x500) && (!defined (__SUNPRO_CC_COMPAT) \|\| (__SUNPRO_CC_COMPAT == 5 ))
25	41	# define _STLP_NATIVE_INCLUDE_PATH ../CC
26		#elif (defined (__SUNPRO_CC_COMPAT) && __SUNPRO_CC_COMPAT == 4)
	42	# elif (defined (__SUNPRO_CC_COMPAT) && __SUNPRO_CC_COMPAT == 4)
27	43	# define _STLP_NATIVE_INCLUDE_PATH ../CC4
28		#else
	44	# else
29	45	# define _STLP_NATIVE_INCLUDE_PATH ../CC
30		#endif
	46	# endif
31	47
32		#define _STLP_STATIC_CONST_INIT_BUG 1
	48	/* #define _STLP_STATIC_CONST_INIT_BUG 1 */
	49	# if (__SUNPRO_CC >= 0x500 ) && ( defined (_STLP_NO_NEW_IOSTREAMS) \|\| defined (_STLP_HAS_NO_NEW_IOSTREAMS) )
	50	/* if the project is set up to use libiostream (_STLP_NO_NEW_IOSTREAMS should be defined then),
	51	use classic iostreams */
	52	# define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../CCios
	53	# endif
33	54
34		#if (__SUNPRO_CC < 0x530)
	55	# if (__SUNPRO_CC < 0x530)
35	56	// those are tested and proved not to work...
	57	# define _STLP_STATIC_ARRAY_BUG 1
36	58	# define _STLP_NO_CLASS_PARTIAL_SPECIALIZATION 1
37	59	# define _STLP_NO_MEMBER_TEMPLATE_CLASSES 1
38	60	# define _STLP_USE_OLD_HP_ITERATOR_QUERIES
39		#endif
	61	# endif
40	62
41	63	#ifdef _STLP_USE_NO_IOSTREAMS
42	64	# define _STLP_HAS_NO_NEW_C_HEADERS 1
43	65	#endif
44	66
	67	# if defined (_STLP_OWN_IOSTREAMS)
	68	# if ! defined (_STLP_NO_OWN_NAMESPACE)
	69	# define _STLP_NO_OWN_NAMESPACE
	70	# endif
	71	# else
	72	# define _STLP_HAS_NO_NEW_C_HEADERS 1
	73	# endif
	74
	75
45	76	// those do not depend on compatibility
46	77	#if (__SUNPRO_CC < 0x510)
47	78	# define _STLP_NO_TYPENAME_ON_RETURN_TYPE 1
48	79	# define _STLP_NONTEMPL_BASE_MATCH_BUG 1
49	80	#endif
50	81
51		#if (__SUNPRO_CC < 0x510) \|\| (defined (__SUNPRO_CC_COMPAT) && (__SUNPRO_CC_COMPAT < 5))
	82	# if (__SUNPRO_CC < 0x510) \|\| (defined (__SUNPRO_CC_COMPAT) && (__SUNPRO_CC_COMPAT < 5))
52	83
53	84	# define _STLP_NO_QUALIFIED_FRIENDS 1
54	85
…	…
93	93	# define _STLP_NO_FUNCTION_TMPL_PARTIAL_ORDER 1
94	94	# define _STLP_NO_EXPLICIT_FUNCTION_TMPL_ARGS
95	95	# define _STLP_NO_MEMBER_TEMPLATE_KEYWORD 1
96		#endif
	96	# endif
97	97
98	98	// Features that depend on compatibility switch
99		#if ( __SUNPRO_CC < 0x500 ) \|\| (defined (__SUNPRO_CC_COMPAT) && (__SUNPRO_CC_COMPAT < 5))
	99	# if ( __SUNPRO_CC < 0x500 ) \|\| (defined (__SUNPRO_CC_COMPAT) && (__SUNPRO_CC_COMPAT < 5))
100	100
101		# ifndef _STLP_USE_NO_IOSTREAMS
102		# define _STLP_USE_NO_IOSTREAMS 1
	101	# ifndef _STLP_HAS_NO_NEW_IOSTREAMS
	102	# define _STLP_HAS_NO_NEW_IOSTREAMS 1
103	103	# endif
104	104	# define _STLP_NO_NEW_NEW_HEADER 1
105	105	// # define _STLP_NO_RELOPS_NAMESPACE
…	…
108	108	# define _STLP_NO_BAD_ALLOC 1
109	109	# define _STLP_NO_EXCEPTION_HEADER 1
110	110	# define _STLP_NATIVE_C_INCLUDE_PATH ../include
111		#elif (__SUNPRO_CC < 0x510)
	111	# elif (__SUNPRO_CC < 0x510)
112	112	// # define _STLP_NATIVE_C_HEADER(header) <../CC/##header##.SUNWCCh>
113	113	# define _STLP_NATIVE_CPP_C_HEADER(header) <../CC/##header##.SUNWCCh>
114	114	# define _STLP_NATIVE_C_INCLUDE_PATH /usr/include
115		#elif defined( __SunOS_5_5_1 ) \|\| defined( __SunOS_5_6 ) \|\| defined( __SunOS_5_7 )
	115	# elif defined( __SunOS_5_5_1 ) \|\| defined( __SunOS_5_6 ) \|\| defined( __SunOS_5_7 )
116	116	# define _STLP_NATIVE_C_INCLUDE_PATH ../CC/std
117	117	# define _STLP_NATIVE_CPP_C_INCLUDE_PATH ../CC/std
118		#else
	118	# else
119	119	# define _STLP_NATIVE_C_INCLUDE_PATH /usr/include
120	120	# define _STLP_NATIVE_CPP_C_INCLUDE_PATH ../CC/std
121		#endif
	121	# endif
122	122
123		#if ( __SUNPRO_CC < 0x500 )
124	123
125		# undef _STLP_NATIVE_C_HEADER
	124	#if defined(__linux__) /* SunSoft's compiler present for Linux too ... */
126	125	# undef _STLP_NATIVE_CPP_C_HEADER
	126	# undef _STLP_NATIVE_CPP_C_INCLUDE_PATH
	127	# define _XOPEN_SOURCE 500
	128	# define _STLP_VENDOR_GLOBAL_CSTD
	129	# define _STLP_NATIVE_C_INCLUDE_PATH_VENDOR ../cc
	130	# define _STLP_NATIVE_CPP_C_INCLUDE_PATH ../CC/std
	131	/* # define _STLP_NATIVE_CPP_C_HEADER(header) </usr/include/g++-3/header> */
	132	/* # define _STLP_NATIVE_CPP_C_INCLUDE_PATH /usr/include/g++-3 */
	133	#endif /* __linux__ */
127	134
128		# define wint_t __wint_t
	135	# if ( __SUNPRO_CC < 0x500 )
	136
	137	# undef _STLP_NATIVE_C_HEADER
	138	# undef _STLP_NATIVE_CPP_C_HEADER
	139
	140	# define wint_t __wint_t
129	141	// famous CC 4.2 bug
130		# define _STLP_INLINE_STRING_LITERAL_BUG 1
	142	# define _STLP_INLINE_STRING_LITERAL_BUG 1
131	143	// /usr/include
132		# define _STLP_NATIVE_C_INCLUDE_PATH ../include
	144	# define _STLP_NATIVE_C_INCLUDE_PATH ../include
133	145
134	146	// 4.2 cannot handle iterator_traits<_Tp>::iterator_category as a return type ;(
135	147	# define _STLP_USE_OLD_HP_ITERATOR_QUERIES
…	…
153	153
154	154	# define _STLP_NEED_TYPENAME 1
155	155	# define _STLP_NEED_EXPLICIT 1
	156	# define _STLP_UNINITIALIZABLE_PRIVATE 1
156	157	# define _STLP_NO_BAD_ALLOC 1
157	158	# define _STLP_NO_ARROW_OPERATOR 1
	159	# define _STLP_DEFAULT_CONSTRUCTOR_BUG 1
158	160
159	161	# define _STLP_DEF_CONST_PLCT_NEW_BUG 1
160	162	# define _STLP_DEF_CONST_DEF_PARAM_BUG 1
…	…
165	165	# define _STLP_HAS_NO_NEW_C_HEADERS 1
166	166	// # define _STLP_DONT_SIMULATE_PARTIAL_SPEC_FOR_TYPE_TRAITS
167	167
168		# if ( __SUNPRO_CC < 0x420 )
	168	# if ( __SUNPRO_CC < 0x420 )
169	169	# define _STLP_NO_PARTIAL_SPECIALIZATION_SYNTAX 1
170	170	# define _STLP_NO_NEW_STYLE_CASTS 1
171	171	# define _STLP_NO_METHOD_SPECIALIZATION 1
172	172	# if ( __SUNPRO_CC > 0x401 )
173		# if (__SUNPRO_CC==0x410)
174		# define _STLP_BASE_TYPEDEF_OUTSIDE_BUG 1
175		# endif
	173	# if (__SUNPRO_CC==0x410)
	174	# define _STLP_BASE_TYPEDEF_OUTSIDE_BUG 1
	175	# endif
176	176	# else
177	177	// SUNPro C++ 4.0.1
178		# define _STLP_BASE_MATCH_BUG 1
179		# define _STLP_BASE_TYPEDEF_BUG 1
180		# if (( __SUNPRO_CC < 0x401 ) && !defined(__SUNPRO_C))
181		__GIVE_UP_WITH_STL(SUNPRO_401)
	178	# define _STLP_BASE_MATCH_BUG 1
	179	# define _STLP_BASE_TYPEDEF_BUG 1
	180	# if ( __SUNPRO_CC < 0x401 )
	181	__GIVE_UP_WITH_STL(SUNPRO_401)
182	182	# endif
183	183	# endif /* 4.0.1 */
184		# endif /* 4.2 */
185		#endif /* < 5.0 */
	184	# endif /* 4.2 */
	185	# endif /* 5.0 */
186	186
187	187	#ifndef _MBSTATET_H
188	188	# define _MBSTATET_H

Commit 4ecbb018ea6fb54b20390d8b8b6a8fba945825a1

Gitorious