git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

re PR libstdc++/44647 (std::nothrow and std::bad_alloc are coupled) 

2010-10-05  Sebastian Huber  <sebastian.huber@embedded-brains.de>
	    Jonathan Wakely  <jwakely.gcc@gmail.com>

	PR libstdc++/44647
	* libsupc++/Makefile.am (sources): Add bad_alloc.cc.
	* libsupc++/new_handler.cc (bad_alloc): Move to ...
	* libsupc++/bad_alloc.cc (bad_alloc): ... here, new file.
	* libsupc++/Makefile.in: Regenerate.

Co-Authored-By: Jonathan Wakely <jwakely.gcc@gmail.com>

From-SVN: r164973
This commit is contained in:
Sebastian Huber 2010-10-05 09:41:57 +00:00 committed by Paolo Carlini
parent 92817e8977
commit 79d34420f6
5 changed files with 55 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,12 @@
2010-10-05 Sebastian Huber <sebastian.huber@embedded-brains.de>
Jonathan Wakely <jwakely.gcc@gmail.com>
PR libstdc++/44647
* libsupc++/Makefile.am (sources): Add bad_alloc.cc.
* libsupc++/new_handler.cc (bad_alloc): Move to ...
* libsupc++/bad_alloc.cc (bad_alloc): ... here, new file.
* libsupc++/Makefile.in: Regenerate.
2010-10-04 Paolo Carlini <paolo.carlini@oracle.com> 2010-10-04 Paolo Carlini <paolo.carlini@oracle.com>
* include/std/functional (function<>::swap): Use std::swap. * include/std/functional (function<>::swap): Use std::swap.

4
libstdc++-v3/libsupc++/Makefile.am
View File

@ -1,6 +1,7 @@
## Makefile for the GNU C++ Support library. ## Makefile for the GNU C++ Support library.
## ##
## Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 ## Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
## 2009, 2010
## Free Software Foundation, Inc. ## Free Software Foundation, Inc.
## ##
## Process this file with automake to produce Makefile.in. ## Process this file with automake to produce Makefile.in.
@ -43,6 +44,7 @@ endif
sources = \ sources = \
array_type_info.cc \ array_type_info.cc \
atexit_arm.cc \ atexit_arm.cc \
bad_alloc.cc \
bad_cast.cc \ bad_cast.cc \
bad_typeid.cc \ bad_typeid.cc \
class_type_info.cc \ class_type_info.cc \

15
libstdc++-v3/libsupc++/Makefile.in
View File

@ -88,13 +88,13 @@ am__installdirs = "$(DESTDIR)$(toolexeclibdir)" \
"$(DESTDIR)$(glibcxxinstalldir)" "$(DESTDIR)$(glibcxxinstalldir)"
LTLIBRARIES = $(noinst_LTLIBRARIES) $(toolexeclib_LTLIBRARIES) LTLIBRARIES = $(noinst_LTLIBRARIES) $(toolexeclib_LTLIBRARIES)
libsupc___la_LIBADD = libsupc___la_LIBADD =
am__objects_1 = array_type_info.lo atexit_arm.lo bad_cast.lo \ am__objects_1 = array_type_info.lo atexit_arm.lo bad_alloc.lo \
bad_typeid.lo class_type_info.lo del_op.lo del_opnt.lo \ bad_cast.lo bad_typeid.lo class_type_info.lo del_op.lo \
del_opv.lo del_opvnt.lo dyncast.lo eh_alloc.lo eh_arm.lo \ del_opnt.lo del_opv.lo del_opvnt.lo dyncast.lo eh_alloc.lo \
eh_aux_runtime.lo eh_call.lo eh_catch.lo eh_exception.lo \ eh_arm.lo eh_aux_runtime.lo eh_call.lo eh_catch.lo \
eh_globals.lo eh_personality.lo eh_ptr.lo eh_term_handler.lo \ eh_exception.lo eh_globals.lo eh_personality.lo eh_ptr.lo \
eh_terminate.lo eh_throw.lo eh_type.lo eh_unex_handler.lo \ eh_term_handler.lo eh_terminate.lo eh_throw.lo eh_type.lo \
enum_type_info.lo function_type_info.lo \ eh_unex_handler.lo enum_type_info.lo function_type_info.lo \
fundamental_type_info.lo guard.lo hash_bytes.lo new_handler.lo \ fundamental_type_info.lo guard.lo hash_bytes.lo new_handler.lo \
new_op.lo new_opnt.lo new_opv.lo new_opvnt.lo \ new_op.lo new_opnt.lo new_opv.lo new_opvnt.lo \
pbase_type_info.lo pmem_type_info.lo pointer_type_info.lo \ pbase_type_info.lo pmem_type_info.lo pointer_type_info.lo \
@ -338,6 +338,7 @@ headers = \
sources = \ sources = \
array_type_info.cc \ array_type_info.cc \
atexit_arm.cc \ atexit_arm.cc \
bad_alloc.cc \
bad_cast.cc \ bad_cast.cc \
bad_typeid.cc \ bad_typeid.cc \
class_type_info.cc \ class_type_info.cc \

34
libstdc++-v3/libsupc++/bad_alloc.cc Normal file
View File

@ -0,0 +1,34 @@
// Implementation file for the -*- C++ -*- dynamic memory management header.
// Copyright (C) 2010 Free Software Foundation
//
// This file is part of GCC.
//
// GCC 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 3, or (at your option)
// any later version.
//
// GCC 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.
//
// Under Section 7 of GPL version 3, you are granted additional
// permissions described in the GCC Runtime Library Exception, version
// 3.1, as published by the Free Software Foundation.
// You should have received a copy of the GNU General Public License and
// a copy of the GCC Runtime Library Exception along with this program;
// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
// <http://www.gnu.org/licenses/>.
#include "new"
std::bad_alloc::~bad_alloc() throw() { }
const char*
std::bad_alloc::what() const throw()
{
return "std::bad_alloc";
}

10
libstdc++-v3/libsupc++/new_handler.cc
View File

@ -1,7 +1,7 @@
// Implementation file for the -*- C++ -*- dynamic memory management header. // Implementation file for the -*- C++ -*- dynamic memory management header.
// Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, // Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
// 2005, 2006, 2007, 2009 // 2005, 2006, 2007, 2008, 2009, 2010
// Free Software Foundation // Free Software Foundation
// //
// This file is part of GCC. // This file is part of GCC.
@ -39,11 +39,3 @@ std::set_new_handler (new_handler handler) throw()
__new_handler = handler; __new_handler = handler;
return prev_handler; return prev_handler;
} }
std::bad_alloc::~bad_alloc() throw() { }
const char*
std::bad_alloc::what() const throw()
{
return "std::bad_alloc";
}