diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 4 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/util/thread/all.h | 8 |
2 files changed, 11 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 1cc2970..ee7bcdc 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,9 @@ 2019-05-10 Jonathan Wakely <jwakely@redhat.com> + PR libstdc++/81266 + * testsuite/util/thread/all.h: Do not use remove_pointer for + std::thread::native_handle_type. + PR libstdc++/90397 * include/std/variant (_Variant_storage<false, Types...>::_M_storage()) (_Variant_storage<true, Types...>::_M_reset())) diff --git a/libstdc++-v3/testsuite/util/thread/all.h b/libstdc++-v3/testsuite/util/thread/all.h index e5794fa..2aacae4 100644 --- a/libstdc++-v3/testsuite/util/thread/all.h +++ b/libstdc++-v3/testsuite/util/thread/all.h @@ -25,6 +25,7 @@ #include <sstream> #include <stdexcept> #include <type_traits> +#include <thread> // C++11 only. namespace __gnu_test @@ -39,7 +40,12 @@ namespace __gnu_test // Remove possible pointer type. typedef typename test_type::native_handle_type native_handle; - typedef typename std::remove_pointer<native_handle>::type native_type; + // For std::thread native_handle_type is the type of its data member, + // for other types it's a pointer to the type of the data member. + typedef typename std::conditional< + std::is_same<test_type, std::thread>::value, + native_handle, + typename std::remove_pointer<native_handle>::type>::type native_type; int st = sizeof(test_type); int snt = sizeof(native_type); |