git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

printers.py (Tr1HashtableIterator): Update. 

* python/libstdcxx/v6/printers.py (Tr1HashtableIterator): Update.
	(StdForwardListPrinter): Likewise.

From-SVN: r193087
This commit is contained in:
Jonathan Wakely 2012-11-02 01:47:17 +00:00 committed by Jonathan Wakely
parent 50799846a5
commit 073deae695
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,8 @@
2012-11-02 Jonathan Wakely <jwakely.gcc@gmail.com>
* python/libstdcxx/v6/printers.py (Tr1HashtableIterator): Update.
(StdForwardListPrinter): Likewise.
2012-11-02 Jonathan Wakely <jwakely.gcc@gmail.com> 2012-11-02 Jonathan Wakely <jwakely.gcc@gmail.com>
* include/bits/forward_list.h (forward_list(size_type)): Add missing * include/bits/forward_list.h (forward_list(size_type)): Add missing

6
libstdc++-v3/python/libstdcxx/v6/printers.py
View File

@ -612,7 +612,7 @@ class StdStringPrinter:
class Tr1HashtableIterator: class Tr1HashtableIterator:
def __init__ (self, hash): def __init__ (self, hash):
self.node = hash['_M_before_begin']['_M_nxt'] self.node = hash['_M_bbegin']['_M_node']['_M_nxt']
self.node_type = find_type(hash.type, '__node_type').pointer() self.node_type = find_type(hash.type, '__node_type').pointer()
def __iter__ (self): def __iter__ (self):
@ -707,7 +707,9 @@ class StdForwardListPrinter:
self.base = elt['_M_next'] self.base = elt['_M_next']
count = self.count count = self.count
self.count = self.count + 1 self.count = self.count + 1
return ('[%d]' % count, elt['_M_value']) valptr = elt['_M_storage'].address
valptr = valptr.cast(elt.type.template_argument(0).pointer())
return ('[%d]' % count, valptr.dereference())
def __init__(self, typename, val): def __init__(self, typename, val):
self.val = val self.val = val