git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove _GLIBCXX14_USE_CONSTEXPR 

* include/bits/c++config (_GLIBCXX14_USE_CONSTEXPR): Remove it.
	* include/bits/hashtable_policy.h (_Power2_rehash_policy::_M_next_bkt):
	Remove const qualification on function. Replace
	_GLIBCXX14_USE_CONSTEXPR on automatic variables with const.
	(_Power2_rehash_policy::_M_need_rehash): Remove const qualification.
	(_Power2_rehash_policy::_M_next_bkt): Remove mutable specifier.

From-SVN: r236697
This commit is contained in:
Jonathan Wakely 2016-05-25 10:36:28 +01:00 committed by Jonathan Wakely
parent 6aa1abe5f2
commit 834f4c4355
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,12 @@
2016-05-25 Jonathan Wakely <jwakely@redhat.com>
* include/bits/c++config (_GLIBCXX14_USE_CONSTEXPR): Remove it.
* include/bits/hashtable_policy.h (_Power2_rehash_policy::_M_next_bkt):
Remove const qualification on function. Replace
_GLIBCXX14_USE_CONSTEXPR on automatic variables with const.
(_Power2_rehash_policy::_M_need_rehash): Remove const qualification.
(_Power2_rehash_policy::_M_next_bkt): Remove mutable specifier.
2016-05-24 François Dumont <fdumont@gcc.gnu.org>
* include/bits/c++config (_GLIBCXX14_USE_CONSTEXPR): New.

2
libstdc++-v3/include/bits/c++config
View File

@ -106,10 +106,8 @@
#ifndef _GLIBCXX14_CONSTEXPR
# if __cplusplus >= 201402L
# define _GLIBCXX14_CONSTEXPR constexpr
# define _GLIBCXX14_USE_CONSTEXPR constexpr
# else
# define _GLIBCXX14_CONSTEXPR
# define _GLIBCXX14_USE_CONSTEXPR const
# endif
#endif

15
libstdc++-v3/include/bits/hashtable_policy.h
View File

@ -557,13 +557,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
// Return a bucket size no smaller than n (as long as n is not above the
// highest power of 2).
std::size_t
_M_next_bkt(std::size_t __n) const noexcept
_M_next_bkt(std::size_t __n) noexcept
{
_GLIBCXX14_USE_CONSTEXPR size_t __max_width
= std::min<size_t>(sizeof(size_t), 8);
_GLIBCXX14_USE_CONSTEXPR auto __max_bkt
= std::size_t(1) << (__max_width * __CHAR_BIT__ - 1);
const auto __max_width = std::min<size_t>(sizeof(size_t), 8);
const auto __max_bkt = size_t(1) << (__max_width * __CHAR_BIT__ - 1);
std::size_t __res = __clp2(__n);
if (__res == __n)
@ -595,7 +592,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
// is the new bucket count. If not, return make_pair(false, 0).
std::pair<bool, std::size_t>
_M_need_rehash(std::size_t __n_bkt, std::size_t __n_elt,
std::size_t __n_ins) const noexcept
std::size_t __n_ins) noexcept
{
if (__n_elt + __n_ins >= _M_next_resize)
{
@ -630,8 +627,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
static const std::size_t _S_growth_factor = 2;
float _M_max_load_factor;
mutable std::size_t _M_next_resize;
float _M_max_load_factor;
std::size_t _M_next_resize;
};
// Base classes for std::_Hashtable. We define these base classes