diff --git a/gcc41-rh231818.patch b/gcc41-rh231818.patch index cbd7b82..f7b4226 100644 --- a/gcc41-rh231818.patch +++ b/gcc41-rh231818.patch @@ -86,24 +86,6 @@ else --- libjava/classpath/gnu/java/awt/peer/gtk/ComponentGraphics.java 16 Mar 2007 15:14:53 -0000 1.25 +++ libjava/classpath/gnu/java/awt/peer/gtk/ComponentGraphics.java 2 Apr 2007 19:39:26 -0000 1.26 -@@ -114,7 +114,7 @@ public class ComponentGraphics extends C - - private void lock() - { -- Integer i = (Integer) hasLock.get(); -+ Integer i = hasLock.get(); - if (i == null) - { - start_gdk_drawing(); -@@ -126,7 +126,7 @@ public class ComponentGraphics extends C - - private void unlock() - { -- Integer i = (Integer) hasLock.get(); -+ Integer i = hasLock.get(); - if (i == null) - throw new IllegalStateException(); - if (i == ONE) @@ -134,6 +134,8 @@ public class ComponentGraphics extends C hasLock.set(null); end_gdk_drawing(); diff --git a/gcc41-rh234515.patch b/gcc41-rh234515.patch index 596f038..e2a241d 100644 --- a/gcc41-rh234515.patch +++ b/gcc41-rh234515.patch @@ -7,15 +7,15 @@ --- libstdc++-v3/include/bits/deque.tcc (revision 121146) +++ libstdc++-v3/include/bits/deque.tcc (revision 121147) -@@ -143,7 +143,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GL - { +@@ -142,7 +142,7 @@ namespace _GLIBCXX_STD const difference_type __n = __last - __first; - const difference_type __elems_before = __first - begin(); + const difference_type __elems_before = (__first + - this->_M_impl._M_start); - if (static_cast(__elems_before) < (size() - __n) / 2) + if (static_cast(__elems_before) <= (size() - __n) / 2) { - if (__first != begin()) - std::copy_backward(begin(), __first, __last); + std::copy_backward(this->_M_impl._M_start, __first, __last); + iterator __new_start = this->_M_impl._M_start + __n; --- libstdc++-v3/testsuite/23_containers/deque/modifiers/erase/3.cc (revision 0) +++ libstdc++-v3/testsuite/23_containers/deque/modifiers/erase/3.cc (revision 121147) @@ -0,0 +1,52 @@