Attachment #151133 for bug #219457




++ STLport-5.1.5/stlport/stl/_num_put.c

    //casting numeric_limits<ptrdiff_t>::max to streamsize only works is ptrdiff_t is signed or streamsize representation
    //is larger than ptrdiff_t one.
    _STLP_STATIC_ASSERT((sizeof(streamsize) > sizeof(ptrdiff_t)) ||
                        ((sizeof(streamsize) == sizeof(ptrdiff_t)) && numeric_limits<ptrdiff_t>::is_signed))
    ptrdiff_t __pad = __STATIC_CAST(ptrdiff_t, (min) (__STATIC_CAST(streamsize, (numeric_limits<ptrdiff_t>::max)()),
                                                      __STATIC_CAST(streamsize, __wid - __len)));
    ios_base::fmtflags __dir = __flg & ios_base::adjustfield;
++ STLport-5.1.5/stlport/stl/_istream.c

      //casting numeric_limits<ptrdiff_t>::max to streamsize only works is ptrdiff_t is signed or streamsize representation
      //is larger than ptrdiff_t one.
      _STLP_STATIC_ASSERT((sizeof(streamsize) > sizeof(ptrdiff_t)) ||
                          ((sizeof(streamsize) == sizeof(ptrdiff_t)) && numeric_limits<ptrdiff_t>::is_signed))
      ptrdiff_t __request = __STATIC_CAST(ptrdiff_t, (min) (__STATIC_CAST(streamsize, (numeric_limits<ptrdiff_t>::max)()), _Num - __n));

      const _CharT* __p  = __scan_delim(__first, __last);
++ STLport-5.1.5/stlport/stl/_locale.h

#endif

template <class _Facet>
bool _HasFacet(const locale& __loc, const _Facet*) _STLP_NOTHROW
{ return (__loc._M_get_facet(_Facet::id) != 0); }

template <class _Facet>
_Facet* _UseFacet(const locale& __loc, const _Facet*)
{ return __STATIC_CAST(_Facet*, __loc._M_use_facet(_Facet::id)); }

_STLP_END_NAMESPACE
++ STLport-5.1.5/stlport/stl/_algo.c

template <class _ForwardIter, class _Tp,
          class _Compare1, class _Compare2, class _Distance>
_ForwardIter __upper_bound(_ForwardIter __first, _ForwardIter __last, const _Tp& __val,
                           _Compare1 _STLP_VERBOSE_PARAM(__comp1), _Compare2 __comp2, _Distance*) {
  _Distance __len = distance(__first, __last);
  _Distance __half;

++ STLport-5.1.5/stlport/stl/_algobase.c


template <class _ForwardIter, class _Tp, class _Compare1, class _Compare2, class _Distance>
_ForwardIter __lower_bound(_ForwardIter __first, _ForwardIter __last, const _Tp& __val,
                           _Compare1 __comp1, _Compare2 _STLP_VERBOSE_PARAM(__comp2), _Distance*) {
  _Distance __len = distance(__first, __last);
  _Distance __half;
  _ForwardIter __middle;
++ STLport-5.1.5/stlport/stl/config/features.h


#if !defined (_STLP_DEBUG)
#  define _STLP_VERBOSE_ASSERT(expr,diagnostic)
#  define _STLP_VERBOSE_PARAM(param)
#  define _STLP_DEBUG_CHECK(expr)
#  define _STLP_DEBUG_DO(expr)
#endif
++ STLport-5.1.5/stlport/stl/debug/_debug.h

          }
#  endif

#  define _STLP_VERBOSE_PARAM(param) param
#  define _STLP_DEBUG_CHECK(expr) _STLP_ASSERT(expr)
#  define _STLP_DEBUG_DO(expr)    expr;

++ STLport-5.1.5/src/strstream.cpp

}

void strstreambuf::_M_free(char* p) {
  if (p) {
    if (_M_free_fun)
      _M_free_fun(p);
    else
      delete[] p;
  }
}

