Skip to content

Commit

Permalink
Merge branch 'master' into EVup
Browse files Browse the repository at this point in the history
  • Loading branch information
vicentebolea authored Dec 17, 2024
2 parents 330251f + 3b8893f commit ef14a6c
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
6 changes: 3 additions & 3 deletions source/adios2/core/Variable.h
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,10 @@ class Variable : public VariableBase
* m_BlocksInfo index (BP4 ONLY) */
std::map<size_t, Span> m_BlocksSpan;

Variable<T>(const std::string &name, const Dims &shape, const Dims &start, const Dims &count,
const bool constantShape);
Variable(const std::string &name, const Dims &shape, const Dims &start, const Dims &count,
const bool constantShape);

~Variable<T>() = default;
~Variable() = default;

BPInfo &SetBlockInfo(const T *data, const size_t stepsStart,
const size_t stepsCount = 1) noexcept;
Expand Down
3 changes: 1 addition & 2 deletions source/adios2/toolkit/query/BlockIndex.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ template <class T>
class BlockIndex
{
public:
BlockIndex<T>(adios2::core::Variable<T> *var, adios2::core::IO &io,
adios2::core::Engine &reader)
BlockIndex(adios2::core::Variable<T> *var, adios2::core::IO &io, adios2::core::Engine &reader)
: m_VarPtr(var), m_IdxIO(io), m_IdxReader(reader)
{
}
Expand Down
3 changes: 1 addition & 2 deletions source/adios2/toolkit/shm/TokenChain.h
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,7 @@ class TokenChain
};

public:
TokenChain<T>(helper::Comm *comm)
: m_NodeComm(comm), m_Rank(comm->Rank()), m_nProc(comm->Size())
TokenChain(helper::Comm *comm) : m_NodeComm(comm), m_Rank(comm->Rank()), m_nProc(comm->Size())
{
if (m_nProc > 1)
{
Expand Down

0 comments on commit ef14a6c

Please sign in to comment.