From c94652b1630d3dd6aed58b80c5ed91978079a3ba Mon Sep 17 00:00:00 2001 From: paolo Date: Fri, 23 Mar 2012 13:27:45 +0000 Subject: [PATCH] 2012-03-23 Paolo Carlini * include/bits/forward_list.h: Fix comments. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch@185738 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 4 ++++ libstdc++-v3/include/bits/forward_list.h | 41 ++++++++++++++++---------------- 2 files changed, 25 insertions(+), 20 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index d4682d47001..36a8183a137 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,7 @@ +2012-03-23 Paolo Carlini + + * include/bits/forward_list.h: Fix comments. + 2012-03-23 Paweł Sikora PR libstdc++/52540 diff --git a/libstdc++-v3/include/bits/forward_list.h b/libstdc++-v3/include/bits/forward_list.h index 0fc8323767b..85c8be3e5e3 100644 --- a/libstdc++-v3/include/bits/forward_list.h +++ b/libstdc++-v3/include/bits/forward_list.h @@ -1,6 +1,6 @@ // -*- C++ -*- -// Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +// Copyright (C) 2008, 2009, 2010, 2011, 2012 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 @@ -606,8 +606,8 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER * in the range [@a __first,@a __last). * * Note that the assignment completely changes the %forward_list and - * that the resulting %forward_list's size is the same as the number - * of elements assigned. Old data may be lost. + * that the number of elements of the resulting %forward_list's is the + * same as the number of elements assigned. Old data is lost. */ template void @@ -622,10 +622,10 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER * @param __n Number of elements to be assigned. * @param __val Value to be assigned. * - * This function fills a %forward_list with @a __n copies of the given - * value. Note that the assignment completely changes the - * %forward_list and that the resulting %forward_list's size is the - * same as the number of elements assigned. Old data may be lost. + * This function fills a %forward_list with @a __n copies of the + * given value. Note that the assignment completely changes the + * %forward_list, and that the resulting %forward_list has __n + * elements. Old data is lost. */ void assign(size_type __n, const _Tp& __val) @@ -744,7 +744,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER { return this->_M_impl._M_head._M_next == 0; } /** - * Returns the largest possible size of %forward_list. + * Returns the largest possible number of elements of %forward_list. */ size_type max_size() const noexcept @@ -997,9 +997,9 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER * * This function will %resize the %forward_list to the specified * number of elements. If the number is smaller than the - * %forward_list's current size the %forward_list is truncated, - * otherwise the %forward_list is extended and the new elements - * are default constructed. + * %forward_list's current number of elements the %forward_list + * is truncated, otherwise the %forward_list is extended and the + * new elements are default constructed. */ void resize(size_type __sz); @@ -1012,9 +1012,9 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER * * This function will %resize the %forward_list to the specified * number of elements. If the number is smaller than the - * %forward_list's current size the %forward_list is truncated, - * otherwise the %forward_list is extended and new elements are - * populated with given data. + * %forward_list's current number of elements the %forward_list + * is truncated, otherwise the %forward_list is extended and new + * elements are populated with given data. */ void resize(size_type __sz, const value_type& __val); @@ -1240,11 +1240,11 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER * @brief Forward list equality comparison. * @param __lx A %forward_list * @param __ly A %forward_list of the same type as @a __lx. - * @return True iff the size and elements of the forward lists are equal. + * @return True iff the elements of the forward lists are equal. * - * This is an equivalence relation. It is linear in the size of the - * forward lists. Deques are considered equivalent if corresponding - * elements compare equal. + * This is an equivalence relation. It is linear in the number of + * elements of the forward lists. Deques are considered equivalent + * if corresponding elements compare equal. */ template bool @@ -1257,8 +1257,9 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER * @param __ly A %forward_list of the same type as @a __lx. * @return True iff @a __lx is lexicographically less than @a __ly. * - * This is a total ordering relation. It is linear in the size of the - * forward lists. The elements must be comparable with @c <. + * This is a total ordering relation. It is linear in the number of + * elements of the forward lists. The elements must be comparable + * with @c <. * * See std::lexicographical_compare() for how the determination is made. */ -- 2.11.0