From 7e5dc35e34d0ec5da16ff386799dbad9e94c1c94 Mon Sep 17 00:00:00 2001 From: paolo Date: Thu, 3 Aug 2006 21:11:13 +0000 Subject: [PATCH] 2006-08-03 Paolo Carlini * include/bits/stl_queue.h: Trivial formatting fixes. * include/bits/stl_stack.h: Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@115911 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 5 ++++ libstdc++-v3/include/bits/stl_queue.h | 43 +++++++++++++++++------------------ libstdc++-v3/include/bits/stl_stack.h | 9 ++++---- 3 files changed, 31 insertions(+), 26 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 18c347622dc..5424e5717e4 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2006-08-03 Paolo Carlini + + * include/bits/stl_queue.h: Trivial formatting fixes. + * include/bits/stl_stack.h: Likewise. + 2006-08-01 Ed Smith-Rowland <3dw4rd@verizon.net> * docs/html/ext/tr1.html: Update. diff --git a/libstdc++-v3/include/bits/stl_queue.h b/libstdc++-v3/include/bits/stl_queue.h index e0da22fb213..e2cd0d5d208 100644 --- a/libstdc++-v3/include/bits/stl_queue.h +++ b/libstdc++-v3/include/bits/stl_queue.h @@ -1,6 +1,6 @@ // Queue implementation -*- C++ -*- -// Copyright (C) 2001, 2002, 2003, 2004, 2005 +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -73,11 +73,11 @@ _GLIBCXX_BEGIN_NAMESPACE(std) template inline bool - operator==(const queue<_Tp,_Seq>&, const queue<_Tp,_Seq>&); + operator==(const queue<_Tp, _Seq>&, const queue<_Tp, _Seq>&); template inline bool - operator<(const queue<_Tp,_Seq>&, const queue<_Tp,_Seq>&); + operator<(const queue<_Tp, _Seq>&, const queue<_Tp, _Seq>&); /** * @brief A standard container giving FIFO behavior. @@ -246,10 +246,9 @@ _GLIBCXX_BEGIN_NAMESPACE(std) * linear in the size of the sequences, and queues are considered equivalent * if their sequences compare equal. */ - template + template inline bool - operator==(const queue<_Tp,_Sequence>& __x, - const queue<_Tp,_Sequence>& __y) + operator==(const queue<_Tp, _Seq>& __x, const queue<_Tp, _Seq>& __y) { return __x.c == __y.c; } /** @@ -265,36 +264,33 @@ _GLIBCXX_BEGIN_NAMESPACE(std) * std::lexicographical_compare() is usually used to make the * determination. */ - template + template inline bool - operator<(const queue<_Tp,_Sequence>& __x, const queue<_Tp,_Sequence>& __y) + operator<(const queue<_Tp, _Seq>& __x, const queue<_Tp, _Seq>& __y) { return __x.c < __y.c; } /// Based on operator== - template + template inline bool - operator!=(const queue<_Tp,_Sequence>& __x, - const queue<_Tp,_Sequence>& __y) + operator!=(const queue<_Tp, _Seq>& __x, const queue<_Tp, _Seq>& __y) { return !(__x == __y); } /// Based on operator< - template + template inline bool - operator>(const queue<_Tp,_Sequence>& __x, const queue<_Tp,_Sequence>& __y) + operator>(const queue<_Tp, _Seq>& __x, const queue<_Tp, _Seq>& __y) { return __y < __x; } /// Based on operator< - template + template inline bool - operator<=(const queue<_Tp,_Sequence>& __x, - const queue<_Tp,_Sequence>& __y) + operator<=(const queue<_Tp, _Seq>& __x, const queue<_Tp, _Seq>& __y) { return !(__y < __x); } /// Based on operator< - template + template inline bool - operator>=(const queue<_Tp,_Sequence>& __x, - const queue<_Tp,_Sequence>& __y) + operator>=(const queue<_Tp, _Seq>& __x, const queue<_Tp, _Seq>& __y) { return !(__x < __y); } /** @@ -343,7 +339,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) __glibcxx_class_requires(_Sequence, _SequenceConcept) __glibcxx_class_requires(_Sequence, _RandomAccessContainerConcept) __glibcxx_class_requires2(_Tp, _Sequence_value_type, _SameTypeConcept) - __glibcxx_class_requires4(_Compare, bool, _Tp,_Tp,_BinaryFunctionConcept) + __glibcxx_class_requires4(_Compare, bool, _Tp, _Tp, + _BinaryFunctionConcept) public: typedef typename _Sequence::value_type value_type; @@ -397,11 +394,13 @@ _GLIBCXX_BEGIN_NAMESPACE(std) * Returns true if the %queue is empty. */ bool - empty() const { return c.empty(); } + empty() const + { return c.empty(); } /** Returns the number of elements in the %queue. */ size_type - size() const { return c.size(); } + size() const + { return c.size(); } /** * Returns a read-only (constant) reference to the data at the first diff --git a/libstdc++-v3/include/bits/stl_stack.h b/libstdc++-v3/include/bits/stl_stack.h index 22e56603893..a6b5533f563 100644 --- a/libstdc++-v3/include/bits/stl_stack.h +++ b/libstdc++-v3/include/bits/stl_stack.h @@ -1,6 +1,7 @@ // Stack implementation -*- C++ -*- -// Copyright (C) 2001, 2002, 2004, 2005 Free Software Foundation, Inc. +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 +// 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,11 +74,11 @@ _GLIBCXX_BEGIN_NAMESPACE(std) template inline bool - operator==(const stack<_Tp,_Seq>& __x, const stack<_Tp,_Seq>& __y); + operator==(const stack<_Tp, _Seq>& __x, const stack<_Tp, _Seq>& __y); template inline bool - operator<(const stack<_Tp,_Seq>& __x, const stack<_Tp,_Seq>& __y); + operator<(const stack<_Tp, _Seq>& __x, const stack<_Tp, _Seq>& __y); /** * @brief A standard container giving FILO behavior. @@ -141,7 +142,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) */ explicit stack(const _Sequence& __c = _Sequence()) - : c(__c) {} + : c(__c) { } /** * Returns true if the %stack is empty. -- 2.11.4.GIT