Skip to content

Commit a158318

Browse files
committed
Fix after rebase: merge() -> merge_internal()
Function has been renamed on dev
1 parent 62df6e5 commit a158318

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
@@ -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 << "\ninto:\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"))
@@ -421,7 +425,8 @@ auto ADIOS2IOHandlerImpl::parseDatasetConfig(
421425
adios2_config_it != parsed_config.config.end())
422426
{
423427
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);
425430
copy = nlohmann::json{{"adios2", std::move(copy)}};
426431
parsed_config.config = std::move(copy);
427432
}

0 commit comments

Comments
 (0)