[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - solenv/gdb

[Michael Stahl]

 solenv/gdb/boost/ptr_container.py |    8 ++++----
 solenv/gdb/boost/unordered.py     |    4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 8767a9d98ff6d8f8cb628e7b7a1ef0ddd0a23142
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Jul 29 22:46:26 2015 +0200

    gdb pretty printers for boost can't iterate with Python 3
    
    Change-Id: Ie2d1cb7312de6f14a5c6de81eefd7a00be6f75c0
    (cherry picked from commit 396643d46a778539f2bde30569d35ec05d7d867b)
    Reviewed-on: https://gerrit.libreoffice.org/17422
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/solenv/gdb/boost/ptr_container.py b/solenv/gdb/boost/ptr_container.py
index 38f3b2f..425d812 100644
--- a/solenv/gdb/boost/ptr_container.py
+++ b/solenv/gdb/boost/ptr_container.py
@@ -70,7 +70,7 @@ class PtrStdPrinterBase(object):
             return self
 
         def __next__(self):
-            (index, value) = self.impl.next()
+            (index, value) = six.advance_iterator(self.impl)
             return (index, value.cast(self.type).dereference())
 
     def _import_std(self):
@@ -137,7 +137,7 @@ class PtrMapPrinter(PtrStdPrinterBase):
             return self
 
         def __next__(self):
-            (index, value) = self.impl.next()
+            (index, value) = six.advance_iterator(self.impl)
             if self.key:
                 value = value.cast(self.key_type)
             else:
@@ -190,7 +190,7 @@ class PtrUnorderedMapPrinter(PtrBoostPrinterBase):
 
         def __next__(self):
             if self.step:
-                self.value = self.impl.next()
+                self.value = six.advance_iterator(self.impl)
                 value = self.value[0]
             else:
                 value = self.value[1].cast(self.value_type).dereference()
@@ -216,7 +216,7 @@ class PtrUnorderedSetPrinter(PtrBoostPrinterBase):
             return self
 
         def __next__(self):
-            return ("", self.impl.next()[1].cast(self.value_type).dereference())
+            return ("", six.advance_iterator(self.impl)[1].cast(self.value_type).dereference())
 
 printer = None
 
diff --git a/solenv/gdb/boost/unordered.py b/solenv/gdb/boost/unordered.py
index c21d31a..2c56721 100644
--- a/solenv/gdb/boost/unordered.py
+++ b/solenv/gdb/boost/unordered.py
@@ -63,7 +63,7 @@ class UnorderedMapPrinter(PrinterBase):
 
         def __next__(self):
             if self.step:
-                self.value = self.impl.next()
+                self.value = six.advance_iterator(self.impl)
                 value = self.value[0]
             else:
                 value = self.value[1]
@@ -87,7 +87,7 @@ class UnorderedSetPrinter(PrinterBase):
             return self
 
         def __next__(self):
-            return ("", self.impl.next()[1])
+            return ("", six.advance_iterator(self.impl)[1])
 
 printer = None