Skip to content

Commit cc673cb

Browse files
committed
Adapt constructors for installation without ADIOS2/HDF5
1 parent 3acfc2c commit cc673cb

3 files changed

Lines changed: 10 additions & 22 deletions

File tree

src/IO/ADIOS/ADIOS2IOHandler.cpp

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2110,27 +2110,25 @@ ADIOS2IOHandler::ADIOS2IOHandler(
21102110
std::string path,
21112111
Access at,
21122112
MPI_Comm comm,
2113-
// NOLINTNEXTLINE(performance-unnecessary-value-param)
2114-
json::TracingJSON,
2113+
json::TracingJSON config,
21152114
// NOLINTNEXTLINE(performance-unnecessary-value-param)
21162115
std::string,
21172116
// NOLINTNEXTLINE(performance-unnecessary-value-param)
21182117
std::string)
2119-
: AbstractIOHandler(std::move(path), at, comm)
2118+
: AbstractIOHandler(std::move(path), at, std::move(config), comm)
21202119
{}
21212120

21222121
#endif // openPMD_HAVE_MPI
21232122

21242123
ADIOS2IOHandler::ADIOS2IOHandler(
21252124
std::string path,
21262125
Access at,
2127-
// NOLINTNEXTLINE(performance-unnecessary-value-param)
2128-
json::TracingJSON,
2126+
json::TracingJSON config,
21292127
// NOLINTNEXTLINE(performance-unnecessary-value-param)
21302128
std::string,
21312129
// NOLINTNEXTLINE(performance-unnecessary-value-param)
21322130
std::string)
2133-
: AbstractIOHandler(std::move(path), at)
2131+
: AbstractIOHandler(std::move(path), at, std::move(config))
21342132
{}
21352133

21362134
std::future<void> ADIOS2IOHandler::flush(internal::ParsedFlushParams &)

src/IO/HDF5/HDF5IOHandler.cpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2954,11 +2954,8 @@ std::future<void> HDF5IOHandler::flush(internal::ParsedFlushParams &)
29542954
#else
29552955

29562956
HDF5IOHandler::HDF5IOHandler(
2957-
std::string path,
2958-
Access at,
2959-
// NOLINTNEXTLINE(performance-unnecessary-value-param)
2960-
[[maybe_unused]] json::TracingJSON config)
2961-
: AbstractIOHandler(std::move(path), at)
2957+
std::string path, Access at, json::TracingJSON config)
2958+
: AbstractIOHandler(std::move(path), at, std::move(config))
29622959
{
29632960
throw std::runtime_error("openPMD-api built without HDF5 support");
29642961
}

src/IO/HDF5/ParallelHDF5IOHandler.cpp

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -359,22 +359,15 @@ ParallelHDF5IOHandlerImpl::~ParallelHDF5IOHandlerImpl()
359359

360360
#if openPMD_HAVE_MPI
361361
ParallelHDF5IOHandler::ParallelHDF5IOHandler(
362-
std::string path,
363-
Access at,
364-
MPI_Comm comm,
365-
// NOLINTNEXTLINE(performance-unnecessary-value-param)
366-
[[maybe_unused]] json::TracingJSON config)
367-
: AbstractIOHandler(std::move(path), at, comm)
362+
std::string path, Access at, MPI_Comm comm, json::TracingJSON config)
363+
: AbstractIOHandler(std::move(path), at, std::move(config), comm)
368364
{
369365
throw std::runtime_error("openPMD-api built without HDF5 support");
370366
}
371367
#else
372368
ParallelHDF5IOHandler::ParallelHDF5IOHandler(
373-
std::string const &path,
374-
Access at,
375-
// NOLINTNEXTLINE(performance-unnecessary-value-param)
376-
[[maybe_unused]] json::TracingJSON config)
377-
: AbstractIOHandler(path, at)
369+
std::string const &path, Access at, json::TracingJSON config)
370+
: AbstractIOHandler(path, at, std::move(config))
378371
{
379372
throw std::runtime_error(
380373
"openPMD-api built without parallel support and without HDF5 support");

0 commit comments

Comments
 (0)