322821b9ad
2001-10-23 Benjamin Kosnik <bkoz@redhat.com> Make -fno-exceptions work. * config/locale/c_locale_gnu.cc: Use functexcept. * include/bits/c++config (__stl_assert): Remove. (__STL_USE_EXCEPTIONS): Same. (__STL_TRY): Same. (__STL_CATCH_ALL): Same. (__STL_THROW): Same. (__STL_RETHROW): Same. (__STL_NOTHROW): Same. (__STL_UNWIND): Same. * include/bits/pthread_allocimpl.h: Fix. * include/bits/std_bitset.h: Same. * include/bits/std_list.h: Same. * include/bits/std_memory.h: Same. * include/bits/std_queue.h: Same. * include/bits/stl_alloc.h: Same. * include/bits/stl_deque.h: Same. * include/bits/stl_list.h: Same. * include/bits/stl_queue.h: Same. * include/bits/stl_tempbuf.h: Same. * include/bits/stl_tree.h: Same. * include/bits/stl_uninitialized.h: Same. * include/bits/stl_vector.h: Same. * include/ext/ropeimpl.h: Same. * include/ext/slist: Same. * include/ext/stl_hashtable.h: Same. * include/ext/stl_rope.h: Same. * libsupc++/new_op.cc: Include cstdlib. * libsupc++/eh_personality.cc: Add exception_defines include. Use __throw_exception_again, tweak. * libsupc++/eh_aux_runtime.cc: Include stdlib for abort. * libsupc++/vec.cc: Tweak. * src/functexcept.cc: Remove unused arguments. * testsuite/23_containers/bitset_members.cc: Tweak. From-SVN: r46455
64 lines
2.0 KiB
C++
64 lines
2.0 KiB
C++
// Support routines for the -*- C++ -*- dynamic memory management.
|
|
// Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation
|
|
//
|
|
// This file is part of GNU CC.
|
|
//
|
|
// GNU CC is free software; you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation; either version 2, or (at your option)
|
|
// any later version.
|
|
//
|
|
// GNU CC is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with GNU CC; see the file COPYING. If not, write to
|
|
// the Free Software Foundation, 59 Temple Place - Suite 330,
|
|
// Boston, MA 02111-1307, USA.
|
|
//
|
|
// As a special exception, you may use this file as part of a free software
|
|
// library without restriction. Specifically, if other files instantiate
|
|
// templates or use macros or inline functions from this file, or you compile
|
|
// this file and link it with other files to produce an executable, this
|
|
// file does not by itself cause the resulting executable to be covered by
|
|
// the GNU General Public License. This exception does not however
|
|
// invalidate any other reasons why the executable file might be covered by
|
|
// the GNU General Public License.
|
|
|
|
#include "new"
|
|
#include <cstdlib>
|
|
#include <exception_defines.h>
|
|
|
|
using std::new_handler;
|
|
using std::bad_alloc;
|
|
|
|
extern "C" void *malloc (std::size_t);
|
|
extern new_handler __new_handler;
|
|
|
|
void *
|
|
operator new (std::size_t sz) throw (std::bad_alloc)
|
|
{
|
|
void *p;
|
|
|
|
/* malloc (0) is unpredictable; avoid it. */
|
|
if (sz == 0)
|
|
sz = 1;
|
|
p = (void *) malloc (sz);
|
|
while (p == 0)
|
|
{
|
|
new_handler handler = __new_handler;
|
|
if (! handler)
|
|
#ifdef __EXCEPTIONS
|
|
throw bad_alloc();
|
|
#else
|
|
std::abort();
|
|
#endif
|
|
handler ();
|
|
p = (void *) malloc (sz);
|
|
}
|
|
|
|
return p;
|
|
}
|