OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cp-tree.h (base_access): Change typedef to int. 

* cp-tree.h (base_access): Change typedef to int.
	* parser.c (cp_parser_omp_flush): Change 0 to OMP_CLAUSE_ERROR.
	(cp_parser_omp_threadprivate): Likewise.
	* pt.c (unify_pack_expansion): Add casts to enum type.

From-SVN: r146448
This commit is contained in:
Ian Lance Taylor 2009-04-20 17:45:15 +00:00 committed by Ian Lance Taylor
parent 77022fa873
commit a916d97fc0
4 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/cp/ChangeLog
View File

@ -1,3 +1,10 @@
2009-04-20 Ian Lance Taylor <iant@google.com>
* cp-tree.h (base_access): Change typedef to int.
* parser.c (cp_parser_omp_flush): Change 0 to OMP_CLAUSE_ERROR.
(cp_parser_omp_threadprivate): Likewise.
* pt.c (unify_pack_expansion): Add casts to enum type.
2009-04-19 Manuel López-Ibáñez <manu@gcc.gnu.org>
PR c/32061

8
gcc/cp/cp-tree.h
View File

@ -3592,7 +3592,7 @@ enum tsubst_flags {
typedef int tsubst_flags_t;
/* The kind of checking we can do looking in a class hierarchy. */
typedef enum base_access {
enum base_access {
ba_any = 0, /* Do not check access, allow an ambiguous base,
prefer a non-virtual base */
ba_unique = 1 << 0, /* Must be a unique base. */
@ -3600,7 +3600,11 @@ typedef enum base_access {
ba_check = ba_unique | ba_check_bit,
ba_ignore_scope = 1 << 2, /* Ignore access allowed by local scope. */
ba_quiet = 1 << 3 /* Do not issue error messages. */
} base_access;
};
/* This type is used for parameters and variables which hold
combinations of the flags in enum base_access. */
typedef int base_access;
/* The various kinds of access check during parsing. */
typedef enum deferring_kind {

4
gcc/cp/parser.c
View File

@ -21043,7 +21043,7 @@ static void
cp_parser_omp_flush (cp_parser *parser, cp_token *pragma_tok)
{
if (cp_lexer_next_token_is (parser->lexer, CPP_OPEN_PAREN))
(void) cp_parser_omp_var_list (parser, 0, NULL);
(void) cp_parser_omp_var_list (parser, OMP_CLAUSE_ERROR, NULL);
cp_parser_require_pragma_eol (parser, pragma_tok);
finish_omp_flush ();
@ -21884,7 +21884,7 @@ cp_parser_omp_threadprivate (cp_parser *parser, cp_token *pragma_tok)
{
tree vars;
vars = cp_parser_omp_var_list (parser, 0, NULL);
vars = cp_parser_omp_var_list (parser, OMP_CLAUSE_ERROR, NULL);
cp_parser_require_pragma_eol (parser, pragma_tok);
finish_omp_threadprivate (vars);

8
gcc/cp/pt.c
View File

@ -13131,7 +13131,9 @@ unify_pack_expansion (tree tparms, tree targs, tree packed_parms,
match. */
if (resolve_overloaded_unification
(tparms, targs, parm, arg, strict, sub_strict)
(tparms, targs, parm, arg,
(unification_kind_t) strict,
sub_strict)
!= 0)
return 1;
skip_arg_p = true;
@ -13150,8 +13152,8 @@ unify_pack_expansion (tree tparms, tree targs, tree packed_parms,
if (!subr)
arg_strict |=
maybe_adjust_types_for_deduction (strict, &parm, &arg,
arg_expr);
maybe_adjust_types_for_deduction ((unification_kind_t) strict,
&parm, &arg, arg_expr);
}
if (!skip_arg_p)