From: Ian Lance Taylor <iant@google.com>
Date: Thu, 16 Apr 2009 17:14:36 +0000 (+0000)
Subject: cp-tree.h (enum tsubst_flags): Rename from enum tsubst_flags_t.
X-Git-Tag: releases/gcc-4.5.0~6522
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f87393f0726ebef9e54ce2b0edc9f97dfed9e0fb;p=thirdparty%2Fgcc.git

cp-tree.h (enum tsubst_flags): Rename from enum tsubst_flags_t.

	* cp-tree.h (enum tsubst_flags): Rename from enum tsubst_flags_t.
	(tsubst_flags_t): Change typedef from enum type to int.

From-SVN: r146205
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index c0fa5ba49953..1991ad6beacd 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-16  Ian Lance Taylor  <iant@google.com>
+
+	* cp-tree.h (enum tsubst_flags): Rename from enum tsubst_flags_t.
+	(tsubst_flags_t): Change typedef from enum type to int.
+
 2009-04-16  Le-Chun Wu  <lcwu@google.com>
 
 	* decl.c (check_initializer): Use TYPE_VECTOR_OPAQUE
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index 849fdc736e43..e416edfe6856 100644
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -3566,7 +3566,7 @@ typedef enum linkage_kind {
 } linkage_kind;
 
 /* Bitmask flags to control type substitution.  */
-typedef enum tsubst_flags_t {
+enum tsubst_flags {
   tf_none = 0,			 /* nothing special */
   tf_error = 1 << 0,		 /* give error messages  */
   tf_warning = 1 << 1,	 	 /* give warnings too  */
@@ -3585,7 +3585,11 @@ typedef enum tsubst_flags_t {
 				    when issuing other errors.   */
   /* Convenient substitution flags combinations.  */
   tf_warning_or_error = tf_warning | tf_error
-} tsubst_flags_t;
+};
+
+/* This type is used for parameters and variables which hold
+   combinations of the flags in enum tsubst_flags.  */
+typedef int tsubst_flags_t;
 
 /* The kind of checking we can do looking in a class hierarchy.  */
 typedef enum base_access {