Skip to content

Commit f6cc4c6

Browse files
thewtexthewtex
committed
build(MetaDataDictionaryCBOR): address MSVC build errors
 D:\a\ITK-Wasm\ITK-Wasm\src\itkMetaDataDictionaryCBOR.cxx(65): error C4576: a parenthesized type followed by an initializer list is a non-standard explicit type conversion syntax
1 parent ccf3d51 commit f6cc4c6

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed

‎src/itkMetaDataDictionaryCBOR.cxx

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ metaDataDictionaryToCBOR(const itk::MetaDataDictionary & dictionary, cbor_item_t
6262
const bool value = boolValue->GetMetaDataObjectValue();
6363
cbor_item_t* keyItem = cbor_build_string(key.c_str());
6464
cbor_item_t* valueItem = cbor_build_bool(value);
65-
cbor_map_add(metaDataCBOR, (struct cbor_pair){.key = keyItem, .value = valueItem});
65+
cbor_map_add(metaDataCBOR, cbor_pair{cbor_move(keyItem), cbor_move(valueItem)});
6666
++itr;
6767
continue;
6868
}
@@ -73,7 +73,7 @@ metaDataDictionaryToCBOR(const itk::MetaDataDictionary & dictionary, cbor_item_t
7373
const double value = doubleValue->GetMetaDataObjectValue();
7474
cbor_item_t* keyItem = cbor_build_string(key.c_str());
7575
cbor_item_t* valueItem = cbor_build_float8(value);
76-
cbor_map_add(metaDataCBOR, (struct cbor_pair){.key = keyItem, .value = valueItem});
76+
cbor_map_add(metaDataCBOR, cbor_pair{cbor_move(keyItem), cbor_move(valueItem)});
7777
++itr;
7878
continue;
7979
}
@@ -84,7 +84,7 @@ metaDataDictionaryToCBOR(const itk::MetaDataDictionary & dictionary, cbor_item_t
8484
const std::string value = stringValue->GetMetaDataObjectValue();
8585
cbor_item_t* keyItem = cbor_build_string(key.c_str());
8686
cbor_item_t* valueItem = cbor_build_string(value.c_str());
87-
cbor_map_add(metaDataCBOR, (struct cbor_pair){.key = keyItem, .value = valueItem});
87+
cbor_map_add(metaDataCBOR, cbor_pair{cbor_move(keyItem), cbor_move(valueItem)});
8888
++itr;
8989
continue;
9090
}
@@ -101,7 +101,7 @@ metaDataDictionaryToCBOR(const itk::MetaDataDictionary & dictionary, cbor_item_t
101101
cbor_array_push(arrayItem, cbor_build_float8(v));
102102
}
103103

104-
cbor_map_add(metaDataCBOR, (struct cbor_pair){.key = keyItem, .value = arrayItem});
104+
cbor_map_add(metaDataCBOR, cbor_pair{cbor_move(keyItem), cbor_move(arrayItem)});
105105
++itr;
106106
continue;
107107
}
@@ -118,7 +118,7 @@ metaDataDictionaryToCBOR(const itk::MetaDataDictionary & dictionary, cbor_item_t
118118
cbor_array_push(arrayItem, cbor_build_string(s.c_str()));
119119
}
120120

121-
cbor_map_add(metaDataCBOR, (struct cbor_pair){.key = keyItem, .value = arrayItem});
121+
cbor_map_add(metaDataCBOR, cbor_pair{cbor_move(keyItem), cbor_move(arrayItem)});
122122
++itr;
123123
continue;
124124
}
@@ -140,7 +140,7 @@ metaDataDictionaryToCBOR(const itk::MetaDataDictionary & dictionary, cbor_item_t
140140
cbor_array_push(arrayItem, innerArrayItem);
141141
}
142142

