Commit 7a5d1d34 by Torvald Riegel Committed by Torvald Riegel

libstdc++: Fix static_assert.

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

From-SVN: r232483
parent c2fff93c
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> 2016-01-16 H.J. Lu <hongjiu.lu@intel.com>
* config/abi/post/x86_64-linux-gnu/x32/baseline_symbols.txt: Add * config/abi/post/x86_64-linux-gnu/x32/baseline_symbols.txt: Add
......
...@@ -278,8 +278,8 @@ _txnal_cow_string_C1_for_exceptions(void* that, const char* s, void *exc) ...@@ -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 void* txnal_read_ptr(void* const * ptr)
{ {
static_assert(sizeof(uint64_t) == sizeof(void*) static_assert(sizeof(uint64_t) == sizeof(void*)
|| sizeof(uint32_t) == sizeof(void*)); || sizeof(uint32_t) == sizeof(void*),
// FIXME make a true compile-time choice to prevent warnings. "Pointers must be 32 bits or 64 bits wide");
#if __UINTPTR_MAX__ == __UINT64_MAX__ #if __UINTPTR_MAX__ == __UINT64_MAX__
return (void*)_ITM_RU8((const uint64_t*)ptr); return (void*)_ITM_RU8((const uint64_t*)ptr);
#else #else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment