PR preprocessor/57757
	* lex.c (cpp_avoid_paste): Avoid pasting CPP_{,W,UTF8}STRING
	or CPP_STRING{16,32} with CPP_NAME or SPELL_LITERAL token that
	starts if a-zA-Z_.

	* g++.dg/cpp/paste1.C: New test.
	* g++.dg/cpp/paste2.C: New test.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@200875 138bc75d-0d04-0410-961f-82ee72b054a4
/c-family
2013-07-10  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/57869
	* c.opt: Add Wconditionally-supported.

/cp
2013-07-10  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/57869
	* typeck.c (build_reinterpret_cast_1): With -Wconditionally-supported
	warn about casting between pointer-to-function and pointer-to-object.

/gcc
2013-07-10  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/57869
	* doc/invoke.texi: Document -Wconditionally-supported.

/testsuite
2013-07-10  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/57869
	* g++.dg/cpp0x/reinterpret_cast1.C: New.
	* g++.dg/warn/Wconditionally-supported-1.C: Likewise.
	* g++.dg/conversion/dr195.C: Update.
	* g++.dg/expr/cast2.C: Likewise.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@200876 138bc75d-0d04-0410-961f-82ee72b054a4
	* c-ppoutput.c (scan_translation_unit): Call account_for_newlines
	for all CPP_TOKEN_FLD_STR tokens, not just CPP_COMMENT.

	* include/cpplib.h (cpp_token_val_index): Change parameter type to
	const cpp_token *.
	* lex.c (cpp_token_val_index): Likewise.

	* c-c++-common/raw-string-18.c: New test.
	* c-c++-common/raw-string-19.c: New test.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@200878 138bc75d-0d04-0410-961f-82ee72b054a4
	PR preprocessor/57824
	* lex.c (lex_raw_string): Allow reading new-lines if
	in_deferred_pragma or if parsing_args and there is still
	data in the current buffer.

	* c-c++-common/raw-string-17.c: New test.
	* c-c++-common/gomp/pr57824.c: New test.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@200879 138bc75d-0d04-0410-961f-82ee72b054a4
2013-07-10  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/57874
	* g++.dg/cpp0x/sfinae48.C: New.


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

	* Corrected missinge blank line in gcc/ChangeLog Entries
	and move one entry to c-family/ChangeLog



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