From 4ba851b58beb3102b31fb4282fdea684dfa6865a Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Tue, 6 Mar 2007 17:43:27 +0000 Subject: [PATCH] PR libstdc++/28080 (partial) 2007-03-06 Paolo Carlini PR libstdc++/28080 (partial) * include/bits/stl_algobase.h: Do not include . * src/localename.cc: Do it here. * src/ctype.cc: Likewise. * include/ext/pb_ds/detail/map_debug_base.hpp: Likewise. * include/ext/pb_ds/exception.hpp: Likewise. * include/ext/pb_ds/list_update_policy.hpp: Likewise. * include/bits/stl_algo.h: Likewise. * include/tr1/random: Likewise. * testsuite/util/testsuite_hooks.cc: Likewise. * testsuite/util/testsuite_abi_check.cc: Likewise. * testsuite/util/testsuite_abi.cc: Likewise. * testsuite/util/performance/assoc/timing/ tree_order_statistics_test.hpp: Likewise. * config/locale/darwin/ctype_members.cc: Likewise. * config/locale/gnu/c++locale_internal.h: Likewise. * config/locale/generic/ctype_members.cc: Likewise. * config/locale/generic/time_members.cc: Likewise. * include/ext/pb_ds/detail/resize_policy/ hash_load_check_resize_trigger_imp.hpp: Qualify abort. * testsuite/util/performance/assoc/timing/ multimap_find_test.hpp: Likewise. * include/std/valarray: Do include . * include/tr1/hashtable: Likewise. From-SVN: r122628 --- libstdc++-v3/ChangeLog | 28 +++++++++++++++++++ .../config/locale/darwin/ctype_members.cc | 1 + .../config/locale/generic/ctype_members.cc | 1 + .../config/locale/generic/time_members.cc | 4 ++- .../config/locale/gnu/c++locale_internal.h | 4 ++- libstdc++-v3/include/bits/stl_algo.h | 3 +- libstdc++-v3/include/bits/stl_algobase.h | 1 - .../ext/pb_ds/detail/map_debug_base.hpp | 15 +++++----- .../hash_load_check_resize_trigger_imp.hpp | 2 +- libstdc++-v3/include/ext/pb_ds/exception.hpp | 3 +- .../include/ext/pb_ds/list_update_policy.hpp | 3 +- libstdc++-v3/include/std/valarray | 1 - libstdc++-v3/include/tr1/hashtable | 1 - libstdc++-v3/include/tr1/random | 1 + libstdc++-v3/src/ctype.cc | 3 +- libstdc++-v3/src/localename.cc | 4 ++- .../assoc/timing/multimap_find_test.hpp | 6 ++-- .../timing/tree_order_statistics_test.hpp | 5 ++-- libstdc++-v3/testsuite/util/testsuite_abi.cc | 1 + .../testsuite/util/testsuite_abi_check.cc | 3 +- .../testsuite/util/testsuite_hooks.cc | 1 + 21 files changed, 67 insertions(+), 24 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 5e0a87f42f9..c4b2fb0a2f8 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,31 @@ +2007-03-06 Paolo Carlini + + PR libstdc++/28080 (partial) + * include/bits/stl_algobase.h: Do not include . + * src/localename.cc: Do it here. + * src/ctype.cc: Likewise. + * include/ext/pb_ds/detail/map_debug_base.hpp: Likewise. + * include/ext/pb_ds/exception.hpp: Likewise. + * include/ext/pb_ds/list_update_policy.hpp: Likewise. + * include/bits/stl_algo.h: Likewise. + * include/tr1/random: Likewise. + * testsuite/util/testsuite_hooks.cc: Likewise. + * testsuite/util/testsuite_abi_check.cc: Likewise. + * testsuite/util/testsuite_abi.cc: Likewise. + * testsuite/util/performance/assoc/timing/ + tree_order_statistics_test.hpp: Likewise. + * config/locale/darwin/ctype_members.cc: Likewise. + * config/locale/gnu/c++locale_internal.h: Likewise. + * config/locale/generic/ctype_members.cc: Likewise. + * config/locale/generic/time_members.cc: Likewise. + + * include/ext/pb_ds/detail/resize_policy/ + hash_load_check_resize_trigger_imp.hpp: Qualify abort. + * testsuite/util/performance/assoc/timing/ + multimap_find_test.hpp: Likewise. + * include/std/valarray: Do include . + * include/tr1/hashtable: Likewise. + 2007-03-05 Joseph Myers PR libstdc++/30675 diff --git a/libstdc++-v3/config/locale/darwin/ctype_members.cc b/libstdc++-v3/config/locale/darwin/ctype_members.cc index 813ec7979db..b50bd35d67e 100644 --- a/libstdc++-v3/config/locale/darwin/ctype_members.cc +++ b/libstdc++-v3/config/locale/darwin/ctype_members.cc @@ -36,6 +36,7 @@ #include #include +#include namespace std { diff --git a/libstdc++-v3/config/locale/generic/ctype_members.cc b/libstdc++-v3/config/locale/generic/ctype_members.cc index 0520c223874..3c7209d65fb 100644 --- a/libstdc++-v3/config/locale/generic/ctype_members.cc +++ b/libstdc++-v3/config/locale/generic/ctype_members.cc @@ -35,6 +35,7 @@ // Written by Benjamin Kosnik #include +#include _GLIBCXX_BEGIN_NAMESPACE(std) diff --git a/libstdc++-v3/config/locale/generic/time_members.cc b/libstdc++-v3/config/locale/generic/time_members.cc index dbb12ae6848..b8ebb746b1b 100644 --- a/libstdc++-v3/config/locale/generic/time_members.cc +++ b/libstdc++-v3/config/locale/generic/time_members.cc @@ -1,6 +1,7 @@ // std::time_get, std::time_put implementation, generic version -*- C++ -*- -// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +// Copyright (C) 2001, 2002, 2003, 2004, 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 @@ -35,6 +36,7 @@ // Written by Benjamin Kosnik #include +#include _GLIBCXX_BEGIN_NAMESPACE(std) diff --git a/libstdc++-v3/config/locale/gnu/c++locale_internal.h b/libstdc++-v3/config/locale/gnu/c++locale_internal.h index 0d6e9c2d445..6f9b5351033 100644 --- a/libstdc++-v3/config/locale/gnu/c++locale_internal.h +++ b/libstdc++-v3/config/locale/gnu/c++locale_internal.h @@ -1,6 +1,7 @@ // Prototypes for GLIBC thread locale __-prefixed functions -*- C++ -*- -// Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc. +// Copyright (C) 2002, 2003, 2004, 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 @@ -36,6 +37,7 @@ #include #include +#include #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) diff --git a/libstdc++-v3/include/bits/stl_algo.h b/libstdc++-v3/include/bits/stl_algo.h index 75a89b78ae6..9e060b54e48 100644 --- a/libstdc++-v3/include/bits/stl_algo.h +++ b/libstdc++-v3/include/bits/stl_algo.h @@ -1,6 +1,6 @@ // Algorithm implementation -*- C++ -*- -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -64,6 +64,7 @@ #include #include // for _Temporary_buffer +#include // for rand #include // See concept_check.h for the __glibcxx_*_requires macros. diff --git a/libstdc++-v3/include/bits/stl_algobase.h b/libstdc++-v3/include/bits/stl_algobase.h index a6d155a95a4..5e63feb0052 100644 --- a/libstdc++-v3/include/bits/stl_algobase.h +++ b/libstdc++-v3/include/bits/stl_algobase.h @@ -65,7 +65,6 @@ #include #include #include -#include #include #include #include diff --git a/libstdc++-v3/include/ext/pb_ds/detail/map_debug_base.hpp b/libstdc++-v3/include/ext/pb_ds/detail/map_debug_base.hpp index d31a0c2699c..95c164ace00 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/map_debug_base.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/map_debug_base.hpp @@ -1,6 +1,6 @@ // -*- 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 terms @@ -51,6 +51,7 @@ #include #include +#include #include #include @@ -157,7 +158,7 @@ namespace pb_ds if (find(r_key) != m_key_set.end()) { std::cerr << "insert_new " << r_key << std::endl; - abort(); + std::abort(); } try @@ -167,7 +168,7 @@ namespace pb_ds catch(...) { std::cerr << "insert_new 1" << r_key << std::endl; - abort(); + std::abort(); } alloc.set_throw_prob(orig_throw_prob); _GLIBCXX_DEBUG_ONLY(assert_valid();) @@ -183,7 +184,7 @@ namespace pb_ds if (it == m_key_set.end()) { std::cerr << "erase_existing " << r_key << std::endl; - abort(); + std::abort(); } m_key_set.erase(it); _GLIBCXX_DEBUG_ONLY(assert_valid();) @@ -208,7 +209,7 @@ namespace pb_ds if (find(r_key) == m_key_set.end()) { std::cerr << "check_key_exists " << r_key << std::endl; - abort(); + std::abort(); } _GLIBCXX_DEBUG_ONLY(assert_valid();) } @@ -222,7 +223,7 @@ namespace pb_ds if (find(r_key) != m_key_set.end()) { std::cerr << "check_key_does_not_exist " << r_key << std::endl; - abort(); + std::abort(); } } @@ -237,7 +238,7 @@ namespace pb_ds { std::cerr << "check_size " << size << " " << key_set_size << std::endl; - abort(); + std::abort(); } _GLIBCXX_DEBUG_ONLY(assert_valid();) } diff --git a/libstdc++-v3/include/ext/pb_ds/detail/resize_policy/hash_load_check_resize_trigger_imp.hpp b/libstdc++-v3/include/ext/pb_ds/detail/resize_policy/hash_load_check_resize_trigger_imp.hpp index 1bae0192577..aa29e07e154 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/resize_policy/hash_load_check_resize_trigger_imp.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/resize_policy/hash_load_check_resize_trigger_imp.hpp @@ -280,7 +280,7 @@ PB_DS_CLASS_T_DEC void PB_DS_CLASS_C_DEC:: do_resize(size_type) -{ abort(); } +{ std::abort(); } #ifdef _GLIBCXX_DEBUG PB_DS_CLASS_T_DEC diff --git a/libstdc++-v3/include/ext/pb_ds/exception.hpp b/libstdc++-v3/include/ext/pb_ds/exception.hpp index 896ff391810..379623d2d54 100644 --- a/libstdc++-v3/include/ext/pb_ds/exception.hpp +++ b/libstdc++-v3/include/ext/pb_ds/exception.hpp @@ -1,6 +1,6 @@ // -*- 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 terms @@ -48,6 +48,7 @@ #define PB_DS_EXCEPTION_HPP #include +#include namespace pb_ds { diff --git a/libstdc++-v3/include/ext/pb_ds/list_update_policy.hpp b/libstdc++-v3/include/ext/pb_ds/list_update_policy.hpp index cfe2a2c375e..876ea3e2f38 100644 --- a/libstdc++-v3/include/ext/pb_ds/list_update_policy.hpp +++ b/libstdc++-v3/include/ext/pb_ds/list_update_policy.hpp @@ -1,6 +1,6 @@ // -*- 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 terms @@ -47,6 +47,7 @@ #ifndef PB_DS_LU_POLICY_HPP #define PB_DS_LU_POLICY_HPP +#include #include namespace pb_ds diff --git a/libstdc++-v3/include/std/valarray b/libstdc++-v3/include/std/valarray index b23c867a567..4898c152e83 100644 --- a/libstdc++-v3/include/std/valarray +++ b/libstdc++-v3/include/std/valarray @@ -43,7 +43,6 @@ #include #include #include -#include #include #include diff --git a/libstdc++-v3/include/tr1/hashtable b/libstdc++-v3/include/tr1/hashtable index d6115dd3a6d..cc53c4cf154 100644 --- a/libstdc++-v3/include/tr1/hashtable +++ b/libstdc++-v3/include/tr1/hashtable @@ -56,7 +56,6 @@ #include #include #include -#include #include #include #include // For true_type and false_type diff --git a/libstdc++-v3/include/tr1/random b/libstdc++-v3/include/tr1/random index bfdd90157d2..907a1000fd3 100644 --- a/libstdc++-v3/include/tr1/random +++ b/libstdc++-v3/include/tr1/random @@ -37,6 +37,7 @@ #include #include +#include #include #include #include diff --git a/libstdc++-v3/src/ctype.cc b/libstdc++-v3/src/ctype.cc index 71bf1e1116a..4a2e896f7bb 100644 --- a/libstdc++-v3/src/ctype.cc +++ b/libstdc++-v3/src/ctype.cc @@ -28,6 +28,7 @@ // the GNU General Public License. #include +#include _GLIBCXX_BEGIN_NAMESPACE(std) @@ -74,7 +75,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) // XXX At some point, just rename this file to ctype_configure_char.cc // and compile it as a separate file instead of including it here. // Platform-specific initialization code for ctype tables. - #include +#include const size_t ctype::table_size; diff --git a/libstdc++-v3/src/localename.cc b/libstdc++-v3/src/localename.cc index ff8c369ce11..5394d9a99c6 100644 --- a/libstdc++-v3/src/localename.cc +++ b/libstdc++-v3/src/localename.cc @@ -1,4 +1,5 @@ -// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 +// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, +// 2006, 2007 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -28,6 +29,7 @@ #include #include +#include #include _GLIBCXX_BEGIN_NAMESPACE(std) diff --git a/libstdc++-v3/testsuite/util/performance/assoc/timing/multimap_find_test.hpp b/libstdc++-v3/testsuite/util/performance/assoc/timing/multimap_find_test.hpp index 5f64ebb7deb..019a32d2a23 100644 --- a/libstdc++-v3/testsuite/util/performance/assoc/timing/multimap_find_test.hpp +++ b/libstdc++-v3/testsuite/util/performance/assoc/timing/multimap_find_test.hpp @@ -1,6 +1,6 @@ // -*- 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 terms @@ -84,7 +84,7 @@ namespace pb_ds } if (not_found_count != 0) - abort(); + std::abort(); } private: @@ -116,7 +116,7 @@ namespace pb_ds } if (not_found_count != 0) - abort(); + std::abort(); } private: diff --git a/libstdc++-v3/testsuite/util/performance/assoc/timing/tree_order_statistics_test.hpp b/libstdc++-v3/testsuite/util/performance/assoc/timing/tree_order_statistics_test.hpp index b1e88f719e0..fb9b2c043db 100644 --- a/libstdc++-v3/testsuite/util/performance/assoc/timing/tree_order_statistics_test.hpp +++ b/libstdc++-v3/testsuite/util/performance/assoc/timing/tree_order_statistics_test.hpp @@ -52,6 +52,7 @@ #include #include #include +#include namespace pb_ds { @@ -84,7 +85,7 @@ namespace pb_ds const size_t max_size = m_r_container.size(); while (it != e) if (m_r_container.order_of_key(*(it++)) > max_size) - abort(); + std::abort(); } } @@ -113,7 +114,7 @@ namespace pb_ds { const_iterator f_it = m_r_container.find(*(it++)); if (static_cast(std::distance(b, f_it)) > max_size) - abort(); + std::abort(); } } } diff --git a/libstdc++-v3/testsuite/util/testsuite_abi.cc b/libstdc++-v3/testsuite/util/testsuite_abi.cc index 0949e309657..ffd88c41d76 100644 --- a/libstdc++-v3/testsuite/util/testsuite_abi.cc +++ b/libstdc++-v3/testsuite/util/testsuite_abi.cc @@ -33,6 +33,7 @@ #include #include #include +#include using namespace std; diff --git a/libstdc++-v3/testsuite/util/testsuite_abi_check.cc b/libstdc++-v3/testsuite/util/testsuite_abi_check.cc index 12e882a436f..86982b7f9cd 100644 --- a/libstdc++-v3/testsuite/util/testsuite_abi_check.cc +++ b/libstdc++-v3/testsuite/util/testsuite_abi_check.cc @@ -1,6 +1,6 @@ // -*- C++ -*- -// Copyright (C) 2004 Free Software Foundation, Inc. +// Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc. // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License as @@ -33,6 +33,7 @@ #include "testsuite_abi.h" #include +#include #include // for access(2) int diff --git a/libstdc++-v3/testsuite/util/testsuite_hooks.cc b/libstdc++-v3/testsuite/util/testsuite_hooks.cc index 50347f82dd8..6ea82f3d908 100644 --- a/libstdc++-v3/testsuite/util/testsuite_hooks.cc +++ b/libstdc++-v3/testsuite/util/testsuite_hooks.cc @@ -43,6 +43,7 @@ #include #include #include +#include #include #include