diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2018-09-13 14:47:14 +0100 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2018-09-13 14:47:14 +0100 |
| commit | 08233f0d6eae9d780d787e8c61cbc051bfe6af43 (patch) | |
| tree | af442eb37f7378baf287f6ffc73cfbb4e52bf93d /libstdc++-v3 | |
| parent | d8d9514c872857d35c69331bf672b8eb94939e21 (diff) | |
| download | gcc-08233f0d6eae9d780d787e8c61cbc051bfe6af43.zip gcc-08233f0d6eae9d780d787e8c61cbc051bfe6af43.tar.gz gcc-08233f0d6eae9d780d787e8c61cbc051bfe6af43.tar.bz2 | |
Limit workaround for Clang bug to __clang_major__ <= 7
The bug https://bugs.llvm.org/show_bug.cgi?id=33222 is now fixed on
Clang trunk, so the workaround won't be needed for Clang 8.0 and later.
* include/std/variant (variant) [__clang__]: Limit workaround to
Clang 7 and older.
From-SVN: r264271
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/variant | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index b23dfe4..6e4fffc 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2018-09-13 Jonathan Wakely <jwakely@redhat.com> + + * include/std/variant (variant) [__clang__]: Limit workaround to + Clang 7 and older. + 2018-09-11 Jonathan Wakely <jwakely@redhat.com> PR libstdc++/87278 diff --git a/libstdc++-v3/include/std/variant b/libstdc++-v3/include/std/variant index 2d86a70..5a77e9e 100644 --- a/libstdc++-v3/include/std/variant +++ b/libstdc++-v3/include/std/variant @@ -1296,7 +1296,7 @@ namespace __variant #undef _VARIANT_RELATION_FUNCTION_TEMPLATE -#ifdef __clang__ +#if defined(__clang__) && __clang_major__ <= 7 public: using _Base::_M_u; // See https://bugs.llvm.org/show_bug.cgi?id=31852 private: |