[multiple changes]

2004-11-19  Chris Jefferson  <chris@bubblescope.net>

	* include/bits/stl_list.h (list::back, list::back const):
	Don't decrement temporary.

2004-11-19  Paolo Carlini  <pcarlini@suse.de>

	* include/bits/stl_deque.h (deque::front, deque::front const,
	deque::back, deque::back const): Slightly tweak for stylistic
	consistency.

From-SVN: r90917

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 638c420e0c983f3fa14f4c0d30727990ea9b1051..5159a49eb181a32eaee2f854e25aa6fc99f32704 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,14 @@
+2004-11-19  Chris Jefferson  <chris@bubblescope.net>
+
+       * include/bits/stl_list.h (list::back, list::back const):
+       Don't decrement temporary.
+
+2004-11-19  Paolo Carlini  <pcarlini@suse.de>
+
+       * include/bits/stl_deque.h (deque::front, deque::front const,
+       deque::back, deque::back const): Slightly tweak for stylistic
+       consistency.
+
 2004-11-18  Paolo Carlini  <pcarlini@suse.de>
 
        * testsuite/26_numerics/numeric/sum_diff.cc: Use VERIFY.

diff --git a/libstdc++-v3/include/bits/stl_deque.h b/libstdc++-v3/include/bits/stl_deque.h
index 8b50fb51bb5d9d69ac58de77429f5ac8833ec433..b31143898571664ed5ff580fb616d300b4e69bb3 100644 (file)
--- a/libstdc++-v3/include/bits/stl_deque.h
+++ b/libstdc++-v3/include/bits/stl_deque.h
@@ -970,7 +970,7 @@ namespace _GLIBCXX_STD
        */
       reference
       front()
-      { return *this->_M_impl._M_start; }
+      { return *begin(); }
 
       /**
        *  Returns a read-only (constant) reference to the data at the first
@@ -978,7 +978,7 @@ namespace _GLIBCXX_STD
        */
       const_reference
       front() const
-      { return *this->_M_impl._M_start; }
+      { return *begin(); }
 
       /**
        *  Returns a read/write reference to the data at the last element of the
@@ -987,7 +987,7 @@ namespace _GLIBCXX_STD
       reference
       back()
       {
-       iterator __tmp = this->_M_impl._M_finish;
+       iterator __tmp = end();
        --__tmp;
        return *__tmp;
       }
@@ -999,7 +999,7 @@ namespace _GLIBCXX_STD
       const_reference
       back() const
       {
-       const_iterator __tmp = this->_M_impl._M_finish;
+       const_iterator __tmp = end();
        --__tmp;
        return *__tmp;
       }

diff --git a/libstdc++-v3/include/bits/stl_list.h b/libstdc++-v3/include/bits/stl_list.h
index 07185dd3efde906d25dfd91203d9eacc58c2f6a2..ff6a0dfeb8f34e9ed563b594c350bf43d71fe1ae 100644 (file)
--- a/libstdc++-v3/include/bits/stl_list.h
+++ b/libstdc++-v3/include/bits/stl_list.h
@@ -707,7 +707,11 @@ namespace _GLIBCXX_STD
        */
       reference
       back()
-      { return *(--end()); }
+      { 
+       iterator __tmp = end();
+       --__tmp;
+       return *__tmp;
+      }
 
       /**
        *  Returns a read-only (constant) reference to the data at the last
@@ -715,7 +719,11 @@ namespace _GLIBCXX_STD
        */
       const_reference
       back() const
-      { return *(--end()); }
+      { 
+       const_iterator __tmp = end();
+       --__tmp;
+       return *__tmp;
+      }
 
       // [23.2.2.3] modifiers
       /**