From 64f1326a88d6a4e4286f5e454e706cbc5c585881 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Fri, 14 Jan 2000 23:42:10 +0000 Subject: [PATCH] method.c (build_decl_overload_real): Check whether we are in :: before returning __builtin_new/delete. * method.c (build_decl_overload_real): Check whether we are in :: before returning __builtin_new/delete. From-SVN: r31431 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/method.c | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 240aa069b09..619d94c5c83 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2000-01-14 Martin v. Löwis + + * method.c (build_decl_overload_real): Check whether we are in :: + before returning __builtin_new/delete. + 2000-01-13 Mark Mitchell * pt.c (tsubst_friend_function): Improve comment. diff --git a/gcc/cp/method.c b/gcc/cp/method.c index 12d96168001..ba8d5941130 100644 --- a/gcc/cp/method.c +++ b/gcc/cp/method.c @@ -1,6 +1,6 @@ /* Handle the hair of processing (but not expanding) inline functions. Also manage function and variable name overloading. - Copyright (C) 1987, 89, 92-97, 1998, 1999 Free Software Foundation, Inc. + Copyright (C) 1987, 89, 92-99, 2000 Free Software Foundation, Inc. Contributed by Michael Tiemann (tiemann@cygnus.com) This file is part of GNU CC. @@ -1579,7 +1579,8 @@ build_decl_overload_real (dname, parms, ret_type, tparms, targs, const char *name = IDENTIFIER_POINTER (dname); /* member operators new and delete look like methods at this point. */ - if (! for_method && parms != NULL_TREE && TREE_CODE (parms) == TREE_LIST + if (! for_method && current_namespace == global_namespace + && parms != NULL_TREE && TREE_CODE (parms) == TREE_LIST && TREE_CHAIN (parms) == void_list_node) { if (dname == ansi_opname[(int) DELETE_EXPR]) -- 2.30.2