diff options
Diffstat (limited to 'libstdc++-v3/include')
56 files changed, 252 insertions, 70 deletions
diff --git a/libstdc++-v3/include/bits/codecvt.h b/libstdc++-v3/include/bits/codecvt.h index 86602b219eb..7778773a3b1 100644 --- a/libstdc++-v3/include/bits/codecvt.h +++ b/libstdc++-v3/include/bits/codecvt.h @@ -44,6 +44,8 @@ #pragma GCC system_header +_GLIBCXX_BEGIN_NAMESPACE(std) + /// @brief Empty base class for codecvt facet [22.2.1.5]. class codecvt_base { @@ -467,4 +469,6 @@ ~codecvt_byname() { } }; +_GLIBCXX_END_NAMESPACE + #endif // _CODECVT_H diff --git a/libstdc++-v3/include/bits/cpp_type_traits.h b/libstdc++-v3/include/bits/cpp_type_traits.h index 3132334578e..8e436dd682b 100644 --- a/libstdc++-v3/include/bits/cpp_type_traits.h +++ b/libstdc++-v3/include/bits/cpp_type_traits.h @@ -78,9 +78,6 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) _GLIBCXX_END_NAMESPACE -struct __true_type { }; -struct __false_type { }; - _GLIBCXX_BEGIN_NAMESPACE(std) namespace __detail @@ -96,6 +93,10 @@ namespace __detail __two& __test_type(...); } // namespace __detail + + struct __true_type { }; + struct __false_type { }; + template<bool> struct __truth_type { typedef __false_type __type; }; diff --git a/libstdc++-v3/include/bits/locale_facets.h b/libstdc++-v3/include/bits/locale_facets.h index 5069a9a813b..aad0b70dd71 100644 --- a/libstdc++-v3/include/bits/locale_facets.h +++ b/libstdc++-v3/include/bits/locale_facets.h @@ -44,6 +44,7 @@ #include <ctime> // For struct tm #include <cwctype> // For wctype_t +#include <bits/ctype_base.h> #include <iosfwd> #include <bits/ios_base.h> // For ios_base, ios_base::iostate #include <streambuf> @@ -130,7 +131,6 @@ _GLIBCXX_BEGIN_NAMESPACE(std) // 22.2.1.1 Template class ctype // Include host and configuration specific ctype enums for ctype_base. - #include <bits/ctype_base.h> // Common base for ctype<_CharT>. /** @@ -1530,8 +1530,12 @@ _GLIBCXX_BEGIN_NAMESPACE(std) template<> ctype_byname<wchar_t>::ctype_byname(const char*, size_t refs); - // 22.2.1.5 Template class codecvt - #include <bits/codecvt.h> +_GLIBCXX_END_NAMESPACE + +// 22.2.1.5 Template class codecvt +#include <bits/codecvt.h> + +_GLIBCXX_BEGIN_NAMESPACE(std) // 22.2.2 The numeric category. class __num_base diff --git a/libstdc++-v3/include/debug/bitset b/libstdc++-v3/include/debug/bitset index 598345b6f90..58d4e6b82d9 100644 --- a/libstdc++-v3/include/debug/bitset +++ b/libstdc++-v3/include/debug/bitset @@ -28,6 +28,10 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. +/** @file debug/bitset + * This file is a GNU debug extension to the Standard C++ Library. + */ + #ifndef _GLIBCXX_DEBUG_BITSET #define _GLIBCXX_DEBUG_BITSET diff --git a/libstdc++-v3/include/debug/debug.h b/libstdc++-v3/include/debug/debug.h index 72aefd7a64a..b914a2cca4d 100644 --- a/libstdc++-v3/include/debug/debug.h +++ b/libstdc++-v3/include/debug/debug.h @@ -28,6 +28,10 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. +/** @file debug/debug.h + * This file is a GNU debug extension to the Standard C++ Library. + */ + #ifndef _GLIBCXX_DEBUG_MACRO_SWITCH_H #define _GLIBCXX_DEBUG_MACRO_SWITCH_H 1 diff --git a/libstdc++-v3/include/debug/deque b/libstdc++-v3/include/debug/deque index 3cc8a86f793..79142d9ef2a 100644 --- a/libstdc++-v3/include/debug/deque +++ b/libstdc++-v3/include/debug/deque @@ -28,6 +28,10 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. +/** @file debug/deque + * This file is a GNU debug extension to the Standard C++ Library. + */ + #ifndef _GLIBCXX_DEBUG_DEQUE #define _GLIBCXX_DEBUG_DEQUE 1 diff --git a/libstdc++-v3/include/debug/formatter.h b/libstdc++-v3/include/debug/formatter.h index 1551bfbd73e..8975285b9d7 100644 --- a/libstdc++-v3/include/debug/formatter.h +++ b/libstdc++-v3/include/debug/formatter.h @@ -27,6 +27,10 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. +/** @file debug/formatter.h + * This file is a GNU debug extension to the Standard C++ Library. + */ + #ifndef _GLIBCXX_DEBUG_FORMATTER_H #define _GLIBCXX_DEBUG_FORMATTER_H 1 diff --git a/libstdc++-v3/include/debug/functions.h b/libstdc++-v3/include/debug/functions.h index d6735108d5d..a61c0b9f4ee 100644 --- a/libstdc++-v3/include/debug/functions.h +++ b/libstdc++-v3/include/debug/functions.h @@ -28,6 +28,10 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. +/** @file debug/functions.h + * This file is a GNU debug extension to the Standard C++ Library. + */ + #ifndef _GLIBCXX_DEBUG_FUNCTIONS_H #define _GLIBCXX_DEBUG_FUNCTIONS_H 1 @@ -109,7 +113,7 @@ namespace __gnu_debug */ template<typename _Integral> inline bool - __valid_range_aux(const _Integral&, const _Integral&, __true_type) + __valid_range_aux(const _Integral&, const _Integral&, std::__true_type) { return true; } /** We have iterators, so figure out what kind of iterators that are @@ -118,7 +122,7 @@ namespace __gnu_debug template<typename _InputIterator> inline bool __valid_range_aux(const _InputIterator& __first, - const _InputIterator& __last, __false_type) + const _InputIterator& __last, std::__false_type) { typedef typename std::iterator_traits<_InputIterator>::iterator_category _Category; diff --git a/libstdc++-v3/include/debug/hash_map b/libstdc++-v3/include/debug/hash_map index fe2af59e8de..f44586b0ab6 100644 --- a/libstdc++-v3/include/debug/hash_map +++ b/libstdc++-v3/include/debug/hash_map @@ -28,6 +28,10 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. +/** @file debug/hash_map + * This file is a GNU debug extension to the Standard C++ Library. + */ + #ifndef _GLIBCXX_DEBUG_HASH_MAP #define _GLIBCXX_DEBUG_HASH_MAP 1 diff --git a/libstdc++-v3/include/debug/hash_map.h b/libstdc++-v3/include/debug/hash_map.h index f9d9fe6d3b7..1eb6acb869c 100644 --- a/libstdc++-v3/include/debug/hash_map.h +++ b/libstdc++-v3/include/debug/hash_map.h @@ -28,6 +28,10 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. +/** @file debug/hash_map.h + * This file is a GNU debug extension to the Standard C++ Library. + */ + #ifndef _GLIBCXX_DEBUG_HASH_MAP_H #define _GLIBCXX_DEBUG_HASH_MAP_H 1 diff --git a/libstdc++-v3/include/debug/hash_multimap.h b/libstdc++-v3/include/debug/hash_multimap.h index 73407534120..e3c689ac7cd 100644 --- a/libstdc++-v3/include/debug/hash_multimap.h +++ b/libstdc++-v3/include/debug/hash_multimap.h @@ -28,6 +28,10 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. +/** @file debug/hash_multimap.h + * This file is a GNU debug extension to the Standard C++ Library. + */ + #ifndef _GLIBCXX_DEBUG_HASH_MULTIMAP_H #define _GLIBCXX_DEBUG_HASH_MULTIMAP_H 1 diff --git a/libstdc++-v3/include/debug/hash_multiset.h b/libstdc++-v3/include/debug/hash_multiset.h index 63309ea50ef..93464969487 100644 --- a/libstdc++-v3/include/debug/hash_multiset.h +++ b/libstdc++-v3/include/debug/hash_multiset.h @@ -28,6 +28,10 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. +/** @file debug/hash_multiset.h + * This file is a GNU debug extension to the Standard C++ Library. + */ + #ifndef _GLIBCXX_DEBUG_HASH_MULTISET_H #define _GLIBCXX_DEBUG_HASH_MULTISET_H 1 diff --git a/libstdc++-v3/include/debug/hash_set b/libstdc++-v3/include/debug/hash_set index fad5bdddab8..4b98fefab1f 100644 --- a/libstdc++-v3/include/debug/hash_set +++ b/libstdc++-v3/include/debug/hash_set @@ -28,6 +28,10 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. +/** @file debug/hash_set + * This file is a GNU debug extension to the Standard C++ Library. + */ + #ifndef _GLIBCXX_DEBUG_HASH_SET #define _GLIBCXX_DEBUG_HASH_SET 1 diff --git a/libstdc++-v3/include/debug/hash_set.h b/libstdc++-v3/include/debug/hash_set.h index 76949d35ac5..2d3e0b303fb 100644 --- a/libstdc++-v3/include/debug/hash_set.h +++ b/libstdc++-v3/include/debug/hash_set.h @@ -28,6 +28,10 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. +/** @file debug/hash_set.h + * This file is a GNU debug extension to the Standard C++ Library. + */ + #ifndef _GLIBCXX_DEBUG_HASH_SET_H #define _GLIBCXX_DEBUG_HASH_SET_H 1 diff --git a/libstdc++-v3/include/debug/list b/libstdc++-v3/include/debug/list index 0f5ef6ed905..939fe4da48d 100644 --- a/libstdc++-v3/include/debug/list +++ b/libstdc++-v3/include/debug/list @@ -28,6 +28,37 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. +// 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 of the GNU General Public License as published by the +// Free Software Foundation; either version 2, or (at your option) +// any later version. + +// This library 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 this library; see the file COPYING. If not, write to the Free +// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +// 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. + +/** @file debug/list + * This file is a GNU debug extension to the Standard C++ Library. + */ + #ifndef _GLIBCXX_DEBUG_LIST #define _GLIBCXX_DEBUG_LIST 1 diff --git a/libstdc++-v3/include/debug/macros.h b/libstdc++-v3/include/debug/macros.h index aa11ba2e71a..ce4091924b1 100644 --- a/libstdc++-v3/include/debug/macros.h +++ b/libstdc++-v3/include/debug/macros.h @@ -28,6 +28,10 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. +/** @file debug/macros.h + * This file is a GNU debug extension to the Standard C++ Library. + */ + #ifndef _GLIBCXX_DEBUG_MACROS_H #define _GLIBCXX_DEBUG_MACROS_H 1 diff --git a/libstdc++-v3/include/debug/map b/libstdc++-v3/include/debug/map index ae74e7e7f49..2435154da2e 100644 --- a/libstdc++-v3/include/debug/map +++ b/libstdc++-v3/include/debug/map @@ -1,6 +1,6 @@ // Debugging map/multimap implementation -*- C++ -*- -// Copyright (C) 2003 +// Copyright (C) 2003, 2006 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -28,6 +28,10 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. +/** @file debug/map + * This file is a GNU debug extension to the Standard C++ Library. + */ + #ifndef _GLIBCXX_DEBUG_MAP #define _GLIBCXX_DEBUG_MAP 1 diff --git a/libstdc++-v3/include/debug/map.h b/libstdc++-v3/include/debug/map.h index 09962a3903a..96591ca15c8 100644 --- a/libstdc++-v3/include/debug/map.h +++ b/libstdc++-v3/include/debug/map.h @@ -28,6 +28,10 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. +/** @file debug/map.h + * This file is a GNU debug extension to the Standard C++ Library. + */ + #ifndef _GLIBCXX_DEBUG_MAP_H #define _GLIBCXX_DEBUG_MAP_H 1 diff --git a/libstdc++-v3/include/debug/multimap.h b/libstdc++-v3/include/debug/multimap.h index 78d163ef301..cbd6704520f 100644 --- a/libstdc++-v3/include/debug/multimap.h +++ b/libstdc++-v3/include/debug/multimap.h @@ -28,6 +28,10 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. +/** @file debug/multimap.h + * This file is a GNU debug extension to the Standard C++ Library. + */ + #ifndef _GLIBCXX_DEBUG_MULTIMAP_H #define _GLIBCXX_DEBUG_MULTIMAP_H 1 diff --git a/libstdc++-v3/include/debug/multiset.h b/libstdc++-v3/include/debug/multiset.h index 50d9a16e1cf..a37099e1ac8 100644 --- a/libstdc++-v3/include/debug/multiset.h +++ b/libstdc++-v3/include/debug/multiset.h @@ -28,6 +28,10 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. +/** @file debug/multiset.h + * This file is a GNU debug extension to the Standard C++ Library. + */ + #ifndef _GLIBCXX_DEBUG_MULTISET_H #define _GLIBCXX_DEBUG_MULTISET_H 1 diff --git a/libstdc++-v3/include/debug/safe_base.h b/libstdc++-v3/include/debug/safe_base.h index 2851fc3fa9c..2d26f57a396 100644 --- a/libstdc++-v3/include/debug/safe_base.h +++ b/libstdc++-v3/include/debug/safe_base.h @@ -28,6 +28,10 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. +/** @file debug/safe_base.h + * This file is a GNU debug extension to the Standard C++ Library. + */ + #ifndef _GLIBCXX_DEBUG_SAFE_BASE_H #define _GLIBCXX_DEBUG_SAFE_BASE_H 1 diff --git a/libstdc++-v3/include/debug/safe_iterator.h b/libstdc++-v3/include/debug/safe_iterator.h index 0d61a75eec9..3d8ba59419b 100644 --- a/libstdc++-v3/include/debug/safe_iterator.h +++ b/libstdc++-v3/include/debug/safe_iterator.h @@ -28,6 +28,10 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. +/** @file debug/safe_iterator.h + * This file is a GNU debug extension to the Standard C++ Library. + */ + #ifndef _GLIBCXX_DEBUG_SAFE_ITERATOR_H #define _GLIBCXX_DEBUG_SAFE_ITERATOR_H 1 diff --git a/libstdc++-v3/include/debug/safe_iterator.tcc b/libstdc++-v3/include/debug/safe_iterator.tcc index 08b629e8916..d23e90f048a 100644 --- a/libstdc++-v3/include/debug/safe_iterator.tcc +++ b/libstdc++-v3/include/debug/safe_iterator.tcc @@ -28,9 +28,8 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. -/** @file safe_iterator.tcc - * This is an internal header file, included by other library headers. - * You should not attempt to use it directly. +/** @file debug/safe_iterator.tcc + * This file is a GNU debug extension to the Standard C++ Library. */ #ifndef _GLIBCXX_DEBUG_SAFE_ITERATOR_TCC diff --git a/libstdc++-v3/include/debug/safe_sequence.h b/libstdc++-v3/include/debug/safe_sequence.h index fe356aa53ea..b5d6cce320d 100644 --- a/libstdc++-v3/include/debug/safe_sequence.h +++ b/libstdc++-v3/include/debug/safe_sequence.h @@ -28,6 +28,10 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. +/** @file debug/safe_sequence.h + * This file is a GNU debug extension to the Standard C++ Library. + */ + #ifndef _GLIBCXX_DEBUG_SAFE_SEQUENCE_H #define _GLIBCXX_DEBUG_SAFE_SEQUENCE_H 1 diff --git a/libstdc++-v3/include/debug/set b/libstdc++-v3/include/debug/set index 002b3243471..e5f4e37afb7 100644 --- a/libstdc++-v3/include/debug/set +++ b/libstdc++-v3/include/debug/set @@ -28,6 +28,10 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. +/** @file debug/set + * This file is a GNU debug extension to the Standard C++ Library. + */ + #ifndef _GLIBCXX_DEBUG_SET #define _GLIBCXX_DEBUG_SET 1 diff --git a/libstdc++-v3/include/debug/set.h b/libstdc++-v3/include/debug/set.h index 1d7a4be2a48..6c2ce9fd1fc 100644 --- a/libstdc++-v3/include/debug/set.h +++ b/libstdc++-v3/include/debug/set.h @@ -28,6 +28,10 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. +/** @file debug/set.h + * This file is a GNU debug extension to the Standard C++ Library. + */ + #ifndef _GLIBCXX_DEBUG_SET_H #define _GLIBCXX_DEBUG_SET_H 1 diff --git a/libstdc++-v3/include/debug/string b/libstdc++-v3/include/debug/string index 4b929576ced..070ca1fe58b 100644 --- a/libstdc++-v3/include/debug/string +++ b/libstdc++-v3/include/debug/string @@ -28,6 +28,10 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. +/** @file debug/string + * This file is a GNU debug extension to the Standard C++ Library. + */ + #ifndef _GLIBCXX_DEBUG_STRING #define _GLIBCXX_DEBUG_STRING 1 diff --git a/libstdc++-v3/include/debug/vector b/libstdc++-v3/include/debug/vector index 395267e5d27..33b8b638a77 100644 --- a/libstdc++-v3/include/debug/vector +++ b/libstdc++-v3/include/debug/vector @@ -28,6 +28,10 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. +/** @file debug/vector + * This file is a GNU debug extension to the Standard C++ Library. + */ + #ifndef _GLIBCXX_DEBUG_VECTOR #define _GLIBCXX_DEBUG_VECTOR 1 diff --git a/libstdc++-v3/include/ext/bitmap_allocator.h b/libstdc++-v3/include/ext/bitmap_allocator.h index 838aef844bc..93fa8e63ad5 100644 --- a/libstdc++-v3/include/ext/bitmap_allocator.h +++ b/libstdc++-v3/include/ext/bitmap_allocator.h @@ -53,7 +53,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) using std::size_t; using std::ptrdiff_t; - namespace __balloc + namespace __detail { /** @class __mini_vector bitmap_allocator.h bitmap_allocator.h * @@ -361,7 +361,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) : public std::unary_function<typename std::pair<_Tp, _Tp>, bool> { typedef typename std::pair<_Tp, _Tp> _Block_pair; - typedef typename __balloc::__mini_vector<_Block_pair> _BPVector; + typedef typename __detail::__mini_vector<_Block_pair> _BPVector; typedef typename _BPVector::difference_type _Counter_type; size_t* _M_pbitmap; @@ -385,11 +385,11 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) // store, then there is definitely no space for another single // object, so just return false. _Counter_type __diff = - __gnu_cxx::__balloc::__num_bitmaps(__bp); + __gnu_cxx::__detail::__num_bitmaps(__bp); if (*(reinterpret_cast<size_t*> (__bp.first) - (__diff + 1)) - == __gnu_cxx::__balloc::__num_blocks(__bp)) + == __gnu_cxx::__detail::__num_blocks(__bp)) return false; size_t* __rover = reinterpret_cast<size_t*>(__bp.first) - 1; @@ -428,7 +428,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) template<typename _Tp> class _Bitmap_counter { - typedef typename __balloc::__mini_vector<typename std::pair<_Tp, _Tp> > + typedef typename __detail::__mini_vector<typename std::pair<_Tp, _Tp> > _BPVector; typedef typename _BPVector::size_type _Index_type; typedef _Tp pointer; @@ -534,7 +534,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) size_t __mask = 1 << __pos; *__pbmap |= __mask; } - } // namespace __balloc + } // namespace __detail /** @brief Generic Version of the bsf instruction. */ @@ -550,7 +550,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) class free_list { typedef size_t* value_type; - typedef __balloc::__mini_vector<value_type> vector_type; + typedef __detail::__mini_vector<value_type> vector_type; typedef vector_type::iterator iterator; typedef __mutex __mutex_type; @@ -615,7 +615,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) } // Just add the block to the list of free lists unconditionally. - iterator __temp = __gnu_cxx::__balloc::__lower_bound + iterator __temp = __gnu_cxx::__detail::__lower_bound (__free_list.begin(), __free_list.end(), *__addr, _LT_pointer_compare()); @@ -746,7 +746,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) typedef typename std::pair<_Alloc_block*, _Alloc_block*> _Block_pair; typedef typename - __balloc::__mini_vector<_Block_pair> _BPVector; + __detail::__mini_vector<_Block_pair> _BPVector; #if defined _GLIBCXX_DEBUG // Complexity: O(lg(N)). Where, N is the number of block of size @@ -755,13 +755,13 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) _S_check_for_free_blocks() throw() { typedef typename - __gnu_cxx::__balloc::_Ffit_finder<_Alloc_block*> _FFF; + __gnu_cxx::__detail::_Ffit_finder<_Alloc_block*> _FFF; _FFF __fff; typedef typename _BPVector::iterator _BPiter; _BPiter __bpi = - __gnu_cxx::__balloc::__find_if + __gnu_cxx::__detail::__find_if (_S_mem_blocks.begin(), _S_mem_blocks.end(), - __gnu_cxx::__balloc::_Functor_Ref<_FFF>(__fff)); + __gnu_cxx::__detail::_Functor_Ref<_FFF>(__fff)); _GLIBCXX_DEBUG_ASSERT(__bpi == _S_mem_blocks.end()); } @@ -786,7 +786,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) #endif const size_t __num_bitmaps = (_S_block_size - / size_t(__balloc::bits_per_block)); + / size_t(__detail::bits_per_block)); const size_t __size_to_allocate = sizeof(size_t) + _S_block_size * sizeof(_Alloc_block) + __num_bitmaps * sizeof(size_t); @@ -820,7 +820,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) static _BPVector _S_mem_blocks; static size_t _S_block_size; - static __gnu_cxx::__balloc:: + static __gnu_cxx::__detail:: _Bitmap_counter<_Alloc_block*> _S_last_request; static typename _BPVector::size_type _S_last_dealloc_index; #if defined __GTHREADS @@ -872,13 +872,13 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) { // Fall Back to First Fit algorithm. typedef typename - __gnu_cxx::__balloc::_Ffit_finder<_Alloc_block*> _FFF; + __gnu_cxx::__detail::_Ffit_finder<_Alloc_block*> _FFF; _FFF __fff; typedef typename _BPVector::iterator _BPiter; _BPiter __bpi = - __gnu_cxx::__balloc::__find_if + __gnu_cxx::__detail::__find_if (_S_mem_blocks.begin(), _S_mem_blocks.end(), - __gnu_cxx::__balloc::_Functor_Ref<_FFF>(__fff)); + __gnu_cxx::__detail::_Functor_Ref<_FFF>(__fff)); if (__bpi != _S_mem_blocks.end()) { @@ -886,7 +886,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) // the right as 0, meaning Allocated. This bit is obtained // by calling _M_get() on __fff. size_t __nz_bit = _Bit_scan_forward(*__fff._M_get()); - __balloc::__bit_allocate(__fff._M_get(), __nz_bit); + __detail::__bit_allocate(__fff._M_get(), __nz_bit); _S_last_request._M_reset(__bpi - _S_mem_blocks.begin()); @@ -896,7 +896,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) size_t* __puse_count = reinterpret_cast<size_t*> (__bpi->first) - - (__gnu_cxx::__balloc::__num_bitmaps(*__bpi) + 1); + - (__gnu_cxx::__detail::__num_bitmaps(*__bpi) + 1); ++(*__puse_count); return __ret; @@ -918,14 +918,14 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) // _S_last_request holds a pointer to a valid bit map, that // points to a free block in memory. size_t __nz_bit = _Bit_scan_forward(*_S_last_request._M_get()); - __balloc::__bit_allocate(_S_last_request._M_get(), __nz_bit); + __detail::__bit_allocate(_S_last_request._M_get(), __nz_bit); pointer __ret = reinterpret_cast<pointer> (_S_last_request._M_base() + _S_last_request._M_offset() + __nz_bit); size_t* __puse_count = reinterpret_cast<size_t*> (_S_mem_blocks[_S_last_request._M_where()].first) - - (__gnu_cxx::__balloc:: + - (__gnu_cxx::__detail:: __num_bitmaps(_S_mem_blocks[_S_last_request._M_where()]) + 1); ++(*__puse_count); @@ -957,7 +957,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) _GLIBCXX_DEBUG_ASSERT(_S_last_dealloc_index >= 0); - if (__gnu_cxx::__balloc::_Inclusive_between<_Alloc_block*> + if (__gnu_cxx::__detail::_Inclusive_between<_Alloc_block*> (__real_p) (_S_mem_blocks[_S_last_dealloc_index])) { _GLIBCXX_DEBUG_ASSERT(_S_last_dealloc_index @@ -969,10 +969,10 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) } else { - _Iterator _iter = __gnu_cxx::__balloc:: + _Iterator _iter = __gnu_cxx::__detail:: __find_if(_S_mem_blocks.begin(), _S_mem_blocks.end(), - __gnu_cxx::__balloc:: + __gnu_cxx::__detail:: _Inclusive_between<_Alloc_block*>(__real_p)); _GLIBCXX_DEBUG_ASSERT(_iter != _S_mem_blocks.end()); @@ -984,16 +984,16 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) // Get the position of the iterator that has been found. const size_t __rotate = (__displacement - % size_t(__balloc::bits_per_block)); + % size_t(__detail::bits_per_block)); size_t* __bitmapC = reinterpret_cast<size_t*> (_S_mem_blocks[__diff].first) - 1; - __bitmapC -= (__displacement / size_t(__balloc::bits_per_block)); + __bitmapC -= (__displacement / size_t(__detail::bits_per_block)); - __balloc::__bit_free(__bitmapC, __rotate); + __detail::__bit_free(__bitmapC, __rotate); size_t* __puse_count = reinterpret_cast<size_t*> (_S_mem_blocks[__diff].first) - - (__gnu_cxx::__balloc::__num_bitmaps(_S_mem_blocks[__diff]) + 1); + - (__gnu_cxx::__detail::__num_bitmaps(_S_mem_blocks[__diff]) + 1); _GLIBCXX_DEBUG_ASSERT(*__puse_count != 0); @@ -1115,14 +1115,14 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) template<typename _Tp> size_t bitmap_allocator<_Tp>::_S_block_size = - 2 * size_t(__balloc::bits_per_block); + 2 * size_t(__detail::bits_per_block); template<typename _Tp> typename __gnu_cxx::bitmap_allocator<_Tp>::_BPVector::size_type bitmap_allocator<_Tp>::_S_last_dealloc_index = 0; template<typename _Tp> - __gnu_cxx::__balloc::_Bitmap_counter + __gnu_cxx::__detail::_Bitmap_counter <typename bitmap_allocator<_Tp>::_Alloc_block*> bitmap_allocator<_Tp>::_S_last_request(_S_mem_blocks); diff --git a/libstdc++-v3/include/ext/rc_string_base.h b/libstdc++-v3/include/ext/rc_string_base.h index 081194bf4f4..4eab4c69fb9 100644 --- a/libstdc++-v3/include/ext/rc_string_base.h +++ b/libstdc++-v3/include/ext/rc_string_base.h @@ -225,7 +225,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) template<typename _InIterator> static _CharT* _S_construct_aux(_InIterator __beg, _InIterator __end, - const _Alloc& __a, __false_type) + const _Alloc& __a, std::__false_type) { typedef typename iterator_traits<_InIterator>::iterator_category _Tag; return _S_construct(__beg, __end, __a, _Tag()); @@ -234,7 +234,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) template<typename _InIterator> static _CharT* _S_construct_aux(_InIterator __beg, _InIterator __end, - const _Alloc& __a, __true_type) + const _Alloc& __a, std::__true_type) { return _S_construct(static_cast<size_type>(__beg), static_cast<value_type>(__end), __a); } diff --git a/libstdc++-v3/include/ext/slist b/libstdc++-v3/include/ext/slist index 06bf7b1cb09..328a52e012f 100644 --- a/libstdc++-v3/include/ext/slist +++ b/libstdc++-v3/include/ext/slist @@ -62,6 +62,8 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) using std::_Construct; using std::_Destroy; using std::allocator; + using std::__true_type; + using std::__false_type; struct _Slist_node_base { diff --git a/libstdc++-v3/include/ext/sso_string_base.h b/libstdc++-v3/include/ext/sso_string_base.h index 5a13d401270..c95b48ecd8d 100644 --- a/libstdc++-v3/include/ext/sso_string_base.h +++ b/libstdc++-v3/include/ext/sso_string_base.h @@ -99,7 +99,8 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) // requires special behaviour if _InIterator is an integral type template<typename _InIterator> void - _M_construct_aux(_InIterator __beg, _InIterator __end, __false_type) + _M_construct_aux(_InIterator __beg, _InIterator __end, + std::__false_type) { typedef typename iterator_traits<_InIterator>::iterator_category _Tag; _M_construct(__beg, __end, _Tag()); @@ -107,7 +108,8 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) template<typename _InIterator> void - _M_construct_aux(_InIterator __beg, _InIterator __end, __true_type) + _M_construct_aux(_InIterator __beg, _InIterator __end, + std::__true_type) { _M_construct(static_cast<size_type>(__beg), static_cast<value_type>(__end)); } diff --git a/libstdc++-v3/include/ext/throw_allocator.h b/libstdc++-v3/include/ext/throw_allocator.h index a65b64c756c..112fb739d70 100644 --- a/libstdc++-v3/include/ext/throw_allocator.h +++ b/libstdc++-v3/include/ext/throw_allocator.h @@ -39,10 +39,16 @@ // purpose. It is provided "as is" without express or implied // warranty. +/** @file ext/vstring.h + * This file is a GNU extension to the Standard C++ Library. + * + * Contains an exception-throwing allocator, useful for testing + * exception safety. In addition, allocation addresses are stored and + * sanity checked. + */ + /** - * @file throw_allocator.h Contains an exception-throwing allocator - * useful for testing exception safety. In addition, allocation - * addresses are stored and sanity checked. + * @file throw_allocator.h */ #ifndef _THROW_ALLOCATOR_H diff --git a/libstdc++-v3/include/ext/type_traits.h b/libstdc++-v3/include/ext/type_traits.h index 27dda0b48ef..d54a5344254 100644 --- a/libstdc++-v3/include/ext/type_traits.h +++ b/libstdc++-v3/include/ext/type_traits.h @@ -28,6 +28,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. +/** @file ext/type_traits.h + * This file is a GNU extension to the Standard C++ Library. + */ + #ifndef _EXT_TYPE_TRAITS #define _EXT_TYPE_TRAITS 1 diff --git a/libstdc++-v3/include/ext/vstring.h b/libstdc++-v3/include/ext/vstring.h index c3a21b88c05..3f14822187e 100644 --- a/libstdc++-v3/include/ext/vstring.h +++ b/libstdc++-v3/include/ext/vstring.h @@ -1200,13 +1200,13 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) template<class _Integer> __versa_string& _M_replace_dispatch(iterator __i1, iterator __i2, _Integer __n, - _Integer __val, __true_type) + _Integer __val, std::__true_type) { return _M_replace_aux(__i1 - _M_ibegin(), __i2 - __i1, __n, __val); } template<class _InputIterator> __versa_string& _M_replace_dispatch(iterator __i1, iterator __i2, _InputIterator __k1, - _InputIterator __k2, __false_type); + _InputIterator __k2, std::__false_type); __versa_string& _M_replace_aux(size_type __pos1, size_type __n1, size_type __n2, diff --git a/libstdc++-v3/include/ext/vstring.tcc b/libstdc++-v3/include/ext/vstring.tcc index 2a880d99734..f541772a6e4 100644 --- a/libstdc++-v3/include/ext/vstring.tcc +++ b/libstdc++-v3/include/ext/vstring.tcc @@ -84,7 +84,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) __versa_string<_CharT, _Traits, _Alloc, _Base>& __versa_string<_CharT, _Traits, _Alloc, _Base>:: _M_replace_dispatch(iterator __i1, iterator __i2, _InputIterator __k1, - _InputIterator __k2, __false_type) + _InputIterator __k2, std::__false_type) { const __versa_string __s(__k1, __k2); const size_type __n1 = __i2 - __i1; diff --git a/libstdc++-v3/include/std/std_bitset.h b/libstdc++-v3/include/std/std_bitset.h index bea36e28ea6..ae05db667c7 100644 --- a/libstdc++-v3/include/std/std_bitset.h +++ b/libstdc++-v3/include/std/std_bitset.h @@ -41,7 +41,7 @@ * purpose. It is provided "as is" without express or implied warranty. */ -/** @file bitset +/** @file * This is a Standard C++ Library header. */ diff --git a/libstdc++-v3/include/std/std_deque.h b/libstdc++-v3/include/std/std_deque.h index b82d45e9ac3..7fa0c31231b 100644 --- a/libstdc++-v3/include/std/std_deque.h +++ b/libstdc++-v3/include/std/std_deque.h @@ -53,7 +53,7 @@ * purpose. It is provided "as is" without express or implied warranty. */ -/** @file deque +/** @file * This is a Standard C++ Library header. */ diff --git a/libstdc++-v3/include/std/std_iterator.h b/libstdc++-v3/include/std/std_iterator.h index 00bc9838b9b..01bef2d06b6 100644 --- a/libstdc++-v3/include/std/std_iterator.h +++ b/libstdc++-v3/include/std/std_iterator.h @@ -53,7 +53,7 @@ * purpose. It is provided "as is" without express or implied warranty. */ -/** @file iterator +/** @file * This is a Standard C++ Library header. */ diff --git a/libstdc++-v3/include/std/std_list.h b/libstdc++-v3/include/std/std_list.h index ee2105f9ad1..3a50b9e8aa7 100644 --- a/libstdc++-v3/include/std/std_list.h +++ b/libstdc++-v3/include/std/std_list.h @@ -53,7 +53,7 @@ * purpose. It is provided "as is" without express or implied warranty. */ -/** @file list +/** @file * This is a Standard C++ Library header. */ diff --git a/libstdc++-v3/include/std/std_map.h b/libstdc++-v3/include/std/std_map.h index 86ff4328b48..d81628a6bdb 100644 --- a/libstdc++-v3/include/std/std_map.h +++ b/libstdc++-v3/include/std/std_map.h @@ -53,7 +53,7 @@ * purpose. It is provided "as is" without express or implied warranty. */ -/** @file map +/** @file * This is a Standard C++ Library header. */ diff --git a/libstdc++-v3/include/std/std_queue.h b/libstdc++-v3/include/std/std_queue.h index d23267615fe..d3398d36890 100644 --- a/libstdc++-v3/include/std/std_queue.h +++ b/libstdc++-v3/include/std/std_queue.h @@ -53,7 +53,7 @@ * purpose. It is provided "as is" without express or implied warranty. */ -/** @file queue +/** @file * This is a Standard C++ Library header. */ diff --git a/libstdc++-v3/include/std/std_set.h b/libstdc++-v3/include/std/std_set.h index d01681b90ee..6d5dd4345a9 100644 --- a/libstdc++-v3/include/std/std_set.h +++ b/libstdc++-v3/include/std/std_set.h @@ -53,7 +53,7 @@ * purpose. It is provided "as is" without express or implied warranty. */ -/** @file set +/** @file * This is a Standard C++ Library header. */ diff --git a/libstdc++-v3/include/std/std_stack.h b/libstdc++-v3/include/std/std_stack.h index 4112b2df8a1..0bd6dda0002 100644 --- a/libstdc++-v3/include/std/std_stack.h +++ b/libstdc++-v3/include/std/std_stack.h @@ -53,7 +53,7 @@ * purpose. It is provided "as is" without express or implied warranty. */ -/** @file stack +/** @file * This is a Standard C++ Library header. */ diff --git a/libstdc++-v3/include/std/std_string.h b/libstdc++-v3/include/std/std_string.h index a75f448d675..28ff451f48a 100644 --- a/libstdc++-v3/include/std/std_string.h +++ b/libstdc++-v3/include/std/std_string.h @@ -32,7 +32,7 @@ // ISO C++ 14882: 21 Strings library // -/** @file string +/** @file * This is a Standard C++ Library header. */ diff --git a/libstdc++-v3/include/std/std_utility.h b/libstdc++-v3/include/std/std_utility.h index 7b744869b9d..d88917b5900 100644 --- a/libstdc++-v3/include/std/std_utility.h +++ b/libstdc++-v3/include/std/std_utility.h @@ -53,7 +53,7 @@ * purpose. It is provided "as is" without express or implied warranty. */ -/** @file utility +/** @file * This is a Standard C++ Library header. */ diff --git a/libstdc++-v3/include/std/std_vector.h b/libstdc++-v3/include/std/std_vector.h index 7b4db3504bf..ee259d5be8f 100644 --- a/libstdc++-v3/include/std/std_vector.h +++ b/libstdc++-v3/include/std/std_vector.h @@ -53,7 +53,7 @@ * purpose. It is provided "as is" without express or implied warranty. */ -/** @file vector +/** @file * This is a Standard C++ Library header. */ diff --git a/libstdc++-v3/include/tr1/functional b/libstdc++-v3/include/tr1/functional index 0ee202bb762..bafcb1f0504 100644 --- a/libstdc++-v3/include/tr1/functional +++ b/libstdc++-v3/include/tr1/functional @@ -1090,6 +1090,10 @@ _GLIBCXX_BEGIN_NAMESPACE(tr1) __x.swap(__y); } +_GLIBCXX_END_NAMESPACE +} + + #define _GLIBCXX_JOIN(X,Y) _GLIBCXX_JOIN2( X , Y ) #define _GLIBCXX_JOIN2(X,Y) _GLIBCXX_JOIN3(X,Y) #define _GLIBCXX_JOIN3(X,Y) X##Y @@ -1100,6 +1104,11 @@ _GLIBCXX_BEGIN_NAMESPACE(tr1) #undef _GLIBCXX_JOIN2 #undef _GLIBCXX_JOIN + +namespace std +{ +_GLIBCXX_BEGIN_NAMESPACE(tr1) + // Definition of default hash function std::tr1::hash<>. The types for // which std::tr1::hash<T> is defined is in clause 6.3.3. of the PDTR. template<typename T> diff --git a/libstdc++-v3/include/tr1/functional_iterate.h b/libstdc++-v3/include/tr1/functional_iterate.h index 4a74f83efec..3d6cc8c5c1a 100644 --- a/libstdc++-v3/include/tr1/functional_iterate.h +++ b/libstdc++-v3/include/tr1/functional_iterate.h @@ -33,6 +33,10 @@ * You should not attempt to use it directly. */ +namespace std +{ +_GLIBCXX_BEGIN_NAMESPACE(tr1) + template<typename _Res _GLIBCXX_COMMA _GLIBCXX_TEMPLATE_PARAMS> struct _Weak_result_type_impl<_Res(_GLIBCXX_TEMPLATE_ARGS)> { @@ -914,3 +918,5 @@ template<typename _Functor> } } +_GLIBCXX_END_NAMESPACE +} diff --git a/libstdc++-v3/include/tr1/memory b/libstdc++-v3/include/tr1/memory index 94a04777a1e..e819d8bd0ed 100644 --- a/libstdc++-v3/include/tr1/memory +++ b/libstdc++-v3/include/tr1/memory @@ -27,6 +27,11 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. +/** + * @file + * This is a TR1 C++ Library header. + */ + #ifndef _TR1_MEMORY #define _TR1_MEMORY 1 diff --git a/libstdc++-v3/include/tr1/mu_iterate.h b/libstdc++-v3/include/tr1/mu_iterate.h index ece3fc2dbfd..31d4eff2fd4 100644 --- a/libstdc++-v3/include/tr1/mu_iterate.h +++ b/libstdc++-v3/include/tr1/mu_iterate.h @@ -36,6 +36,8 @@ // Determine the result type when we pass the arguments along. This // involves passing along the cv-qualifiers placed on _Mu and // unwrapping the argument bundle. +// @namespace std::tr1 +// @class std::tr1::_Mu::result template<typename _CVMu, typename _CVArg _GLIBCXX_COMMA _GLIBCXX_TEMPLATE_PARAMS> class result<_CVMu(_CVArg, tuple<_GLIBCXX_TEMPLATE_ARGS>)> @@ -48,4 +50,3 @@ operator()(_CVArg& __arg, const tuple<_GLIBCXX_TEMPLATE_ARGS>& __tuple) { return __arg(_GLIBCXX_MU_GET_TUPLE_ARGS); } - diff --git a/libstdc++-v3/include/tr1/random b/libstdc++-v3/include/tr1/random index 9114d80b672..0f10db52bec 100644 --- a/libstdc++-v3/include/tr1/random +++ b/libstdc++-v3/include/tr1/random @@ -27,14 +27,14 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. -#ifndef _TR1_RANDOM -#define _TR1_RANDOM 1 - /** * @file * This is a TR1 C++ Library header. */ +#ifndef _TR1_RANDOM +#define _TR1_RANDOM 1 + #include <algorithm> #include <bits/concept_check.h> #include <cmath> diff --git a/libstdc++-v3/include/tr1/random.tcc b/libstdc++-v3/include/tr1/random.tcc index 67d79edf69a..57c92589308 100644 --- a/libstdc++-v3/include/tr1/random.tcc +++ b/libstdc++-v3/include/tr1/random.tcc @@ -27,6 +27,10 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. +/** @file + * This is a TR1 C++ Library header. + */ + namespace std { _GLIBCXX_BEGIN_NAMESPACE(tr1) diff --git a/libstdc++-v3/include/tr1/tuple b/libstdc++-v3/include/tr1/tuple index 4ec88bd9214..7b4b8f093ad 100644 --- a/libstdc++-v3/include/tr1/tuple +++ b/libstdc++-v3/include/tr1/tuple @@ -145,6 +145,9 @@ _GLIBCXX_BEGIN_NAMESPACE(tr1) swallow_assign ignore; }; // anonymous namespace +_GLIBCXX_END_NAMESPACE +} + #define _GLIBCXX_CAT(x,y) _GLIBCXX_CAT2(x,y) #define _GLIBCXX_CAT2(x,y) x##y #define _SHORT_REPEAT @@ -153,9 +156,6 @@ _GLIBCXX_BEGIN_NAMESPACE(tr1) #undef _GLIBCXX_REPEAT_HEADER #undef _SHORT_REPEAT -_GLIBCXX_END_NAMESPACE -} - #include <tr1/functional> #endif diff --git a/libstdc++-v3/include/tr1/tuple_defs.h b/libstdc++-v3/include/tr1/tuple_defs.h index 35a739ee4f8..8cab92724af 100644 --- a/libstdc++-v3/include/tr1/tuple_defs.h +++ b/libstdc++-v3/include/tr1/tuple_defs.h @@ -26,6 +26,12 @@ // 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. + +/** @file tuple_defs.h + * This is an internal header file, included by other library headers. + * You should not attempt to use it directly. + */ + #ifndef _GLIBCXX_REPEAT_HEADER # define _GLIBCXX_REPEAT_HEADER "tuple_defs.h" # include "repeat.h" diff --git a/libstdc++-v3/include/tr1/tuple_iterate.h b/libstdc++-v3/include/tr1/tuple_iterate.h index da6166e725d..c1fcee6107a 100644 --- a/libstdc++-v3/include/tr1/tuple_iterate.h +++ b/libstdc++-v3/include/tr1/tuple_iterate.h @@ -34,6 +34,10 @@ // Chris Jefferson <chris@bubblescope.net> +namespace std +{ +_GLIBCXX_BEGIN_NAMESPACE(tr1) + /// @brief class tuple_size template<_GLIBCXX_TEMPLATE_PARAMS> struct tuple_size<tuple<_GLIBCXX_TEMPLATE_ARGS> > @@ -164,3 +168,5 @@ template<_GLIBCXX_TEMPLATE_PARAMS> { return make_tuple(_GLIBCXX_REF_WRAP_PARAMS); } #endif +_GLIBCXX_END_NAMESPACE +} |