Commit 1a73c7ce66e0fd455610dea3eec5dca69e26806c

dums <dums @01b27279-081b-0410…d9d9e0fb0389.>
Fri Oct 05 22:21:06 CEST 2007

Tree SHA1: 58d3aa1
Parent SHA1: 9d2a5ae (report about gcc 2.95.4)
raw diff | raw patch

Removed useless __msvc6_construct_checker class.

git-svn-id: https://stlport.svn.sourceforge.net/svnroot/stlport/branches/STLPORT_5_1/STLport@3217 01b27279-081b-0410-8cf9-d9d9e0fb0389

Diff rendering mode:
inline
side by side


	1	2007-10-05 Francois Dumont <dums@users.sourceforge.net>
	2
	3	* stlport/stl/debug/_iterator.h, _string.h, src/string.cpp:
	4	Removed useless and even invalid workaround used when
	5	_STLP_USE_MSVC6_MEM_T_BUG_WORKAROUND is defined. There is now
	6	only one construct check class __construct_checker,
	7	__msvc6_construct_checker has been removed.
	8
1	9	2007-09-28 Petr Ovtchenkov <complement@users.sourceforge.net>
2	10
3	11	* Platform tested: gcc 4.1.2 20060928 (prerelease)


46	46	# endif
47	47
48	48	template class _STLP_CLASS_DECLSPEC basic_string<char, char_traits<char>, allocator<char> >;
49		template class _STLP_CLASS_DECLSPEC _STLP_CONSTRUCT_CHECKER<basic_string<char, char_traits<char>, allocator<char> > >;
	49	template class _STLP_CLASS_DECLSPEC __construct_checker<basic_string<char, char_traits<char>, allocator<char> > >;
50	50
51	51	# undef basic_string
52	52	# endif
…	…
79	79	# endif
80	80
81	81	template class _STLP_CLASS_DECLSPEC basic_string<wchar_t, char_traits<wchar_t>, allocator<wchar_t> >;
82		template class _STLP_CLASS_DECLSPEC _STLP_CONSTRUCT_CHECKER<basic_string<wchar_t, char_traits<wchar_t>, allocator<wchar_t> > >;
	82	template class _STLP_CLASS_DECLSPEC __construct_checker<basic_string<wchar_t, char_traits<wchar_t>, allocator<wchar_t> > >;
83	83
84	84	# undef basic_string
85	85	# endif


414	414	#endif
415	415	};
416	416
417		#if defined (_STLP_USE_MSVC6_MEM_T_BUG_WORKAROUND)
418		//Construct checker used by all exported containers.
419		template <class _Container>
420		class __msvc6_construct_checker {
421		typedef typename _Container::value_type value_type;
422		protected:
423		__msvc6_construct_checker() {}
424
425		__msvc6_construct_checker(const value_type* __p) {
426		_STLP_VERBOSE_ASSERT((__p != 0), _StlMsg_INVALID_ARGUMENT)
427		}
428
429		__msvc6_construct_checker(const value_type* __f, const value_type* __l) {
430		_STLP_DEBUG_CHECK(__check_ptr_range(__f,__l))
431		}
432
433		typedef _DBG_iter_base<_Container> _IteType;
434		__msvc6_construct_checker(const _IteType& __f, const _IteType& __l) {
435		_STLP_DEBUG_CHECK(__check_range(__f,__l))
436		}
437		};
438		# define _STLP_CONSTRUCT_CHECKER __msvc6_construct_checker
439		#else
440		# define _STLP_CONSTRUCT_CHECKER __construct_checker
441		#endif
442
443	417	#if defined (_STLP_USE_OLD_HP_ITERATOR_QUERIES)
444	418	# if defined (_STLP_NESTED_TYPE_PARAM_BUG) \|\|\
445	419	(defined (__SUNPRO_CC) && __SUNPRO_CC < 0x600) \|\|\


45	45	#else
46	46	public
47	47	#endif
48		_STLP_PRIV _STLP_CONSTRUCT_CHECKER<_STLP_NON_DBG_STRING >
	48	_STLP_PRIV __construct_checker<_STLP_NON_DBG_STRING >
49	49	#if defined (_STLP_USE_PARTIAL_SPEC_WORKAROUND) && !defined (basic_string)
50	50	, public __stlport_class<basic_string<_CharT, _Traits, _Alloc> >
51	51	#endif
…	…
53	53	protected:
54	54	typedef _STLP_NON_DBG_STRING _Base;
55	55	typedef basic_string<_CharT, _Traits, _Alloc> _Self;
56		typedef _STLP_PRIV _STLP_CONSTRUCT_CHECKER<_STLP_NON_DBG_STRING > _ConstructCheck;
	56	typedef _STLP_PRIV __construct_checker<_STLP_NON_DBG_STRING > _ConstructCheck;
57	57	typedef typename _IsPOD<_CharT>::_Type _Char_Is_POD;
58	58
59	59	public:
…	…
828	828	// This is a hook to instantiate STLport exports in a designated DLL
829	829	#if defined (_STLP_USE_TEMPLATE_EXPORT) && !defined (_STLP_USE_MSVC6_MEM_T_BUG_WORKAROUND)
830	830	_STLP_MOVE_TO_PRIV_NAMESPACE
831		_STLP_EXPORT_TEMPLATE_CLASS _STLP_CONSTRUCT_CHECKER<_STLP_NON_DBG_STRING_NAME <char, char_traits<char>, allocator<char> > >;
	831	_STLP_EXPORT_TEMPLATE_CLASS __construct_checker<_STLP_NON_DBG_STRING_NAME <char, char_traits<char>, allocator<char> > >;
832	832	_STLP_MOVE_TO_STD_NAMESPACE
833	833	_STLP_EXPORT_TEMPLATE_CLASS basic_string<char, char_traits<char>, allocator<char> >;
834	834	# if defined (_STLP_HAS_WCHAR_T)
835	835	_STLP_MOVE_TO_PRIV_NAMESPACE
836		_STLP_EXPORT_TEMPLATE_CLASS _STLP_CONSTRUCT_CHECKER<_STLP_NON_DBG_STRING_NAME <wchar_t, char_traits<wchar_t>, allocator<wchar_t> > >;
	836	_STLP_EXPORT_TEMPLATE_CLASS __construct_checker<_STLP_NON_DBG_STRING_NAME <wchar_t, char_traits<wchar_t>, allocator<wchar_t> > >;
837	837	_STLP_MOVE_TO_STD_NAMESPACE
838	838	_STLP_EXPORT_TEMPLATE_CLASS basic_string<wchar_t, char_traits<wchar_t>, allocator<wchar_t> >;
839	839	# endif

Commit 1a73c7ce66e0fd455610dea3eec5dca69e26806c

Gitorious