File tree 1 file changed +7
-2
lines changed
1 file changed +7
-2
lines changed Original file line number Diff line number Diff line change @@ -243,7 +243,11 @@ void ADIOS2IOHandlerImpl::init(
243
243
}
244
244
})" ;
245
245
auto init_json_shadow = nlohmann::json::parse (init_json_shadow_str);
246
- json::merge (cfg.getShadow (), init_json_shadow);
246
+ std::cout << " Will merge:\n "
247
+ << init_json_shadow << " \n into:\n "
248
+ << cfg.getShadow () << std::endl;
249
+ json::merge_internal (
250
+ cfg.getShadow (), init_json_shadow, /* do_prune = */ false );
247
251
}
248
252
249
253
if (cfg.json ().contains (" adios2" ))
@@ -421,7 +425,8 @@ auto ADIOS2IOHandlerImpl::parseDatasetConfig(
421
425
adios2_config_it != parsed_config.config .end ())
422
426
{
423
427
auto copy = buffered_config;
424
- json::merge (copy, adios2_config_it.value ());
428
+ json::merge_internal (
429
+ copy, adios2_config_it.value (), /* do_prune = */ false );
425
430
copy = nlohmann::json{{" adios2" , std::move (copy)}};
426
431
parsed_config.config = std::move (copy);
427
432
}
You can’t perform that action at this time.
0 commit comments