File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -243,7 +243,11 @@ void ADIOS2IOHandlerImpl::init(
243243 }
244244 })" ;
245245 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 );
247251 }
248252
249253 if (cfg.json ().contains (" adios2" ))
@@ -422,7 +426,8 @@ auto ADIOS2IOHandlerImpl::parseDatasetConfig(
422426 adios2_config_it != parsed_config.config .end ())
423427 {
424428 auto copy = buffered_config;
425- json::merge (copy, adios2_config_it.value ());
429+ json::merge_internal (
430+ copy, adios2_config_it.value (), /* do_prune = */ false );
426431 copy = nlohmann::json{{" adios2" , std::move (copy)}};
427432 parsed_config.config = std::move (copy);
428433 }
You can’t perform that action at this time.
0 commit comments