From f4568f030ec2f2e97e73031562c5d5392595bd23 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 25 Oct 2019 14:29:37 +0100 Subject: [PATCH] Guard use of concepts with feature test macro This fixes a regression when using Clang. * include/bits/range_cmp.h: Check __cpp_lib_concepts before defining concepts. Fix comment. From-SVN: r277449 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/include/bits/range_cmp.h | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 85cded32877..d1f0e3a4cd4 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2019-10-25 Jonathan Wakely + + * include/bits/range_cmp.h: Check __cpp_lib_concepts before defining + concepts. Fix comment. + 2019-10-25 Gerald Pfeifer * doc/xml/manual/policy_data_structures_biblio.xml: Switch diff --git a/libstdc++-v3/include/bits/range_cmp.h b/libstdc++-v3/include/bits/range_cmp.h index a77fd5274b9..870eb3a8ee5 100644 --- a/libstdc++-v3/include/bits/range_cmp.h +++ b/libstdc++-v3/include/bits/range_cmp.h @@ -22,7 +22,7 @@ // see the files COPYING3 and COPYING.RUNTIME respectively. If not, see // . -/** @file bits/ranges_function.h +/** @file bits/range_cmp.h * This is an internal header file, included by other library headers. * Do not attempt to use it directly. @headername{functional} */ @@ -54,6 +54,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION using is_transparent = __is_transparent; }; +#ifdef __cpp_lib_concepts namespace ranges { namespace __detail @@ -182,6 +183,7 @@ namespace ranges }; } // namespace ranges +#endif // library concepts _GLIBCXX_END_NAMESPACE_VERSION } // namespace std #endif // C++20 -- 2.11.4.GIT