Skip to content

Commit e77056e

Browse files
committed
fix: make changes from #4160 abi compat
1 parent f839acd commit e77056e

File tree

3 files changed

+12
-5
lines changed

3 files changed

+12
-5
lines changed

source/adios2/engine/bp5/BP5Engine.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -172,10 +172,10 @@ class BP5Engine
172172
MACRO(StatsBlockSize, SizeBytes, size_t, DefaultStatsBlockSize) \
173173
MACRO(Threads, UInt, unsigned int, 0) \
174174
MACRO(UseOneTimeAttributes, Bool, bool, true) \
175-
MACRO(FlattenSteps, Bool, bool, false) \
176-
MACRO(IgnoreFlattenSteps, Bool, bool, false) \
177175
MACRO(RemoteDataPath, String, std::string, "") \
178-
MACRO(MaxOpenFilesAtOnce, UInt, unsigned int, UINT_MAX)
176+
MACRO(MaxOpenFilesAtOnce, UInt, unsigned int, UINT_MAX) \
177+
MACRO(FlattenSteps, Bool, bool, false) \
178+
MACRO(IgnoreFlattenSteps, Bool, bool, false)
179179

180180
struct BP5Params
181181
{

source/adios2/toolkit/format/bp5/BP5Deserializer.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1996,6 +1996,12 @@ int BP5Deserializer::FindOffset(size_t Dims, const size_t *Size, const size_t *I
19961996
* *******************************
19971997
*/
19981998

1999+
BP5Deserializer::BP5Deserializer(bool WriterIsRowMajor, bool ReaderIsRowMajor,
2000+
bool RandomAccessMode)
2001+
: BP5Deserializer::BP5Deserializer(WriterIsRowMajor, ReaderIsRowMajor, RandomAccessMode, false)
2002+
{
2003+
}
2004+
19992005
BP5Deserializer::BP5Deserializer(bool WriterIsRowMajor, bool ReaderIsRowMajor,
20002006
bool RandomAccessMode, bool FlattenSteps)
20012007
: m_WriterIsRowMajor{WriterIsRowMajor}, m_ReaderIsRowMajor{ReaderIsRowMajor},

source/adios2/toolkit/format/bp5/BP5Deserializer.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,9 @@ class BP5Deserializer : virtual public BP5Base
3535
{
3636

3737
public:
38-
BP5Deserializer(bool WriterIsRowMajor, bool ReaderIsRowMajor, bool RandomAccessMode = false,
39-
bool FlattenSteps = false);
38+
BP5Deserializer(bool WriterIsRowMajor, bool ReaderIsRowMajor, bool RandomAccessMode = false);
39+
BP5Deserializer(bool WriterIsRowMajor, bool ReaderIsRowMajor, bool RandomAccessMode,
40+
bool FlattenSteps);
4041

4142
~BP5Deserializer();
4243

0 commit comments

Comments
 (0)