diff options
| author | Eric Botcazou <ebotcazou@adacore.com> | 2015-07-10 19:19:39 +0000 |
|---|---|---|
| committer | Eric Botcazou <ebotcazou@gcc.gnu.org> | 2015-07-10 19:19:39 +0000 |
| commit | bb49ee66ef413295fee5f319d3c4129b624bbf8e (patch) | |
| tree | fb2eeff7b927ad203e2147d132d00c149b492201 /gcc/cp | |
| parent | 112fc9c3994053942c51b1bf4c58e51f26cf9f90 (diff) | |
| download | gcc-bb49ee66ef413295fee5f319d3c4129b624bbf8e.zip gcc-bb49ee66ef413295fee5f319d3c4129b624bbf8e.tar.gz gcc-bb49ee66ef413295fee5f319d3c4129b624bbf8e.tar.bz2 | |
c-ada-spec.h (cpp_operation): Revert latest change.
c-family/
* c-ada-spec.h (cpp_operation): Revert latest change.
* c-ada-spec.c (print_ada_declaration): Likewise. Skip implicit
constructors and destructors.
cp/
* decl2.c (cpp_check): Revert latest change.
From-SVN: r225686
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/decl2.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 3640cce..4f61c89 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +2015-07-10 Eric Botcazou <ebotcazou@adacore.com> + + * decl2.c (cpp_check): Revert latest change. + 2015-07-09 Jason Merrill <jason@redhat.com> * pt.c (instantiation_dependent_r) [TRAIT_EXPR]: Call diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c index a1446c2..cac0508 100644 --- a/gcc/cp/decl2.c +++ b/gcc/cp/decl2.c @@ -4070,8 +4070,6 @@ cpp_check (tree t, cpp_operation op) } case IS_ABSTRACT: return DECL_PURE_VIRTUAL_P (t); - case IS_CONSTEXPR: - return DECL_DECLARED_CONSTEXPR_P (t); case IS_CONSTRUCTOR: return DECL_CONSTRUCTOR_P (t); case IS_DESTRUCTOR: |