On Thu, 3 Jan 2013, Tom Tromey wrote:

>>>>>> "Marc" == Marc Glisse <marc.glisse@inria.fr> writes:
>
> Marc> libcpp/
> Marc> 	* line-map.c (get_combined_adhoc_loc): Cast to extern "C" type.
>
> Yucky.

Yes, there is a discussion of what is necessary for a real fix (and an 
alternate hack) in the PR:
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50177

Do you prefer an other approach?

> Marc>  	  line_map_realloc reallocator
> Marc> -	      = set->reallocator ? set->reallocator : xrealloc;
> Marc> +	      = set->reallocator ? set->reallocator
> Marc> +				 : (line_map_realloc) xrealloc;
>
> The indentation is wrong here, and it needs extra parens, per the GNU
> coding standards.
>
> I think it should have a comment as well.

Like this? (I'll test if approved, but I am not sure what was wrong with 
the indentation and parentheses so it may be wrong again)

Reformatting the patch, I noticed that I only fixed one of the 3 
occurences, so here are all 3.

 	* line-map.c (get_combined_adhoc_loc): Cast from extern "C" type.
 	(new_linemap): Likewise.
 	(linemap_enter_macro): Likewise.

-- 
Marc Glisse