On 09/20/2011 06:17 PM, Ville Voutilainen wrote:
I find it hard to see what exactly changes there. Even if I
restore the indentation level, git still shows a diff. Perhaps
there were tabs in it...
Yes, the change is probably tabs vs. spaces.
else if (TYPE_P (name))
{
basetype = TYPE_MAIN_VARIANT (name);
+ delegate_target = name;
name = TYPE_NAME (name);
}
else if (TREE_CODE (name) == TYPE_DECL)
- basetype = TYPE_MAIN_VARIANT (TREE_TYPE (name));
+ {
+ basetype = TYPE_MAIN_VARIANT (TREE_TYPE (name));
+ delegate_target = TREE_TYPE (name);
+ }
We don't need a new variable, just use basetype. TYPE_MAIN_VARIANT
shouldn't affect the comparison to current_class_type.
+ error ("mem-initializer for %qD follows constructor delegation; "
+ "previous target constructor for %T must be sole initializer",
+ error ("target constructor for %T must be sole initializer; "
+ "constructor delegation follows mem-initializer for %qD",
I was thinking that my suggested wording would be the whole message, not
just part of it.
Jason
