Skip to content

Commit c36d62d

Browse files
committed
Fix after rebase: merge() -> merge_internal()
Function has been renamed on dev
1 parent 52828d6 commit c36d62d

1 file changed

Lines changed: 7 additions & 2 deletions

File tree

src/IO/ADIOS/ADIOS2IOHandler.cpp

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff 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 << "\ninto:\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"))
@@ -424,7 +428,8 @@ auto ADIOS2IOHandlerImpl::parseDatasetConfig(
424428
adios2_config_it != parsed_config.config.end())
425429
{
426430
auto copy = buffered_config;
427-
json::merge(copy, adios2_config_it.value());
431+
json::merge_internal(
432+
copy, adios2_config_it.value(), /* do_prune = */ false);
428433
copy = nlohmann::json{{"adios2", std::move(copy)}};
429434
parsed_config.config = std::move(copy);
430435
}

0 commit comments

Comments
 (0)