Kaydet (Commit) 396643d4 authored tarafından Michael Stahl's avatar Michael Stahl

gdb pretty printers for boost can't iterate with Python 3

Change-Id: Ie2d1cb7312de6f14a5c6de81eefd7a00be6f75c0
üst 12047823
...@@ -70,7 +70,7 @@ class PtrStdPrinterBase(object): ...@@ -70,7 +70,7 @@ class PtrStdPrinterBase(object):
return self return self
def __next__(self): def __next__(self):
(index, value) = self.impl.next() (index, value) = six.advance_iterator(self.impl)
return (index, value.cast(self.type).dereference()) return (index, value.cast(self.type).dereference())
def _import_std(self): def _import_std(self):
...@@ -137,7 +137,7 @@ class PtrMapPrinter(PtrStdPrinterBase): ...@@ -137,7 +137,7 @@ class PtrMapPrinter(PtrStdPrinterBase):
return self return self
def __next__(self): def __next__(self):
(index, value) = self.impl.next() (index, value) = six.advance_iterator(self.impl)
if self.key: if self.key:
value = value.cast(self.key_type) value = value.cast(self.key_type)
else: else:
...@@ -190,7 +190,7 @@ class PtrUnorderedMapPrinter(PtrBoostPrinterBase): ...@@ -190,7 +190,7 @@ class PtrUnorderedMapPrinter(PtrBoostPrinterBase):
def __next__(self): def __next__(self):
if self.step: if self.step:
self.value = self.impl.next() self.value = six.advance_iterator(self.impl)
value = self.value[0] value = self.value[0]
else: else:
value = self.value[1].cast(self.value_type).dereference() value = self.value[1].cast(self.value_type).dereference()
...@@ -216,7 +216,7 @@ class PtrUnorderedSetPrinter(PtrBoostPrinterBase): ...@@ -216,7 +216,7 @@ class PtrUnorderedSetPrinter(PtrBoostPrinterBase):
return self return self
def __next__(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 printer = None
......
...@@ -63,7 +63,7 @@ class UnorderedMapPrinter(PrinterBase): ...@@ -63,7 +63,7 @@ class UnorderedMapPrinter(PrinterBase):
def __next__(self): def __next__(self):
if self.step: if self.step:
self.value = self.impl.next() self.value = six.advance_iterator(self.impl)
value = self.value[0] value = self.value[0]
else: else:
value = self.value[1] value = self.value[1]
...@@ -87,7 +87,7 @@ class UnorderedSetPrinter(PrinterBase): ...@@ -87,7 +87,7 @@ class UnorderedSetPrinter(PrinterBase):
return self return self
def __next__(self): def __next__(self):
return ("", self.impl.next()[1]) return ("", six.advance_iterator(self.impl)[1])
printer = None printer = None
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment