2013-06-19  Richard Biener  <rguenther@suse.de>

	* expr.c (expand_expr_real_1): Use SCOPE_FILE_SCOPE_P to check
	for global context.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@200190 138bc75d-0d04-0410-961f-82ee72b054a4
gcc/testsuite
2013-06-19  Sebastian Huber  <sebastian.huber@embedded-brains.de>

        PR target/55033
        * gcc.target/powerpc/pr55033.c: Fix options.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@200191 138bc75d-0d04-0410-961f-82ee72b054a4
/cp
2013-06-19  Manuel Lopez-Ibanez  <manu@gcc.gnu.org>

	PR c++/57638
	* pt.c (unify, [TEMPLATE_PARM_INDEX]): Pass to unify_type_mismatch
	TREE_TYPE (arg), not arg itself.

/testsuite
2013-06-19  Manuel Lopez-Ibanez  <manu@gcc.gnu.org>

	PR c++/57638
	* g++.dg/template/error53.C: New.


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