143-
cbor_map_add(metaDataCBOR, (struct cbor_pair){.key = keyItem, .value = arrayItem});
143+
cbor_map_add(metaDataCBOR, cbor_pair{cbor_move(keyItem), cbor_move(arrayItem)});
144144
++itr;
145145
continue;
146146
}
@@ -151,7 +151,7 @@ metaDataDictionaryToCBOR(const itk::MetaDataDictionary & dictionary, cbor_item_t
151151
const unsigned char value = ucharValue->GetMetaDataObjectValue();
152152
cbor_item_t* keyItem = cbor_build_string(key.c_str());
153153
cbor_item_t* valueItem = cbor_build_uint8(value);
154-
cbor_map_add(metaDataCBOR, (struct cbor_pair){.key = keyItem, .value = valueItem});
154+
cbor_map_add(metaDataCBOR, cbor_pair{cbor_move(keyItem), cbor_move(valueItem)});
155155
++itr;
156156
continue;
157157
}
@@ -161,7 +161,7 @@ metaDataDictionaryToCBOR(const itk::MetaDataDictionary & dictionary, cbor_item_t
161161
const char value = charValue->GetMetaDataObjectValue();
162162
cbor_item_t* keyItem = cbor_build_string(key.c_str());
163163
cbor_item_t* valueItem = cbor_build_uint8(value);
164-
cbor_map_add(metaDataCBOR, (struct cbor_pair){.key = keyItem, .value = valueItem});
164+
cbor_map_add(metaDataCBOR, cbor_pair{cbor_move(keyItem), cbor_move(valueItem)});
165165
++itr;
166166
continue;
167167
}
@@ -171,7 +171,7 @@ metaDataDictionaryToCBOR(const itk::MetaDataDictionary & dictionary, cbor_item_t
171171
const signed char value = signedCharValue->GetMetaDataObjectValue();
172172
cbor_item_t* keyItem = cbor_build_string(key.c_str());
173173
cbor_item_t* valueItem = cbor_build_uint8(value);
174-
cbor_map_add(metaDataCBOR, (struct cbor_pair){.key = keyItem, .value = valueItem});
174+
cbor_map_add(metaDataCBOR, cbor_pair{cbor_move(keyItem), cbor_move(valueItem)});
175175
++itr;
176176
continue;
177177
}
@@ -181,7 +181,7 @@ metaDataDictionaryToCBOR(const itk::MetaDataDictionary & dictionary, cbor_item_t
181181
const unsigned short value = ushortValue->GetMetaDataObjectValue();
182182
cbor_item_t* keyItem = cbor_build_string(key.c_str());
183183
cbor_item_t* valueItem = cbor_build_uint16(value);
184-
cbor_map_add(metaDataCBOR, (struct cbor_pair){.key = keyItem, .value = valueItem});
184+
cbor_map_add(metaDataCBOR, cbor_pair{cbor_move(keyItem), cbor_move(valueItem)});
185185
++itr;
186186
continue;
187187
}
@@ -191,7 +191,7 @@ metaDataDictionaryToCBOR(const itk::MetaDataDictionary & dictionary, cbor_item_t
191191
const short value = shortValue->GetMetaDataObjectValue();
192192
cbor_item_t* keyItem = cbor_build_string(key.c_str());
193193
cbor_item_t* valueItem = cbor_build_uint16(value);
194-
cbor_map_add(metaDataCBOR, (struct cbor_pair){.key = keyItem, .value = valueItem});
194+
cbor_map_add(metaDataCBOR, cbor_pair{cbor_move(keyItem), cbor_move(valueItem)});
195195
++itr;
196196
continue;
197197
}
@@ -201,7 +201,7 @@ metaDataDictionaryToCBOR(const itk::MetaDataDictionary & dictionary, cbor_item_t
201201
const unsigned long value = ulongValue->GetMetaDataObjectValue();
202202
cbor_item_t* keyItem = cbor_build_string(key.c_str());
203203
cbor_item_t* valueItem = cbor_build_uint32(value);
204-
cbor_map_add(metaDataCBOR, (struct cbor_pair){.key = keyItem, .value = valueItem});
204+
cbor_map_add(metaDataCBOR, cbor_pair{cbor_move(keyItem), cbor_move(valueItem)});
205205
++itr;
206206
continue;
207207
}
@@ -211,7 +211,7 @@ metaDataDictionaryToCBOR(const itk::MetaDataDictionary & dictionary, cbor_item_t
211211
const long value = longValue->GetMetaDataObjectValue();
212212
cbor_item_t* keyItem = cbor_build_string(key.c_str());
213213
cbor_item_t* valueItem = cbor_build_uint32(value);
214-
cbor_map_add(metaDataCBOR, (struct cbor_pair){.key = keyItem, .value = valueItem});
214+
cbor_map_add(metaDataCBOR, cbor_pair{cbor_move(keyItem), cbor_move(valueItem)});
215215
++itr;
216216
continue;
217217
}
@@ -221,7 +221,7 @@ metaDataDictionaryToCBOR(const itk::MetaDataDictionary & dictionary, cbor_item_t
221221
const unsigned long long value = ulongLongValue->GetMetaDataObjectValue();
222222
cbor_item_t* keyItem = cbor_build_string(key.c_str());
223223
cbor_item_t* valueItem = cbor_build_uint64(value);
224-
cbor_map_add(metaDataCBOR, (struct cbor_pair){.key = keyItem, .value = valueItem});
224+
cbor_map_add(metaDataCBOR, cbor_pair{cbor_move(keyItem), cbor_move(valueItem)});
225225
++itr;
226226
continue;
227227
}
@@ -231,7 +231,7 @@ metaDataDictionaryToCBOR(const itk::MetaDataDictionary & dictionary, cbor_item_t
231231
const long long value = longLongValue->GetMetaDataObjectValue();
232232
cbor_item_t* keyItem = cbor_build_string(key.c_str());
233233
cbor_item_t* valueItem = cbor_build_uint64(value);
234-
cbor_map_add(metaDataCBOR, (struct cbor_pair){.key = keyItem, .value = valueItem});
234+
cbor_map_add(metaDataCBOR, cbor_pair{cbor_move(keyItem), cbor_move(valueItem)});
235235
++itr;
236236
continue;
237237
}
@@ -247,7 +247,7 @@ metaDataDictionaryToCBOR(const itk::MetaDataDictionary & dictionary, cbor_item_t
247247
cbor_array_push(arrayItem, cbor_build_uint8(v));
248248
}
249249

