From b798df05790604a421d9099bb3c44d3b5922577c Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Tue, 29 Jul 2008 19:34:36 +0000 Subject: [PATCH] set.h: Minor formatting fixes. 2008-07-29 Paolo Carlini * include/debug/set.h: Minor formatting fixes. * include/debug/multiset.h: Likewise. * include/debug/safe_association.h: Likewise. * include/debug/vector: Likewise. * include/debug/map.h: Likewise. * include/debug/string: Likewise. * include/debug/multimap.h: Likewise. * include/bits/stl_list.h: Likewise. * include/bits/stl_map.h: Likewise. * include/bits/stl_set.h: Likewise. * include/bits/stl_multimap.h: Likewise. * include/bits/stl_vector.h: Likewise. * include/bits/stl_multiset.h: Likewise. * include/bits/stl_bvector.h: Likewise. From-SVN: r138263 --- libstdc++-v3/ChangeLog | 17 +++++++++++++++++ libstdc++-v3/include/bits/stl_bvector.h | 4 ++-- libstdc++-v3/include/bits/stl_list.h | 2 +- libstdc++-v3/include/bits/stl_map.h | 2 +- libstdc++-v3/include/bits/stl_multimap.h | 2 +- libstdc++-v3/include/bits/stl_multiset.h | 2 +- libstdc++-v3/include/bits/stl_set.h | 8 ++++---- libstdc++-v3/include/bits/stl_vector.h | 10 +++++----- libstdc++-v3/include/debug/map.h | 2 +- libstdc++-v3/include/debug/multimap.h | 2 +- libstdc++-v3/include/debug/multiset.h | 2 +- libstdc++-v3/include/debug/safe_association.h | 4 ++-- libstdc++-v3/include/debug/set.h | 2 +- libstdc++-v3/include/debug/string | 4 ++-- libstdc++-v3/include/debug/vector | 4 ++-- 15 files changed, 42 insertions(+), 25 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index c50eeff39a9..8c90e3a99cc 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,20 @@ +2008-07-29 Paolo Carlini + + * include/debug/set.h: Minor formatting fixes. + * include/debug/multiset.h: Likewise. + * include/debug/safe_association.h: Likewise. + * include/debug/vector: Likewise. + * include/debug/map.h: Likewise. + * include/debug/string: Likewise. + * include/debug/multimap.h: Likewise. + * include/bits/stl_list.h: Likewise. + * include/bits/stl_map.h: Likewise. + * include/bits/stl_set.h: Likewise. + * include/bits/stl_multimap.h: Likewise. + * include/bits/stl_vector.h: Likewise. + * include/bits/stl_multiset.h: Likewise. + * include/bits/stl_bvector.h: Likewise. + 2008-07-29 Paolo Carlini * include/std/utility: Include , per the current WP. diff --git a/libstdc++-v3/include/bits/stl_bvector.h b/libstdc++-v3/include/bits/stl_bvector.h index ad0ed87a115..4409d9c3665 100644 --- a/libstdc++-v3/include/bits/stl_bvector.h +++ b/libstdc++-v3/include/bits/stl_bvector.h @@ -1,6 +1,6 @@ // vector specialization -*- C++ -*- -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -534,7 +534,7 @@ template vector(initializer_list __l, const allocator_type& __a = allocator_type()) - : _Base(__a) + : _Base(__a) { _M_initialize_range(__l.begin(), __l.end(), random_access_iterator_tag()); diff --git a/libstdc++-v3/include/bits/stl_list.h b/libstdc++-v3/include/bits/stl_list.h index b38fa55cf79..91c339c1746 100644 --- a/libstdc++-v3/include/bits/stl_list.h +++ b/libstdc++-v3/include/bits/stl_list.h @@ -553,7 +553,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D) */ list(initializer_list __l, const allocator_type& __a = allocator_type()) - : _Base(__a) + : _Base(__a) { _M_initialize_dispatch(__l.begin(), __l.end(), __false_type()); } #endif diff --git a/libstdc++-v3/include/bits/stl_map.h b/libstdc++-v3/include/bits/stl_map.h index b402b8292c5..3fe69c925d4 100644 --- a/libstdc++-v3/include/bits/stl_map.h +++ b/libstdc++-v3/include/bits/stl_map.h @@ -201,7 +201,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D) map(initializer_list __l, const _Compare& __c = _Compare(), const allocator_type& __a = allocator_type()) - : _M_t(__c, __a) + : _M_t(__c, __a) { _M_t._M_insert_unique(__l.begin(), __l.end()); } #endif diff --git a/libstdc++-v3/include/bits/stl_multimap.h b/libstdc++-v3/include/bits/stl_multimap.h index 0834c95cfd6..64a23b94920 100644 --- a/libstdc++-v3/include/bits/stl_multimap.h +++ b/libstdc++-v3/include/bits/stl_multimap.h @@ -198,7 +198,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D) multimap(initializer_list __l, const _Compare& __comp = _Compare(), const allocator_type& __a = allocator_type()) - : _M_t(__comp, __a) + : _M_t(__comp, __a) { _M_t._M_insert_equal(__l.begin(), __l.end()); } #endif diff --git a/libstdc++-v3/include/bits/stl_multiset.h b/libstdc++-v3/include/bits/stl_multiset.h index 2fea83f847c..18757551e5d 100644 --- a/libstdc++-v3/include/bits/stl_multiset.h +++ b/libstdc++-v3/include/bits/stl_multiset.h @@ -211,7 +211,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D) multiset(initializer_list __l, const _Compare& __comp = _Compare(), const allocator_type& __a = allocator_type()) - : _M_t(__comp, __a) + : _M_t(__comp, __a) { _M_t._M_insert_equal(__l.begin(), __l.end()); } #endif diff --git a/libstdc++-v3/include/bits/stl_set.h b/libstdc++-v3/include/bits/stl_set.h index 98c74e9a27c..65dc13569da 100644 --- a/libstdc++-v3/include/bits/stl_set.h +++ b/libstdc++-v3/include/bits/stl_set.h @@ -215,10 +215,10 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D) * This is linear in N if the list is already sorted, and NlogN * otherwise (where N is @a l.size()). */ - set(initializer_list __l, - const _Compare& __comp = _Compare(), - const allocator_type& __a = allocator_type()) - : _M_t(__comp, __a) + set(initializer_list __l, + const _Compare& __comp = _Compare(), + const allocator_type& __a = allocator_type()) + : _M_t(__comp, __a) { _M_t._M_insert_unique(__l.begin(), __l.end()); } #endif diff --git a/libstdc++-v3/include/bits/stl_vector.h b/libstdc++-v3/include/bits/stl_vector.h index 9ccd9b8ca23..28222f408f3 100644 --- a/libstdc++-v3/include/bits/stl_vector.h +++ b/libstdc++-v3/include/bits/stl_vector.h @@ -277,11 +277,11 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D) */ vector(initializer_list __l, const allocator_type& __a = allocator_type()) - : _Base(__a) - { - _M_range_initialize(__l.begin(), __l.end(), - random_access_iterator_tag()); - } + : _Base(__a) + { + _M_range_initialize(__l.begin(), __l.end(), + random_access_iterator_tag()); + } #endif /** diff --git a/libstdc++-v3/include/debug/map.h b/libstdc++-v3/include/debug/map.h index 8232c742a63..88d3e9842f8 100644 --- a/libstdc++-v3/include/debug/map.h +++ b/libstdc++-v3/include/debug/map.h @@ -102,7 +102,7 @@ namespace __debug map(initializer_list __l, const _Compare& __c = _Compare(), const allocator_type& __a = allocator_type()) - : _Base(__l, __c, __a), _Safe_base() { } + : _Base(__l, __c, __a), _Safe_base() { } #endif ~map() { } diff --git a/libstdc++-v3/include/debug/multimap.h b/libstdc++-v3/include/debug/multimap.h index b7c5ee7181c..b8e78d153a9 100644 --- a/libstdc++-v3/include/debug/multimap.h +++ b/libstdc++-v3/include/debug/multimap.h @@ -103,7 +103,7 @@ namespace __debug multimap(initializer_list __l, const _Compare& __c = _Compare(), const allocator_type& __a = allocator_type()) - : _Base(__l, __c, __a), _Safe_base() { } + : _Base(__l, __c, __a), _Safe_base() { } #endif ~multimap() { } diff --git a/libstdc++-v3/include/debug/multiset.h b/libstdc++-v3/include/debug/multiset.h index f108531638e..ba159b4c537 100644 --- a/libstdc++-v3/include/debug/multiset.h +++ b/libstdc++-v3/include/debug/multiset.h @@ -100,7 +100,7 @@ namespace __debug multiset(initializer_list __l, const _Compare& __comp = _Compare(), const allocator_type& __a = allocator_type()) - : _Base(__l, __comp, __a), _Safe_base() { } + : _Base(__l, __comp, __a), _Safe_base() { } #endif ~multiset() { } diff --git a/libstdc++-v3/include/debug/safe_association.h b/libstdc++-v3/include/debug/safe_association.h index a413b01f872..de8945301f6 100644 --- a/libstdc++-v3/include/debug/safe_association.h +++ b/libstdc++-v3/include/debug/safe_association.h @@ -1,6 +1,6 @@ // Safe associated container base class implementation -*- C++ -*- -// Copyright (C) 2007 Free Software Foundation, Inc. +// Copyright (C) 2007, 2008 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 @@ -110,7 +110,7 @@ namespace __gnu_debug const hasher& __hf, const key_equal& __eql, const allocator_type& __a = allocator_type()) - : _Base(__l, __n, __hf, __eql, __a) + : _Base(__l, __n, __hf, __eql, __a) { } _Safe_association(const _Base& __x) : _Base(__x) { } diff --git a/libstdc++-v3/include/debug/set.h b/libstdc++-v3/include/debug/set.h index 00711cd321d..310f3ab61a2 100644 --- a/libstdc++-v3/include/debug/set.h +++ b/libstdc++-v3/include/debug/set.h @@ -100,7 +100,7 @@ namespace __debug set(initializer_list __l, const _Compare& __comp = _Compare(), const allocator_type& __a = allocator_type()) - : _Base(__l, __comp, __a), _Safe_base() { } + : _Base(__l, __comp, __a), _Safe_base() { } #endif ~set() { } diff --git a/libstdc++-v3/include/debug/string b/libstdc++-v3/include/debug/string index 68882fed581..c00e0f38afc 100644 --- a/libstdc++-v3/include/debug/string +++ b/libstdc++-v3/include/debug/string @@ -117,8 +117,8 @@ namespace __gnu_debug #ifdef __GXX_EXPERIMENTAL_CXX0X__ basic_string(initializer_list<_CharT> __l, const _Alloc& __a = _Alloc()) - : _Base(__l, __a) - { } + : _Base(__l, __a) + { } #endif // __GXX_EXPERIMENTAL_CXX0X__ ~basic_string() { } diff --git a/libstdc++-v3/include/debug/vector b/libstdc++-v3/include/debug/vector index a00419200d0..4e8cf5799b6 100644 --- a/libstdc++-v3/include/debug/vector +++ b/libstdc++-v3/include/debug/vector @@ -109,8 +109,8 @@ namespace __debug vector(initializer_list __l, const allocator_type& __a = allocator_type()) - : _Base(__l, __a), _Safe_base(), - _M_guaranteed_capacity(__l.size()) { } + : _Base(__l, __a), _Safe_base(), + _M_guaranteed_capacity(__l.size()) { } #endif ~vector() { } -- 2.30.2