diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 9 | ||||
| -rw-r--r-- | libstdc++-v3/include/debug/debug.h | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/ext/concurrence.h | 7 | ||||
| -rw-r--r-- | libstdc++-v3/include/tr1/boost_shared_ptr.h | 4 | ||||
| -rw-r--r-- | libstdc++-v3/include/tr1/functional | 3 | ||||
| -rw-r--r-- | libstdc++-v3/include/tr1/memory | 1 |
6 files changed, 17 insertions, 12 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 045fa34c1de..6f932810e15 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,14 @@ 2007-04-22 Paolo Carlini <pcarlini@suse.de> + * include/ext/concurrence.h: Do not include <cstdlib>, use + __builtin_abort. + * include/debug/debug.h: Likewise. + * include/tr1/memory: Likewise. + * include/tr1/boost_shared_ptr.h: Likewise. + * include/tr1/functional: Likewise. + +2007-04-22 Paolo Carlini <pcarlini@suse.de> + * include/bits/locale_facets.tcc: Do not include <typeinfo>. * testsuite/27_io/basic_ios/imbue/14072.cc: Do it here. * testsuite/27_io/basic_ios/cons/char/3.cc: Likewise. diff --git a/libstdc++-v3/include/debug/debug.h b/libstdc++-v3/include/debug/debug.h index b914a2cca4d..95aa3d5b95e 100644 --- a/libstdc++-v3/include/debug/debug.h +++ b/libstdc++-v3/include/debug/debug.h @@ -1,6 +1,6 @@ // Debugging support implementation -*- C++ -*- -// Copyright (C) 2003, 2005, 2006 +// Copyright (C) 2003, 2004, 2005, 2006, 2007 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -80,7 +80,6 @@ namespace __gnu_debug #else -# include <cstdlib> # include <cstdio> # include <debug/macros.h> @@ -96,7 +95,7 @@ namespace std { printf("%s:%d: %s: Assertion '%s' failed.\n", __file, __line, __function, __condition); - abort(); + __builtin_abort(); } } // namespace __debug } // namespace std diff --git a/libstdc++-v3/include/ext/concurrence.h b/libstdc++-v3/include/ext/concurrence.h index 56e07de91e0..6efb2a6be08 100644 --- a/libstdc++-v3/include/ext/concurrence.h +++ b/libstdc++-v3/include/ext/concurrence.h @@ -1,6 +1,6 @@ // Support for concurrent programing -*- C++ -*- -// Copyright (C) 2003, 2004, 2005, 2006 +// Copyright (C) 2003, 2004, 2005, 2006, 2007 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -36,7 +36,6 @@ #ifndef _CONCURRENCE_H #define _CONCURRENCE_H 1 -#include <cstdlib> #include <exception> #include <bits/gthr.h> #include <bits/functexcept.h> @@ -90,7 +89,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) #if __EXCEPTIONS throw __concurrence_lock_error(); #else - std::abort(); + __builtin_abort(); #endif } @@ -100,7 +99,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) #if __EXCEPTIONS throw __concurrence_unlock_error(); #else - std::abort(); + __builtin_abort(); #endif } diff --git a/libstdc++-v3/include/tr1/boost_shared_ptr.h b/libstdc++-v3/include/tr1/boost_shared_ptr.h index 524a98ccc04..d90e6ff8171 100644 --- a/libstdc++-v3/include/tr1/boost_shared_ptr.h +++ b/libstdc++-v3/include/tr1/boost_shared_ptr.h @@ -1,6 +1,6 @@ // <tr1/boost_shared_ptr.h> -*- C++ -*- -// Copyright (C) 2005, 2006 Free Software Foundation, Inc. +// Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -73,7 +73,7 @@ _GLIBCXX_BEGIN_NAMESPACE(_GLIBCXX_TR1) #if __EXCEPTIONS throw bad_weak_ptr(); #else - std::abort(); + __builtin_abort(); #endif } diff --git a/libstdc++-v3/include/tr1/functional b/libstdc++-v3/include/tr1/functional index 7b269fa06cf..e292260c5db 100644 --- a/libstdc++-v3/include/tr1/functional +++ b/libstdc++-v3/include/tr1/functional @@ -36,7 +36,6 @@ #pragma GCC system_header -#include <cstdlib> // for std::abort #include <cmath> // for std::frexp #include <string> // for std::tr1::hash #include <functional> @@ -2183,7 +2182,7 @@ _GLIBCXX_BEGIN_NAMESPACE(_GLIBCXX_TR1) #if __EXCEPTIONS throw bad_function_call(); #else - std::abort(); + __builtin_abort(); #endif } return _M_invoker(_M_functor, __args...); diff --git a/libstdc++-v3/include/tr1/memory b/libstdc++-v3/include/tr1/memory index 7413410bc27..f397c980d49 100644 --- a/libstdc++-v3/include/tr1/memory +++ b/libstdc++-v3/include/tr1/memory @@ -36,7 +36,6 @@ #define _TR1_MEMORY 1 #include <cstddef> // std::size_t -#include <cstdlib> // std::abort #include <exception> // std::exception #include <new> // std::bad_alloc #include <typeinfo> // std::type_info in get_deleter |