libstdc++: Fix static_assert.

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

From-SVN: r232483

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 96901934c2c064c3c9ec7b5c3bfefb3fadf3ebbd..c4c35983d62ff6905876e44f15220c56303c384e 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -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

diff --git a/libstdc++-v3/src/c++11/cow-stdexcept.cc b/libstdc++-v3/src/c++11/cow-stdexcept.cc
index afc3f6cddf7c952fc1c0ce86252ed121c7d8a435..e2d7e7614933afdfa262144e5bcbf9f41948c4ad 100644 (file)
--- a/libstdc++-v3/src/c++11/cow-stdexcept.cc
+++ b/libstdc++-v3/src/c++11/cow-stdexcept.cc
@@ -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