diff options
| author | mpolacek <mpolacek@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-03-16 18:30:49 +0000 |
|---|---|---|
| committer | mpolacek <mpolacek@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-03-16 18:30:49 +0000 |
| commit | 28ccbdf29d6643141297e18e9e3d1f6974980da2 (patch) | |
| tree | 978d3dfb35438dd93e7de5f24704e52ea56efe52 /gcc/cp | |
| parent | 36795c14580569a618700d0c9dd52453c34f102c (diff) | |
| download | gcc-28ccbdf29d6643141297e18e9e3d1f6974980da2.tar.gz | |
DR 1688
PR c++/65327
* decl.c (grokdeclarator): Allow volatile and constexpr together.
* g++.dg/cpp0x/constexpr-object1.C: Change dg-error to dg-bogus.
* g++.dg/cpp0x/pr65327.C: New test.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@221463 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 259ce9c9839..b4fff5085e8 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2015-03-16 Marek Polacek <polacek@redhat.com> + + DR 1688 + PR c++/65327 + * decl.c (grokdeclarator): Allow volatile and constexpr together. + 2015-03-12 Paolo Carlini <paolo.carlini@oracle.com> PR c++/65323 diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index e35e48436dc..cb0f11f5749 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -10134,8 +10134,9 @@ grokdeclarator (const cp_declarator *declarator, the object as `const'. */ if (constexpr_p && innermost_code != cdk_function) { - if (type_quals & TYPE_QUAL_VOLATILE) - error ("both %<volatile%> and %<constexpr%> cannot be used here"); + /* DR1688 says that a `constexpr' specifier in combination with + `volatile' is valid. */ + if (TREE_CODE (type) != REFERENCE_TYPE) { type_quals |= TYPE_QUAL_CONST; |