FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libstdc++: Fix static_assert.

Browse source 
* src/c++11/cow-stdexcept.cc (txnal_read_ptr): Fix static_assert.

From-SVN: r232483
This commit is contained in:
Torvald Riegel 2016-01-17 17:43:37 +00:00 • committed by Torvald Riegel
parent c2fff93c85
commit 7a5d1d34ee
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libstdc++-v3/ChangeLog
View file

@ -1,3 +1,7 @@
2016-01-17 Torvald Riegel <triegel@redhat.com>
* src/c++11/cow-stdexcept.cc (txnal_read_ptr): Fix static_assert.
2016-01-16 H.J. Lu <hongjiu.lu@intel.com>
* config/abi/post/x86_64-linux-gnu/x32/baseline_symbols.txt: Add

4
libstdc++-v3/src/c++11/cow-stdexcept.cc
View file

@ -278,8 +278,8 @@ _txnal_cow_string_C1_for_exceptions(void* that, const char* s, void *exc)
static void* txnal_read_ptr(void* const * ptr)
{
static_assert(sizeof(uint64_t) == sizeof(void*)
|| sizeof(uint32_t) == sizeof(void*));
// FIXME make a true compile-time choice to prevent warnings.
|| sizeof(uint32_t) == sizeof(void*),
"Pointers must be 32 bits or 64 bits wide");
#if __UINTPTR_MAX__ == __UINT64_MAX__
return (void*)_ITM_RU8((const uint64_t*)ptr);
#else