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

regex_compiler.h (_S_cache_size): Change from function to variable. 

* include/bits/regex_compiler.h (_S_cache_size): Change from
	function to variable.

From-SVN: r260128
This commit is contained in:
Jason Merrill 2018-05-10 15:12:23 -04:00 committed by Jason Merrill
parent f8e94a0156
commit a6e1cfddc4
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,8 @@
2018-05-10 Jason Merrill <jason@redhat.com>
* include/bits/regex_compiler.h (_S_cache_size): Change from
function to variable.
2018-05-10 Edward Smith-Rowland <3dw4rd@verizon.net> 2018-05-10 Edward Smith-Rowland <3dw4rd@verizon.net>
PR libstdc++/83140 - assoc_legendre returns negated value when m is odd PR libstdc++/83140 - assoc_legendre returns negated value when m is odd

8
libstdc++-v3/include/bits/regex_compiler.h
View File

@ -527,14 +527,12 @@ namespace __detail
typedef typename std::is_same<_CharT, char>::type _UseCache; typedef typename std::is_same<_CharT, char>::type _UseCache;
static constexpr size_t static constexpr size_t
_S_cache_size() _S_cache_size =
{ 1ul << (sizeof(_CharT) * __CHAR_BIT__ * int(_UseCache::value));
return 1ul << (sizeof(_CharT) * __CHAR_BIT__ * int(_UseCache::value));
}
struct _Dummy { }; struct _Dummy { };
typedef typename std::conditional<_UseCache::value, typedef typename std::conditional<_UseCache::value,
std::bitset<_S_cache_size()>, std::bitset<_S_cache_size>,
_Dummy>::type _CacheT; _Dummy>::type _CacheT;
typedef typename std::make_unsigned<_CharT>::type _UnsignedCharT; typedef typename std::make_unsigned<_CharT>::type _UnsignedCharT;