re PR c++/37276 (Trouble with some (C99?) math builtins and namespace std)
PR c++/37276 * decl.c (decls_match): Remove #ifdef around earlier fix. From-SVN: r193526
This commit is contained in:
parent
d3061adb7f
commit
e7cf651365
2 changed files with 5 additions and 2 deletions
|
@ -1,3 +1,8 @@
|
|||
2012-11-14 Jason Merrill <jason@redhat.com>
|
||||
|
||||
PR c++/37276
|
||||
* decl.c (decls_match): Remove #ifdef around earlier fix.
|
||||
|
||||
2012-11-13 Jason Merrill <jason@redhat.com>
|
||||
|
||||
* class.c (finish_struct_1): Check virtual functions
|
||||
|
|
|
@ -1017,13 +1017,11 @@ decls_match (tree newdecl, tree olddecl)
|
|||
&& DECL_EXTERN_C_P (olddecl)))
|
||||
return 0;
|
||||
|
||||
#ifdef NO_IMPLICIT_EXTERN_C
|
||||
/* A new declaration doesn't match a built-in one unless it
|
||||
is also extern "C". */
|
||||
if (DECL_IS_BUILTIN (olddecl)
|
||||
&& DECL_EXTERN_C_P (olddecl) && !DECL_EXTERN_C_P (newdecl))
|
||||
return 0;
|
||||
#endif
|
||||
|
||||
if (TREE_CODE (f1) != TREE_CODE (f2))
|
||||
return 0;
|
||||
|
|
Loading…
Add table
Reference in a new issue