OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR c++/79228 ('i' suffix for __complex__ extension interferes with C++14 UDLs for std::complex) 

PR c++/79228
	* expr.c (interpret_float_suffix): Avoid memcmp.
	(interpret_int_suffix): Likewise.  Don't check for if.

From-SVN: r255434
This commit is contained in:
Jakub Jelinek 2017-12-05 22:00:15 +01:00 committed by Jakub Jelinek
parent 186d43a78e
commit a7b1ce0405
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libcpp/ChangeLog
View File

@ -1,3 +1,9 @@
2017-12-05 Jakub Jelinek <jakub@redhat.com>
PR c++/79228
* expr.c (interpret_float_suffix): Avoid memcmp.
(interpret_int_suffix): Likewise. Don't check for if.
2017-12-01 Jason Merrill <jason@redhat.com>
PR c++/79228 - extensions hide C++14 complex literal operators

12
libcpp/expr.c
View File

@ -280,9 +280,10 @@ interpret_float_suffix (cpp_reader *pfile, const uchar *s, size_t len)
them as user-defined literals. */
if (CPP_OPTION (pfile, cplusplus)
&& CPP_OPTION (pfile, lang) > CLK_CXX11
&& (!memcmp (orig_s, "i", orig_len)
|| !memcmp (orig_s, "if", orig_len)
|| !memcmp (orig_s, "il", orig_len)))
&& orig_s[0] == 'i'
&& (orig_len == 1
|| (orig_len == 2
&& (orig_s[1] == 'f' || orig_s[1] == 'l'))))
return 0;
}
@ -345,9 +346,8 @@ interpret_int_suffix (cpp_reader *pfile, const uchar *s, size_t len)
them as user-defined literals. */
if (CPP_OPTION (pfile, cplusplus)
&& CPP_OPTION (pfile, lang) > CLK_CXX11
&& (!memcmp (s, "i", orig_len)
|| !memcmp (s, "if", orig_len)
|| !memcmp (s, "il", orig_len)))
&& s[0] == 'i'
&& (orig_len == 1 || (orig_len == 2 && s[1] == 'l')))
return 0;
}