diff options
| author | Ian Lance Taylor <iant@google.com> | 2009-04-20 17:45:15 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2009-04-20 17:45:15 +0000 |
| commit | a916d97fc0c647034e9330b00349ad8145bf3157 (patch) | |
| tree | acedc88c99992164ead5ec0d2e6eca33991eb7d7 /gcc/cp/pt.c | |
| parent | 77022fa8734fdd0b5ac892ba109b77e0ec7dd13b (diff) | |
| download | gcc-a916d97fc0c647034e9330b00349ad8145bf3157.zip gcc-a916d97fc0c647034e9330b00349ad8145bf3157.tar.gz gcc-a916d97fc0c647034e9330b00349ad8145bf3157.tar.bz2 | |
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
Diffstat (limited to 'gcc/cp/pt.c')
| -rw-r--r-- | gcc/cp/pt.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 2fd6257..2ee3d18 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -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) |