OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

stl_algo.h (stable_sort): Uglify the buf variable. 

2006-07-30  Paolo Carlini  <pcarlini@suse.de>

	* include/bits/stl_algo.h (stable_sort): Uglify the buf variable.
	* include/bits/stl_tempbuf.h (_Temporary_buffer<>::
	_M_initialize_buffer): Uglify the val parameter.

From-SVN: r115820
This commit is contained in:
Paolo Carlini 2006-07-30 13:02:58 +00:00 committed by Paolo Carlini
parent 56ee081b4a
commit 43804767bb
3 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,9 @@
2006-07-30 Paolo Carlini <pcarlini@suse.de>
* include/bits/stl_algo.h (stable_sort): Uglify the buf variable.
* include/bits/stl_tempbuf.h (_Temporary_buffer<>::
_M_initialize_buffer): Uglify the val parameter.
2006-07-27 Benjamin Kosnik <bkoz@wells.artheist.org>
PR libstdc++/19664 round 3

19
libstdc++-v3/include/bits/stl_algo.h
View File

@ -3850,13 +3850,13 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
__glibcxx_function_requires(_LessThanComparableConcept<_ValueType>)
__glibcxx_requires_valid_range(__first, __last);
_Temporary_buffer<_RandomAccessIterator, _ValueType>
buf(__first, __last);
if (buf.begin() == 0)
_Temporary_buffer<_RandomAccessIterator, _ValueType> __buf(__first,
__last);
if (__buf.begin() == 0)
std::__inplace_stable_sort(__first, __last);
else
std::__stable_sort_adaptive(__first, __last, buf.begin(),
_DistanceType(buf.size()));
std::__stable_sort_adaptive(__first, __last, __buf.begin(),
_DistanceType(__buf.size()));
}
/**
@ -3894,12 +3894,13 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
_ValueType>)
__glibcxx_requires_valid_range(__first, __last);
_Temporary_buffer<_RandomAccessIterator, _ValueType> buf(__first, __last);
if (buf.begin() == 0)
_Temporary_buffer<_RandomAccessIterator, _ValueType> __buf(__first,
__last);
if (__buf.begin() == 0)
std::__inplace_stable_sort(__first, __last, __comp);
else
std::__stable_sort_adaptive(__first, __last, buf.begin(),
_DistanceType(buf.size()), __comp);
std::__stable_sort_adaptive(__first, __last, __buf.begin(),
_DistanceType(__buf.size()), __comp);
}
/**

9
libstdc++-v3/include/bits/stl_tempbuf.h
View File

@ -1,6 +1,7 @@
// Temporary buffer implementation -*- C++ -*-
// Copyright (C) 2001, 2002, 2004, 2005 Free Software Foundation, Inc.
// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006
// Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@ -78,7 +79,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
// concept requirements
__glibcxx_class_requires(_ForwardIterator, _ForwardIteratorConcept)
public:
public:
typedef _Tp value_type;
typedef value_type* pointer;
typedef pointer iterator;
@ -93,8 +94,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
_M_initialize_buffer(const _Tp&, __true_type) { }
void
_M_initialize_buffer(const _Tp& val, __false_type)
{ std::uninitialized_fill_n(_M_buffer, _M_len, val); }
_M_initialize_buffer(const _Tp& __val, __false_type)
{ std::uninitialized_fill_n(_M_buffer, _M_len, __val); }
public:
/// As per Table mumble.