Commit 813e0591 by Wolfgang Bangerth

Fix bad indentation due to changes in whitespace between patch creation and patch application.

From-SVN: r68722
parent 984e085f
...@@ -2783,16 +2783,16 @@ cp_parser_primary_expression (cp_parser *parser, ...@@ -2783,16 +2783,16 @@ cp_parser_primary_expression (cp_parser *parser,
&& INTEGRAL_OR_ENUMERATION_TYPE_P (TREE_TYPE (decl))) && INTEGRAL_OR_ENUMERATION_TYPE_P (TREE_TYPE (decl)))
/* Const variables or static data members of integral /* Const variables or static data members of integral
or enumeration types initialized with constant or enumeration types initialized with constant
expressions (or dependent expressions - in this case expressions (or dependent expressions - in this case
the check will be done at instantiation time). */ the check will be done at instantiation time). */
&& !(TREE_CODE (decl) == VAR_DECL && !(TREE_CODE (decl) == VAR_DECL
&& INTEGRAL_OR_ENUMERATION_TYPE_P (TREE_TYPE (decl)) && INTEGRAL_OR_ENUMERATION_TYPE_P (TREE_TYPE (decl))
&& DECL_INITIAL (decl) && DECL_INITIAL (decl)
&& (TREE_CONSTANT (DECL_INITIAL (decl)) && (TREE_CONSTANT (DECL_INITIAL (decl))
|| type_dependent_expression_p || type_dependent_expression_p
(DECL_INITIAL (decl)) (DECL_INITIAL (decl))
|| value_dependent_expression_p || value_dependent_expression_p
(DECL_INITIAL (decl))))) (DECL_INITIAL (decl)))))
{ {
if (!parser->allow_non_constant_expression_p) if (!parser->allow_non_constant_expression_p)
return cp_parser_non_constant_id_expression (decl); return cp_parser_non_constant_id_expression (decl);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment