diff options
| -rw-r--r-- | gcc/c-family/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/c-family/c-opts.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/concepts/fn7.C | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog index d954245..7f40296 100644 --- a/gcc/c-family/ChangeLog +++ b/gcc/c-family/ChangeLog @@ -1,3 +1,8 @@ +2019-11-05 Jason Merrill <jason@redhat.com> + + * c-opts.c (c_common_post_options): -fconcepts-ts implies + -fconcepts. + 2019-11-04 Kamlesh Kumar <kamleshbhalui@gmail.com> * c-opts.c (c_common_post_options): Update diff --git a/gcc/c-family/c-opts.c b/gcc/c-family/c-opts.c index d4c77be..b84f05c 100644 --- a/gcc/c-family/c-opts.c +++ b/gcc/c-family/c-opts.c @@ -1038,7 +1038,7 @@ c_common_post_options (const char **pfilename) to know when concepts are enabled. Note that -fconcepts-ts can be used to include additional features, although modified to work with the standard. */ - if (cxx_dialect >= cxx2a) + if (cxx_dialect >= cxx2a || flag_concepts_ts) flag_concepts = 1; else if (flag_concepts) /* For -std=c++17 -fconcepts, imply -fconcepts-ts. */ diff --git a/gcc/testsuite/g++.dg/concepts/fn7.C b/gcc/testsuite/g++.dg/concepts/fn7.C index 869cb9c..1994fec 100644 --- a/gcc/testsuite/g++.dg/concepts/fn7.C +++ b/gcc/testsuite/g++.dg/concepts/fn7.C @@ -1,5 +1,5 @@ // { dg-do link { target c++14 } } -// { dg-options "-fconcepts" } +// { dg-options "-fconcepts-ts" } void f() requires true { } |