Skip to content

Commit 5cda3b6

Browse files
committed
add unordered set
1 parent 74752d5 commit 5cda3b6

File tree

4 files changed

+20
-4
lines changed

4 files changed

+20
-4
lines changed

StructFields.pm

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,11 @@ my %custom_container_handlers = (
164164
header_ref("set");
165165
return "std::set<$item >";
166166
},
167+
'stl-unordered-set' => sub {
168+
my $item = get_container_item_type($_, -void => 'void*');
169+
header_ref("unordered_set");
170+
return "std::unordered_set<$item >";
171+
},
167172
'stl-bit-vector' => sub {
168173
header_ref("vector");
169174
return "std::vector<bool>";

df.g_src.ViewBase.xml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -255,15 +255,19 @@
255255
<class-type type-name='widget_folder' original-name='widgets::folder' inherits-from='widget'>
256256
<compound type-name='widget' name='open'/>
257257
<bool name='last_visible'/>
258-
<stl-unordered-map name='controlled_set' comment='std::unordered_set&lt;std::shared_ptr&lt;widget&gt;&gt;'/>
258+
<stl-unordered-set name='controlled_set'>
259+
<stl-shared-ptr type-name='widget'/>
260+
</stl-unordered-set>
259261
<bool name='controlled_visible'/>
260262
<compound type-name='widget_text' name='label'/>
261263
<stl-weak-ptr type-name='widget_container'/>
262264
</class-type>
263265

264266
<struct-type type-name='filter_entry'>
265267
<stl-shared-ptr type-name='widget_text' name='label'/>
266-
<stl-unordered-map name='filtered_set' comment='std::unordered_set&lt;std::shared_ptr&lt;widget&gt;&gt;'/>
268+
<stl-unordered-set name='filtered_set'>
269+
<stl-shared-ptr type-name='widget'/>
270+
</stl-unordered-set>
267271
</struct-type>
268272

269273
<class-type type-name='widget_filter' original-name='widgets::filter' inherits-from='widget'>

df.world.xml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,14 @@
340340
<stl-fs-path name='src_dir'/>
341341
<stl-vector pointer-type='stl-string' name='object_load_order_name'/>
342342
<stl-vector pointer-type='stl-string' name='object_load_order_displayed_version'/>
343-
<static-array count='23' name='token_by_mod_id'><stl-unordered-map/></static-array>
343+
<static-array count='23' name='token_by_mod_id'>
344+
<stl-unordered-map>
345+
<key-type type-name='stl-string'/>
346+
<value-type>
347+
<stl-vector type-name='stl-string'/>
348+
</value-type>
349+
</stl-unordered-map>
350+
</static-array>
344351
</struct-type>
345352

346353
<enum-type type-name='prepare_rod_stage_type' base-type='int32_t'> bay12: PrepareRodStageType

lower-1.xslt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ Error: field <xsl:value-of select='$enum-key'/> corresponds to an enum value of
340340
</xsl:template>
341341

342342
<!-- Misc containers: meta='container' subtype='$tag' -->
343-
<xsl:template match='stl-vector|stl-deque|stl-set|stl-bit-vector|stl-array|stl-optional|stl-variant|stl-shared-ptr|stl-weak-ptr|stl-function|df-flagarray|df-static-flagarray|df-array|df-linked-list'>
343+
<xsl:template match='stl-vector|stl-deque|stl-set|stl-unordered-set|stl-bit-vector|stl-array|stl-optional|stl-variant|stl-shared-ptr|stl-weak-ptr|stl-function|df-flagarray|df-static-flagarray|df-array|df-linked-list'>
344344
<xsl:param name='level' select='-1'/>
345345
<ld:field ld:meta='container'>
346346
<xsl:attribute name='ld:level'><xsl:value-of select='$level'/></xsl:attribute>

0 commit comments

Comments
 (0)