summaryrefslogtreecommitdiff
path: root/share/qtcreator/debugger/stdtypes.py
diff options
context:
space:
mode:
authorhjk <hjk121@nokiamail.com>2014-12-01 12:17:56 +0100
committerhjk <hjk121@nokiamail.com>2014-12-03 12:08:08 +0100
commit3d4cedb1f065a87c95daafbadd7aeb0bc044c969 (patch)
tree0a453259524fcfb7ba09063e9e257447834cfb8d /share/qtcreator/debugger/stdtypes.py
parentcfe29cc936cf951e16a67295c16e2edd561a187b (diff)
downloadqt-creator-3d4cedb1f065a87c95daafbadd7aeb0bc044c969.tar.gz
Debugger: Fix map dumper with LLDB-320.x
The underlying problem here is still that we can deduce the item type from the map type except by string manipulation and type lookup. Which fails at times. Change-Id: Ibe6a8ca1fbd84c43c7d31b65e017792d1b6a1e0b Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Diffstat (limited to 'share/qtcreator/debugger/stdtypes.py')
-rw-r--r--share/qtcreator/debugger/stdtypes.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/share/qtcreator/debugger/stdtypes.py b/share/qtcreator/debugger/stdtypes.py
index 362e9caa55..e7ed0ff2c8 100644
--- a/share/qtcreator/debugger/stdtypes.py
+++ b/share/qtcreator/debugger/stdtypes.py
@@ -281,15 +281,15 @@ def qdump__std__multimap(d, value):
return qdump__std__map(d, value)
def stdTreeIteratorHelper(d, value):
- node = value["_M_node"].dereference()
+ node = value["_M_node"]
d.putNumChild(1)
d.putEmptyValue()
if d.isExpanded():
- nodeTypeName = str(value.type).replace("_Rb_tree_iterator", "_Rb_tree_node", 1)
- nodeTypeName = nodeTypeName.replace("_Rb_tree_const_iterator", "_Rb_tree_node", 1)
- nodeType = d.lookupType(nodeTypeName)
- data = node.cast(nodeType)["_M_value_field"]
with Children(d):
+ nodeTypeName = str(value.type).replace("_Rb_tree_iterator", "_Rb_tree_node", 1)
+ nodeTypeName = nodeTypeName.replace("_Rb_tree_const_iterator", "_Rb_tree_node", 1)
+ nodeType = d.lookupType(nodeTypeName + '*')
+ data = node.cast(nodeType).dereference()["_M_value_field"]
first = d.childWithName(data, "first")
if first:
d.putSubItem("first", first)