diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2019-10-25 14:29:37 +0100 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2019-10-25 14:29:37 +0100 |
| commit | f4568f030ec2f2e97e73031562c5d5392595bd23 (patch) | |
| tree | 55332f00ba4b5e9b865820b01c159c2cda0d9aeb | |
| parent | 7098ab48b08782af5016dc8ac6d10215994447a4 (diff) | |
| download | gcc-f4568f030ec2f2e97e73031562c5d5392595bd23.zip gcc-f4568f030ec2f2e97e73031562c5d5392595bd23.tar.gz gcc-f4568f030ec2f2e97e73031562c5d5392595bd23.tar.bz2 | |
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
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/range_cmp.h | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 85cded3..d1f0e3a 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2019-10-25 Jonathan Wakely <jwakely@redhat.com> + + * include/bits/range_cmp.h: Check __cpp_lib_concepts before defining + concepts. Fix comment. + 2019-10-25 Gerald Pfeifer <gerald@pfeifer.com> * 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 a77fd52..870eb3a 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 // <http://www.gnu.org/licenses/>. -/** @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 |