diff options
Diffstat (limited to 'gcc/cp/init.c')
| -rw-r--r-- | gcc/cp/init.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/gcc/cp/init.c b/gcc/cp/init.c index 50b0bca..2b8d768 100644 --- a/gcc/cp/init.c +++ b/gcc/cp/init.c @@ -1567,12 +1567,8 @@ build_offset_ref (tree type, tree name, bool address_p) tree integral_constant_value (tree decl) { - while ((TREE_CODE (decl) == CONST_DECL - || (TREE_CODE (decl) == VAR_DECL - /* And so are variables with a 'const' type -- unless they - are also 'volatile'. */ - && CP_TYPE_CONST_NON_VOLATILE_P (TREE_TYPE (decl)) - && DECL_INITIALIZED_BY_CONSTANT_EXPRESSION_P (decl)))) + while (TREE_CODE (decl) == CONST_DECL + || DECL_INTEGRAL_CONSTANT_VAR_P (decl)) { tree init; /* If DECL is a static data member in a template class, we must |