250-
cbor_map_add(metaDataCBOR, (struct cbor_pair){.key = keyItem, .value = arrayItem});
250+
cbor_map_add(metaDataCBOR, cbor_pair{cbor_move(keyItem), cbor_move(arrayItem)});
251251
++itr;
252252
continue;
253253
}
@@ -263,7 +263,7 @@ metaDataDictionaryToCBOR(const itk::MetaDataDictionary & dictionary, cbor_item_t
263263
cbor_array_push(arrayItem, cbor_build_float8(v));
264264
}
265265

266-
cbor_map_add(metaDataCBOR, (struct cbor_pair){.key = keyItem, .value = arrayItem});
266+
cbor_map_add(metaDataCBOR, cbor_pair{cbor_move(keyItem), cbor_move(arrayItem)});
267267
++itr;
268268
continue;
269269
}
@@ -279,7 +279,7 @@ metaDataDictionaryToCBOR(const itk::MetaDataDictionary & dictionary, cbor_item_t
279279
cbor_array_push(arrayItem, cbor_build_float8(v));
280280
}
281281

282-
cbor_map_add(metaDataCBOR, (struct cbor_pair){.key = keyItem, .value = arrayItem});
282+
cbor_map_add(metaDataCBOR, cbor_pair{cbor_move(keyItem), cbor_move(arrayItem)});
283283
++itr;
284284
continue;
285285
}
@@ -300,7 +300,7 @@ metaDataDictionaryToCBOR(const itk::MetaDataDictionary & dictionary, cbor_item_t
300300
cbor_array_push(arrayItem, innerArrayItem);
301301
}
302302

303-
cbor_map_add(metaDataCBOR, (struct cbor_pair){.key = keyItem, .value = arrayItem});
303+
cbor_map_add(metaDataCBOR, cbor_pair{cbor_move(keyItem), cbor_move(arrayItem)});
304304
++itr;
305305
continue;
306306
}
@@ -321,7 +321,7 @@ metaDataDictionaryToCBOR(const itk::MetaDataDictionary & dictionary, cbor_item_t
321321
cbor_array_push(arrayItem, innerArrayItem);
322322
}
323323

324-
cbor_map_add(metaDataCBOR, (struct cbor_pair){.key = keyItem, .value = arrayItem});
324+
cbor_map_add(metaDataCBOR, cbor_pair{cbor_move(keyItem), cbor_move(arrayItem)});
325325
++itr;
326326
continue;
327327
}

0 commit comments

Comments
 (0)