From b9a2c51c9096a32736261cb0d3036b24c1fbf9ee Mon Sep 17 00:00:00 2001
From: lerdsuwa <lerdsuwa@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sun, 22 Dec 2002 16:01:27 +0000
Subject: [PATCH] * cp-tree.h (make_unbound_class_template): Use
tsubst_flags_t. * decl.c (make_unbound_class_template): Adjust. Check
for tf_error. * pt.c (tsubst) [OFFSET_TYPE]: Check for tf_error.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@60407 138bc75d-0d04-0410-961f-82ee72b054a4
---
gcc/cp/ChangeLog | 6 ++++++
gcc/cp/cp-tree.h | 2 +-
gcc/cp/decl.c | 4 ++--
gcc/cp/pt.c | 2 +-
4 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 3cd2c30ab335..af16d67138d7 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2002-12-22 Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net>
+
+ * cp-tree.h (make_unbound_class_template): Use tsubst_flags_t.
+ * decl.c (make_unbound_class_template): Adjust. Check for tf_error.
+ * pt.c (tsubst) [OFFSET_TYPE]: Check for tf_error.
+
2002-12-20 Kazu Hirata <kazu@cs.umass.edu>
* ChangeLog: Fix a typo.
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index 12504e5a1dd5..0752bd025264 100644
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -3699,7 +3699,7 @@ extern void set_namespace_binding PARAMS ((tree, tree, tree));
extern tree lookup_namespace_name PARAMS ((tree, tree));
extern tree build_typename_type PARAMS ((tree, tree, tree, tree));
extern tree make_typename_type PARAMS ((tree, tree, tsubst_flags_t));
-extern tree make_unbound_class_template PARAMS ((tree, tree, int));
+extern tree make_unbound_class_template PARAMS ((tree, tree, tsubst_flags_t));
extern tree lookup_name_nonclass PARAMS ((tree));
extern tree lookup_function_nonclass PARAMS ((tree, tree));
extern tree lookup_name PARAMS ((tree, int));
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 0209e344be14..eef5335fb5fe 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -5759,7 +5759,7 @@ make_typename_type (context, name, complain)
tree
make_unbound_class_template (context, name, complain)
tree context, name;
- int complain;
+ tsubst_flags_t complain;
{
tree t;
tree d;
@@ -5781,7 +5781,7 @@ make_unbound_class_template (context, name, complain)
if (!tmpl || !DECL_CLASS_TEMPLATE_P (tmpl))
{
- if (complain)
+ if (complain & tf_error)
error ("no class template named `%#T' in `%#T'", name, context);
return error_mark_node;
}
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 33a84a3aa62f..eb574548e777 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -6800,7 +6800,7 @@ tsubst (t, args, complain, in_decl)
}
if (TREE_CODE (type) == REFERENCE_TYPE)
{
- if (complain)
+ if (complain & tf_error)
error ("creating pointer to member reference type `%T'", type);
return error_mark_node;
--
GitLab