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 @@ -244,7 +244,11 @@ void ADIOS2IOHandlerImpl::init(
244
244
}
245
245
})" ;
246
246
auto init_json_shadow = nlohmann::json::parse (init_json_shadow_str);
247
- json::merge (cfg.getShadow (), init_json_shadow);
247
+ std::cout << " Will merge:\n "
248
+ << init_json_shadow << " \n into:\n "
249
+ << cfg.getShadow () << std::endl;
250
+ json::merge_internal (
251
+ cfg.getShadow (), init_json_shadow, /* do_prune = */ false );
248
252
}
249
253
250
254
if (cfg.json ().contains (" adios2" ))
@@ -423,7 +427,8 @@ auto ADIOS2IOHandlerImpl::parseDatasetConfig(
423
427
adios2_config_it != parsed_config.config .end ())
424
428
{
425
429
auto copy = buffered_config;
426
- json::merge (copy, adios2_config_it.value ());
430
+ json::merge_internal (
431
+ copy, adios2_config_it.value (), /* do_prune = */ false );
427
432
copy = nlohmann::json{{" adios2" , std::move (copy)}};
428
433
parsed_config.config = std::move (copy);
429
434
}
You can’t perform that action at this time.
0 commit comments