Skip to content

Commit c007e41

Browse files
committed
Fix after rebase: merge() -> merge_internal()
Function has been renamed on dev
1 parent 83ab8ab commit c007e41

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

src/IO/ADIOS/ADIOS2IOHandler.cpp

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,11 @@ void ADIOS2IOHandlerImpl::init(
244244
}
245245
})";
246246
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 << "\ninto:\n"
249+
<< cfg.getShadow() << std::endl;
250+
json::merge_internal(
251+
cfg.getShadow(), init_json_shadow, /* do_prune = */ false);
248252
}
249253

250254
if (cfg.json().contains("adios2"))
@@ -423,7 +427,8 @@ auto ADIOS2IOHandlerImpl::parseDatasetConfig(
423427
adios2_config_it != parsed_config.config.end())
424428
{
425429
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);
427432
copy = nlohmann::json{{"adios2", std::move(copy)}};
428433
parsed_config.config = std::move(copy);
429434
}

0 commit comments

Comments
 (0)