Fix cut and paste error in last change
[official-gcc.git] / gcc / cp / new1.cc
blob8d76f414356f0e70e912545396490abaea7425d6
1 // Support routines for the -*- C++ -*- dynamic memory management.
2 // Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation
4 // This file is part of GNU CC.
6 // GNU CC is free software; you can redistribute it and/or modify
7 // it under the terms of the GNU General Public License as published by
8 // the Free Software Foundation; either version 2, or (at your option)
9 // any later version.
11 // GNU CC is distributed in the hope that it will be useful,
12 // but WITHOUT ANY WARRANTY; without even the implied warranty of
13 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 // GNU General Public License for more details.
16 // You should have received a copy of the GNU General Public License
17 // along with GNU CC; see the file COPYING. If not, write to
18 // the Free Software Foundation, 59 Temple Place - Suite 330,
19 // Boston, MA 02111-1307, USA.
21 // As a special exception, you may use this file as part of a free software
22 // library without restriction. Specifically, if other files instantiate
23 // templates or use macros or inline functions from this file, or you compile
24 // this file and link it with other files to produce an executable, this
25 // file does not by itself cause the resulting executable to be covered by
26 // the GNU General Public License. This exception does not however
27 // invalidate any other reasons why the executable file might be covered by
28 // the GNU General Public License.
30 #include "new"
31 using std::new_handler;
32 using std::bad_alloc;
34 extern "C" void *malloc (size_t);
35 extern new_handler __new_handler;
37 #define WEAK(x) \
38 x __attribute__ ((weak)); \
41 #ifdef L_op_newnt
42 WEAK (void * operator new (size_t sz, const std::nothrow_t&) throw())
44 void *p;
46 /* malloc (0) is unpredictable; avoid it. */
47 if (sz == 0)
48 sz = 1;
49 p = (void *) malloc (sz);
50 while (p == 0)
52 new_handler handler = __new_handler;
53 if (! handler)
54 return 0;
55 try
57 handler ();
59 catch (bad_alloc &)
61 return 0;
64 p = (void *) malloc (sz);
67 return p;
69 #endif
71 #ifdef L_op_new
72 WEAK (void * operator new (size_t sz) throw (std::bad_alloc))
74 void *p;
76 /* malloc (0) is unpredictable; avoid it. */
77 if (sz == 0)
78 sz = 1;
79 p = (void *) malloc (sz);
80 while (p == 0)
82 new_handler handler = __new_handler;
83 if (! handler)
84 throw bad_alloc ();
85 handler ();
86 p = (void *) malloc (sz);
89 return p;
91 #endif