aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2018-05-10 15:33:25 -0400
committerJason Merrill <jason@gcc.gnu.org>2018-05-10 15:33:25 -0400
commitb947b54c3d5f50316d88d50decf14879250a9988 (patch)
treeaf41236a99a98b9c2709702863b6bdeb9e15e67c /gcc
parent0f8a1c150e46fc23d34a342a80bb52dda3571f94 (diff)
downloadgcc-b947b54c3d5f50316d88d50decf14879250a9988.zip
gcc-b947b54c3d5f50316d88d50decf14879250a9988.tar.gz
gcc-b947b54c3d5f50316d88d50decf14879250a9988.tar.bz2
cp-tree.h (DECL_CONSTRUCTOR_P): Use DECL_CXX_CONSTRUCTOR_P.
* cp-tree.h (DECL_CONSTRUCTOR_P): Use DECL_CXX_CONSTRUCTOR_P. (DECL_DESTRUCTOR_P): Use DECL_CXX_DESTRUCTOR_P. From-SVN: r260133
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/ChangeLog3
-rw-r--r--gcc/cp/cp-tree.h4
2 files changed, 5 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 2b9ceb2..bee1112 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
2018-05-09 Jason Merrill <jason@redhat.com>
+ * cp-tree.h (DECL_CONSTRUCTOR_P): Use DECL_CXX_CONSTRUCTOR_P.
+ (DECL_DESTRUCTOR_P): Use DECL_CXX_DESTRUCTOR_P.
+
Core issue 2310 - conversion to base of incomplete type.
* class.c (build_base_path): Check COMPLETE_TYPE_P for source type.
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index 2df158c..a4e0099 100644
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -2731,7 +2731,7 @@ struct GTY(()) lang_decl {
/* For FUNCTION_DECLs and TEMPLATE_DECLs: nonzero means that this function
is a constructor. */
#define DECL_CONSTRUCTOR_P(NODE) \
- IDENTIFIER_CTOR_P (DECL_NAME (NODE))
+ DECL_CXX_CONSTRUCTOR_P (STRIP_TEMPLATE (NODE))
/* Nonzero if NODE (a FUNCTION_DECL) is a constructor for a complete
object. */
@@ -2760,7 +2760,7 @@ struct GTY(()) lang_decl {
/* Nonzero if NODE (a FUNCTION_DECL or TEMPLATE_DECL)
is a destructor. */
#define DECL_DESTRUCTOR_P(NODE) \
- IDENTIFIER_DTOR_P (DECL_NAME (NODE))
+ DECL_CXX_DESTRUCTOR_P (STRIP_TEMPLATE (NODE))
/* Nonzero if NODE (a FUNCTION_DECL) is a destructor, but not the
specialized in-charge constructor, in-charge deleting constructor,