Skip to content

Commit 3d5b70a

Browse files
committed
Adapt constructors for installation without ADIOS2/HDF5
1 parent 6dc4560 commit 3d5b70a

File tree

3 files changed

+10
-22
lines changed

3 files changed

+10
-22
lines changed

src/IO/ADIOS/ADIOS2IOHandler.cpp

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2106,27 +2106,25 @@ ADIOS2IOHandler::ADIOS2IOHandler(
21062106
std::string path,
21072107
Access at,
21082108
MPI_Comm comm,
2109-
// NOLINTNEXTLINE(performance-unnecessary-value-param)
2110-
json::TracingJSON,
2109+
json::TracingJSON config,
21112110
// NOLINTNEXTLINE(performance-unnecessary-value-param)
21122111
std::string,
21132112
// NOLINTNEXTLINE(performance-unnecessary-value-param)
21142113
std::string)
2115-
: AbstractIOHandler(std::move(path), at, comm)
2114+
: AbstractIOHandler(std::move(path), at, std::move(config), comm)
21162115
{}
21172116

21182117
#endif // openPMD_HAVE_MPI
21192118

21202119
ADIOS2IOHandler::ADIOS2IOHandler(
21212120
std::string path,
21222121
Access at,
2123-
// NOLINTNEXTLINE(performance-unnecessary-value-param)
2124-
json::TracingJSON,
2122+
json::TracingJSON config,
21252123
// NOLINTNEXTLINE(performance-unnecessary-value-param)
21262124
std::string,
21272125
// NOLINTNEXTLINE(performance-unnecessary-value-param)
21282126
std::string)
2129-
: AbstractIOHandler(std::move(path), at)
2127+
: AbstractIOHandler(std::move(path), at, std::move(config))
21302128
{}
21312129

21322130
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
@@ -2953,11 +2953,8 @@ std::future<void> HDF5IOHandler::flush(internal::ParsedFlushParams &)
29532953
#else
29542954

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

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)