/cp
2013-05-21  Paolo Carlini  <paolo.carlini@oracle.com>

	* call.c (build_conditional_expr_1): Add location_t parameter.
	(build_conditional_expr): Likewise.
	* typeck.c (rationalize_conditional_expr, cp_build_array_ref,
	get_member_function_from_ptrfunc, build_x_conditional_expr,
	cp_build_modify_expr): Update.
	* init.c (build_new_1): Likewise.
	* cp-tree.h: Update declaration.

/testsuite
2013-05-21  Paolo Carlini  <paolo.carlini@oracle.com>

	* g++.dg/cpp0x/explicit3.C: Add column in dg-error strings.
	* g++.dg/warn/Wdouble-promotion.C: Likewise.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@199166 138bc75d-0d04-0410-961f-82ee72b054a4
- Remove SVN merge marker.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@199167 138bc75d-0d04-0410-961f-82ee72b054a4