Skip to content

Commit d5848e2

Browse files
committed
Merge pull request #110882 from nikitalita/patch-4
Fix HashMap/HashSet in natvis after member renames
2 parents ecfe34f + a75e6be commit d5848e2

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

platform/windows/godot.natvis

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@
3232

3333
<Type Name="Dictionary">
3434
<Expand>
35-
<Item Name="[size]">_p &amp;&amp; _p->variant_map.head_element ? _p->variant_map.num_elements : 0</Item>
35+
<Item Name="[size]">_p &amp;&amp; _p->variant_map._head_element ? _p->variant_map._size : 0</Item>
3636
<LinkedListItems>
37-
<Size>_p &amp;&amp; _p->variant_map.head_element ? _p->variant_map.num_elements : 0</Size>
38-
<HeadPointer>_p ? _p->variant_map.head_element : nullptr</HeadPointer>
37+
<Size>_p &amp;&amp; _p->variant_map._head_element ? _p->variant_map._size : 0</Size>
38+
<HeadPointer>_p ? _p->variant_map._head_element : nullptr</HeadPointer>
3939
<NextPointer>next</NextPointer>
4040
<ValueNode Name="[{data.key}]">(*this),view(MapHelper)</ValueNode>
4141
</LinkedListItems>
@@ -93,10 +93,10 @@
9393

9494
<Type Name="HashSet&lt;*,*,*&gt;">
9595
<Expand>
96-
<Item Name="[size]">num_elements</Item>
96+
<Item Name="[size]">_size</Item>
9797
<ArrayItems>
98-
<Size>num_elements</Size>
99-
<ValuePointer>($T1 *) keys._cowdata._ptr</ValuePointer>
98+
<Size>_size</Size>
99+
<ValuePointer>($T1 *) _keys._cowdata._ptr</ValuePointer>
100100
</ArrayItems>
101101
</Expand>
102102
</Type>
@@ -112,10 +112,10 @@
112112
<!-- elements displayed by index -->
113113
<Type Name="HashMap&lt;*,*,*,*,*&gt;" Priority="Medium">
114114
<Expand>
115-
<Item Name="[size]">head_element ? num_elements : 0</Item>
115+
<Item Name="[size]">_head_element ? _size : 0</Item>
116116
<LinkedListItems>
117-
<Size>head_element ? num_elements : 0</Size>
118-
<HeadPointer>head_element</HeadPointer>
117+
<Size>_head_element ? _size : 0</Size>
118+
<HeadPointer>_head_element</HeadPointer>
119119
<NextPointer>next</NextPointer>
120120
<ValueNode>(*this)</ValueNode>
121121
</LinkedListItems>
@@ -126,10 +126,10 @@
126126
<!-- show elements by index by specifying "ShowElementsByIndex"-->
127127
<Type Name="HashMap&lt;*,*,*,*,*&gt;" ExcludeView="ShowElementsByIndex" Priority="MediumHigh">
128128
<Expand>
129-
<Item Name="[size]">head_element ? num_elements : 0</Item>
129+
<Item Name="[size]">_head_element ? _size : 0</Item>
130130
<LinkedListItems>
131-
<Size>head_element ? num_elements : 0</Size>
132-
<HeadPointer>head_element</HeadPointer>
131+
<Size>_head_element ? _size : 0</Size>
132+
<HeadPointer>_head_element</HeadPointer>
133133
<NextPointer>next</NextPointer>
134134
<ValueNode Name="[{data.key}]">(*this),view(MapHelper)</ValueNode>
135135
</LinkedListItems>

0 commit comments

Comments
 (0)