aboutsummaryrefslogtreecommitdiff
path: root/libstdc++-v3/python
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely.gcc@gmail.com>2012-11-02 01:47:17 +0000
committerJonathan Wakely <redi@gcc.gnu.org>2012-11-02 01:47:17 +0000
commit073deae69594e1277e5b9577b99fc07db325d3f2 (patch)
treeff3b54cba8f88f4c246a412c17474d414d8198bd /libstdc++-v3/python
parent50799846a52b1d0a035050c0b94fd997c2636f9e (diff)
downloadgcc-073deae69594e1277e5b9577b99fc07db325d3f2.zip
gcc-073deae69594e1277e5b9577b99fc07db325d3f2.tar.gz
gcc-073deae69594e1277e5b9577b99fc07db325d3f2.tar.bz2
printers.py (Tr1HashtableIterator): Update.
* python/libstdcxx/v6/printers.py (Tr1HashtableIterator): Update. (StdForwardListPrinter): Likewise. From-SVN: r193087
Diffstat (limited to 'libstdc++-v3/python')
-rw-r--r--libstdc++-v3/python/libstdcxx/v6/printers.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/libstdc++-v3/python/libstdcxx/v6/printers.py b/libstdc++-v3/python/libstdcxx/v6/printers.py
index 07a5ee6..5197284 100644
--- a/libstdc++-v3/python/libstdcxx/v6/printers.py
+++ b/libstdc++-v3/python/libstdcxx/v6/printers.py
@@ -612,7 +612,7 @@ class StdStringPrinter:
class Tr1HashtableIterator:
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()
def __iter__ (self):
@@ -707,7 +707,9 @@ class StdForwardListPrinter:
self.base = elt['_M_next']
count = self.count
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):
self.val = val