diff options
| author | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-10-28 13:20:31 +0000 |
|---|---|---|
| committer | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-10-28 13:20:31 +0000 |
| commit | ded5331d868e06e38a20f0b15f5d83fe15c1416a (patch) | |
| tree | 07aa5871475d9ac99e00cee5af64f9a5ac9ed086 /libstdc++-v3/python/libstdcxx | |
| parent | db2db13c84ac7d48062a1056a03cb24cb04aaf60 (diff) | |
| download | ppe42-gcc-ded5331d868e06e38a20f0b15f5d83fe15c1416a.tar.gz ppe42-gcc-ded5331d868e06e38a20f0b15f5d83fe15c1416a.zip | |
PR libstdc++/55041
* python/libstdcxx/v6/printers.py (Tr1UnorderedMapPrinter): Update
to handle hashtable as member of unordered_map not base class.
(Tr1UnorderedSetPrinter): Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@192894 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/python/libstdcxx')
| -rw-r--r-- | libstdc++-v3/python/libstdcxx/v6/printers.py | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/libstdc++-v3/python/libstdcxx/v6/printers.py b/libstdc++-v3/python/libstdcxx/v6/printers.py index 0eac413bf4a..07a5ee62f35 100644 --- a/libstdc++-v3/python/libstdcxx/v6/printers.py +++ b/libstdc++-v3/python/libstdcxx/v6/printers.py @@ -633,8 +633,13 @@ class Tr1UnorderedSetPrinter: self.typename = typename self.val = val + def hashtable (self): + if self.typename.startswith('std::tr1'): + return self.val + return self.val['_M_h'] + def to_string (self): - return '%s with %d elements' % (self.typename, self.val['_M_element_count']) + return '%s with %d elements' % (self.typename, self.hashtable()['_M_element_count']) @staticmethod def format_count (i): @@ -642,7 +647,7 @@ class Tr1UnorderedSetPrinter: def children (self): counter = itertools.imap (self.format_count, itertools.count()) - return itertools.izip (counter, Tr1HashtableIterator (self.val)) + return itertools.izip (counter, Tr1HashtableIterator (self.hashtable())) class Tr1UnorderedMapPrinter: "Print a tr1::unordered_map" @@ -651,8 +656,13 @@ class Tr1UnorderedMapPrinter: self.typename = typename self.val = val + def hashtable (self): + if self.typename.startswith('std::tr1'): + return self.val + return self.val['_M_h'] + def to_string (self): - return '%s with %d elements' % (self.typename, self.val['_M_element_count']) + return '%s with %d elements' % (self.typename, self.hashtable()['_M_element_count']) @staticmethod def flatten (list): @@ -671,7 +681,7 @@ class Tr1UnorderedMapPrinter: def children (self): counter = itertools.imap (self.format_count, itertools.count()) # Map over the hash table and flatten the result. - data = self.flatten (itertools.imap (self.format_one, Tr1HashtableIterator (self.val))) + data = self.flatten (itertools.imap (self.format_one, Tr1HashtableIterator (self.hashtable()))) # Zip the two iterators together. return itertools.izip (counter, data) |