void strstreambuf::_M_setup(char* get, char* put, streamsize n) {

Return to bug 219457

Line Link Here

(-)file_not_specified_in_diff (-15 / +18 lines)
0	-- STLport-5.1.5.orig/stlport/stl/_num_put.c	0	++ STLport-5.1.5/stlport/stl/_num_put.c
Lines 158-164 Link Here
158	//casting numeric_limits<ptrdiff_t>::max to streamsize only works is ptrdiff_t is signed or streamsize representation	158	//casting numeric_limits<ptrdiff_t>::max to streamsize only works is ptrdiff_t is signed or streamsize representation
159	//is larger than ptrdiff_t one.	159	//is larger than ptrdiff_t one.
160	_STLP_STATIC_ASSERT((sizeof(streamsize) > sizeof(ptrdiff_t)) \|\|	160	_STLP_STATIC_ASSERT((sizeof(streamsize) > sizeof(ptrdiff_t)) \|\|
161	(sizeof(streamsize) == sizeof(ptrdiff_t)) && numeric_limits<ptrdiff_t>::is_signed)	161	((sizeof(streamsize) == sizeof(ptrdiff_t)) && numeric_limits<ptrdiff_t>::is_signed))
162	ptrdiff_t __pad = __STATIC_CAST(ptrdiff_t, (min) (__STATIC_CAST(streamsize, (numeric_limits<ptrdiff_t>::max)()),	162	ptrdiff_t __pad = __STATIC_CAST(ptrdiff_t, (min) (__STATIC_CAST(streamsize, (numeric_limits<ptrdiff_t>::max)()),
163	__STATIC_CAST(streamsize, __wid - __len)));	163	__STATIC_CAST(streamsize, __wid - __len)));
164	ios_base::fmtflags __dir = __flg & ios_base::adjustfield;	164	ios_base::fmtflags __dir = __flg & ios_base::adjustfield;
165	-- STLport-5.1.5.orig/stlport/stl/_istream.c	165	++ STLport-5.1.5/stlport/stl/_istream.c
Lines 647-653 Link Here
647	//casting numeric_limits<ptrdiff_t>::max to streamsize only works is ptrdiff_t is signed or streamsize representation	647	//casting numeric_limits<ptrdiff_t>::max to streamsize only works is ptrdiff_t is signed or streamsize representation
648	//is larger than ptrdiff_t one.	648	//is larger than ptrdiff_t one.
649	_STLP_STATIC_ASSERT((sizeof(streamsize) > sizeof(ptrdiff_t)) \|\|	649	_STLP_STATIC_ASSERT((sizeof(streamsize) > sizeof(ptrdiff_t)) \|\|
650	(sizeof(streamsize) == sizeof(ptrdiff_t)) && numeric_limits<ptrdiff_t>::is_signed)	650	((sizeof(streamsize) == sizeof(ptrdiff_t)) && numeric_limits<ptrdiff_t>::is_signed))
651	ptrdiff_t __request = __STATIC_CAST(ptrdiff_t, (min) (__STATIC_CAST(streamsize, (numeric_limits<ptrdiff_t>::max)()), _Num - __n));	651	ptrdiff_t __request = __STATIC_CAST(ptrdiff_t, (min) (__STATIC_CAST(streamsize, (numeric_limits<ptrdiff_t>::max)()), _Num - __n));
652		652
653	const _CharT* __p = __scan_delim(__first, __last);	653	const _CharT* __p = __scan_delim(__first, __last);
654	-- STLport-5.1.5.orig/stlport/stl/_locale.h	654	++ STLport-5.1.5/stlport/stl/_locale.h
Lines 308-318 Link Here
308	#endif	308	#endif
309		309
310	template <class _Facet>	310	template <class _Facet>
311	bool _HasFacet(const locale& __loc, const _Facet* __facet) _STLP_NOTHROW	311	bool _HasFacet(const locale& __loc, const _Facet*) _STLP_NOTHROW
312	{ return (__loc._M_get_facet(_Facet::id) != 0); }	312	{ return (__loc._M_get_facet(_Facet::id) != 0); }
313		313
314	template <class _Facet>	314	template <class _Facet>
315	_Facet* _UseFacet(const locale& __loc, const _Facet* __facet)	315	_Facet* _UseFacet(const locale& __loc, const _Facet*)
316	{ return __STATIC_CAST(_Facet*, __loc._M_use_facet(_Facet::id)); }	316	{ return __STATIC_CAST(_Facet*, __loc._M_use_facet(_Facet::id)); }
317		317
318	_STLP_END_NAMESPACE	318	_STLP_END_NAMESPACE
319	-- STLport-5.1.5.orig/stlport/stl/_algo.c	319	++ STLport-5.1.5/stlport/stl/_algo.c
Lines 1342-1348 Link Here
1342	template <class _ForwardIter, class _Tp,	1342	template <class _ForwardIter, class _Tp,
1343	class _Compare1, class _Compare2, class _Distance>	1343	class _Compare1, class _Compare2, class _Distance>
1344	_ForwardIter __upper_bound(_ForwardIter __first, _ForwardIter __last, const _Tp& __val,	1344	_ForwardIter __upper_bound(_ForwardIter __first, _ForwardIter __last, const _Tp& __val,
1345	_Compare1 __comp1, _Compare2 __comp2, _Distance*) {	1345	_Compare1 _STLP_VERBOSE_PARAM(__comp1), _Compare2 __comp2, _Distance*) {
1346	_Distance __len = distance(__first, __last);	1346	_Distance __len = distance(__first, __last);
1347	_Distance __half;	1347	_Distance __half;
1348		1348
1349	-- STLport-5.1.5.orig/stlport/stl/_algobase.c	1349	++ STLport-5.1.5/stlport/stl/_algobase.c
Lines 371-377 Link Here
371		371
372	template <class _ForwardIter, class _Tp, class _Compare1, class _Compare2, class _Distance>	372	template <class _ForwardIter, class _Tp, class _Compare1, class _Compare2, class _Distance>
373	_ForwardIter __lower_bound(_ForwardIter __first, _ForwardIter __last, const _Tp& __val,	373	_ForwardIter __lower_bound(_ForwardIter __first, _ForwardIter __last, const _Tp& __val,
374	_Compare1 __comp1, _Compare2 __comp2, _Distance*) {	374	_Compare1 __comp1, _Compare2 _STLP_VERBOSE_PARAM(__comp2), _Distance*) {
375	_Distance __len = distance(__first, __last);	375	_Distance __len = distance(__first, __last);
376	_Distance __half;	376	_Distance __half;
377	_ForwardIter __middle;	377	_ForwardIter __middle;
378	-- STLport-5.1.5.orig/stlport/stl/config/features.h	378	++ STLport-5.1.5/stlport/stl/config/features.h
Lines 415-420 Link Here
415		415
416	#if !defined (_STLP_DEBUG)	416	#if !defined (_STLP_DEBUG)
417	# define _STLP_VERBOSE_ASSERT(expr,diagnostic)	417	# define _STLP_VERBOSE_ASSERT(expr,diagnostic)
		418	# define _STLP_VERBOSE_PARAM(param)
418	# define _STLP_DEBUG_CHECK(expr)	419	# define _STLP_DEBUG_CHECK(expr)
419	# define _STLP_DEBUG_DO(expr)	420	# define _STLP_DEBUG_DO(expr)
420	#endif	421	#endif
421	-- STLport-5.1.5.orig/stlport/stl/debug/_debug.h	422	++ STLport-5.1.5/stlport/stl/debug/_debug.h
Lines 184-189 Link Here
184	}	184	}
185	# endif	185	# endif
186		186
		187	# define _STLP_VERBOSE_PARAM(param) param
187	# define _STLP_DEBUG_CHECK(expr) _STLP_ASSERT(expr)	188	# define _STLP_DEBUG_CHECK(expr) _STLP_ASSERT(expr)
188	# define _STLP_DEBUG_DO(expr) expr;	189	# define _STLP_DEBUG_DO(expr) expr;
189		190
190	-- STLport-5.1.5.orig/src/strstream.cpp	191	++ STLport-5.1.5/src/strstream.cpp
Lines 266-276 Link Here
266	}	266	}
267		267
268	void strstreambuf::_M_free(char* p) {	268	void strstreambuf::_M_free(char* p) {
269	if (p)	269	if (p) {
270	if (_M_free_fun)	270	if (_M_free_fun)
271	_M_free_fun(p);	271	_M_free_fun(p);
272	else	272	else
273	delete[] p;	273	delete[] p;
		274	}
274	}	275	}
275		276
276	void strstreambuf::_M_setup(char* get, char* put, streamsize n) {	277	void strstreambuf::_M_setup(char* get, char* put, streamsize n) {