diff options
| author | Jason Merrill <jason@redhat.com> | 2012-11-14 20:53:48 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2012-11-14 20:53:48 -0500 |
| commit | e7cf6513659ea98692acb6611bc7ccca1246f760 (patch) | |
| tree | 0ab49fb4a5543a2b466848f21c7b080f5ffc7e21 /gcc/cp | |
| parent | d3061adb7fc27794f434d688e72669f45097ae82 (diff) | |
| download | gcc-e7cf6513659ea98692acb6611bc7ccca1246f760.zip gcc-e7cf6513659ea98692acb6611bc7ccca1246f760.tar.gz gcc-e7cf6513659ea98692acb6611bc7ccca1246f760.tar.bz2 | |
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
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index af55e29..dc510ab 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -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 diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 115c567..045e99b 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -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; |