File tree Expand file tree Collapse file tree 1 file changed +7
-2
lines changed
Expand file tree Collapse file tree 1 file changed +7
-2
lines changed Original file line number Diff line number Diff line change @@ -245,7 +245,11 @@ void ADIOS2IOHandlerImpl::init(
245245 }
246246 })" ;
247247 auto init_json_shadow = nlohmann::json::parse (init_json_shadow_str);
248- json::merge (cfg.getShadow (), init_json_shadow);
248+ std::cout << " Will merge:\n "
249+ << init_json_shadow << " \n into:\n "
250+ << cfg.getShadow () << std::endl;
251+ json::merge_internal (
252+ cfg.getShadow (), init_json_shadow, /* do_prune = */ false );
249253 }
250254
251255 if (cfg.json ().contains (" adios2" ))
@@ -454,7 +458,8 @@ auto ADIOS2IOHandlerImpl::parseDatasetConfig(
454458 adios2_config_it != parsed_config.config .end ())
455459 {
456460 auto copy = buffered_config;
457- json::merge (copy, adios2_config_it.value ());
461+ json::merge_internal (
462+ copy, adios2_config_it.value (), /* do_prune = */ false );
458463 copy = nlohmann::json{{" adios2" , std::move (copy)}};
459464 parsed_config.config = std::move (copy);
460465 }
You can’t perform that action at this time.
0 commit comments