From f6b5873f3ffcf3c2860f8ddd8df777aefe04ef7a Mon Sep 17 00:00:00 2001
From: Chuck Atkins <chuck.atkins@kitware.com>
Date: Mon, 3 Apr 2017 09:14:01 -0400
Subject: [PATCH] Address various clang-format issues
---
bindings/python/src/ADIOSPy.cpp | 2 +-
bindings/python/src/MethodPy.cpp | 2 +-
bindings/python/src/VariablePy.cpp | 6 +++---
include/core/Engine.h | 6 ++++--
include/core/Profiler.h | 2 +-
include/core/Variable.h | 4 ++--
include/core/VariableBase.h | 6 +++---
include/core/VariableCompound.h | 4 ++--
source/core/Engine.cpp | 21 ++++++++++++---------
source/core/Method.cpp | 2 +-
source/core/Transport.cpp | 2 +-
source/engine/adios1/ADIOS1Reader.cpp | 7 +++----
source/engine/adios1/ADIOS1Writer.cpp | 8 +++-----
source/engine/bp/BPFileReader.cpp | 7 +++----
source/engine/bp/BPFileWriter.cpp | 11 +++++------
source/engine/dataman/DataManReader.cpp | 7 +++----
source/engine/dataman/DataManWriter.cpp | 7 +++----
source/format/BP1Aggregator.cpp | 2 +-
source/transport/file/FStream.cpp | 2 +-
source/transport/file/FileDescriptor.cpp | 2 +-
source/transport/file/FilePointer.cpp | 2 +-
source/transport/wan/MdtmMan.cpp | 8 ++++----
22 files changed, 59 insertions(+), 61 deletions(-)
diff --git a/bindings/python/src/ADIOSPy.cpp b/bindings/python/src/ADIOSPy.cpp
index 8e2fe8808..e8dd0e0a0 100644
--- a/bindings/python/src/ADIOSPy.cpp
+++ b/bindings/python/src/ADIOSPy.cpp
@@ -19,7 +19,7 @@ namespace adios
{
ADIOSPy::ADIOSPy(MPI_Comm mpiComm, const bool debug)
- : ADIOS(mpiComm, adios::Verbose::ERROR, debug)
+: ADIOS(mpiComm, adios::Verbose::ERROR, debug)
{
}
diff --git a/bindings/python/src/MethodPy.cpp b/bindings/python/src/MethodPy.cpp
index e1e57f3c1..4310de673 100644
--- a/bindings/python/src/MethodPy.cpp
+++ b/bindings/python/src/MethodPy.cpp
@@ -25,7 +25,7 @@ namespace py = pybind11;
#endif
MethodPy::MethodPy(const std::string type, const bool debugMode)
- : Method(type, debugMode)
+: Method(type, debugMode)
{
}
diff --git a/bindings/python/src/VariablePy.cpp b/bindings/python/src/VariablePy.cpp
index cc93adcb3..7d677d567 100644
--- a/bindings/python/src/VariablePy.cpp
+++ b/bindings/python/src/VariablePy.cpp
@@ -16,9 +16,9 @@ namespace adios
VariablePy::VariablePy(const std::string name, const pyList localDimensionsPy,
const pyList globalDimensionsPy,
const pyList globalOffsetsPy)
- : m_Name{name}, m_LocalDimensions{ListToVector(localDimensionsPy)},
- m_GlobalDimensions{ListToVector(globalDimensionsPy)},
- m_GlobalOffsets{ListToVector(globalOffsetsPy)}
+: m_Name{name}, m_LocalDimensions{ListToVector(localDimensionsPy)},
+ m_GlobalDimensions{ListToVector(globalDimensionsPy)},
+ m_GlobalOffsets{ListToVector(globalOffsetsPy)}
{
}
diff --git a/include/core/Engine.h b/include/core/Engine.h
index d64845269..d536873c7 100644
--- a/include/core/Engine.h
+++ b/include/core/Engine.h
@@ -136,7 +136,8 @@ public:
* @param variableName
* @param values
*/
- template <class T> void Write(const std::string &variableName, const T *values)
+ template <class T>
+ void Write(const std::string &variableName, const T *values)
{
Write(variableName, values);
}
@@ -220,7 +221,8 @@ public:
const unsigned long long int *values);
virtual void Write(const std::string &variableName, const float *values);
virtual void Write(const std::string &variableName, const double *values);
- virtual void Write(const std::string &variableName, const long double *values);
+ virtual void Write(const std::string &variableName,
+ const long double *values);
virtual void Write(const std::string &variableName,
const std::complex<float> *values);
virtual void Write(const std::string &variableName,
diff --git a/include/core/Profiler.h b/include/core/Profiler.h
index 84550456c..eee51ebee 100644
--- a/include/core/Profiler.h
+++ b/include/core/Profiler.h
@@ -26,7 +26,7 @@ public:
unsigned long long int ProcessTime = 0;
Timer(const std::string process, const Support::Resolutions resolution)
- : Process{process}, Resolution{resolution}
+ : Process{process}, Resolution{resolution}
{
}
diff --git a/include/core/Variable.h b/include/core/Variable.h
index 67930c467..110ae7064 100644
--- a/include/core/Variable.h
+++ b/include/core/Variable.h
@@ -52,8 +52,8 @@ public:
Variable<T>(const std::string name, const Dims dimensions,
const Dims globalDimensions, const Dims globalOffsets,
const bool debugMode)
- : VariableBase(name, GetType<T>(), sizeof(T), dimensions,
- globalDimensions, globalOffsets, debugMode)
+ : VariableBase(name, GetType<T>(), sizeof(T), dimensions, globalDimensions,
+ globalOffsets, debugMode)
{
if (m_Dimensions == Dims{1})
m_IsScalar = true;
diff --git a/include/core/VariableBase.h b/include/core/VariableBase.h
index 25312d6cf..cc8c8f79a 100644
--- a/include/core/VariableBase.h
+++ b/include/core/VariableBase.h
@@ -42,9 +42,9 @@ public:
const std::size_t elementSize, const Dims dimensions,
const Dims globalDimensions, const Dims globalOffsets,
const bool debugMode)
- : m_Name{name}, m_Type{type}, m_ElementSize{elementSize},
- m_Dimensions{dimensions}, m_GlobalDimensions{globalDimensions},
- m_GlobalOffsets{globalOffsets}, m_DebugMode{debugMode}
+ : m_Name{name}, m_Type{type}, m_ElementSize{elementSize},
+ m_Dimensions{dimensions}, m_GlobalDimensions{globalDimensions},
+ m_GlobalOffsets{globalOffsets}, m_DebugMode{debugMode}
{
}
diff --git a/include/core/VariableCompound.h b/include/core/VariableCompound.h
index 7200873a4..c3bacfcca 100644
--- a/include/core/VariableCompound.h
+++ b/include/core/VariableCompound.h
@@ -36,8 +36,8 @@ public:
VariableCompound(const std::string name, const std::size_t sizeOfStruct,
const Dims dimensions, const Dims globalDimensions,
const Dims globalOffsets, const bool debugMode)
- : VariableBase(name, "compound", sizeOfStruct, dimensions,
- globalDimensions, globalOffsets, debugMode)
+ : VariableBase(name, "compound", sizeOfStruct, dimensions, globalDimensions,
+ globalOffsets, debugMode)
{
}
diff --git a/source/core/Engine.cpp b/source/core/Engine.cpp
index d59f81573..4f2cb8a44 100644
--- a/source/core/Engine.cpp
+++ b/source/core/Engine.cpp
@@ -18,11 +18,10 @@ namespace adios
Engine::Engine(ADIOS &adios, std::string engineType, std::string name,
std::string accessMode, MPI_Comm mpiComm, const Method &method,
bool debugMode, unsigned int nthreads, std::string endMessage)
-: m_MPIComm{mpiComm}, m_EngineType{std::move(engineType)}, m_Name{std::move(
- name)},
- m_AccessMode{std::move(accessMode)}, m_Method{method},
- m_ADIOS(adios), m_DebugMode{debugMode}, m_nThreads{nthreads},
- m_EndMessage(std::move(endMessage))
+: m_MPIComm{mpiComm}, m_EngineType{std::move(engineType)},
+ m_Name{std::move(name)}, m_AccessMode{std::move(accessMode)},
+ m_Method{method}, m_ADIOS(adios), m_DebugMode{debugMode},
+ m_nThreads{nthreads}, m_EndMessage(std::move(endMessage))
{
if (m_DebugMode == true)
{
@@ -98,14 +97,16 @@ void Engine::Write(Variable<std::complex<long double>> & /*variable*/,
}
void Engine::Write(VariableCompound & /*variable*/, const void * /*values*/) {}
-void Engine::Write(const std::string & /*variableName*/, const char * /*values*/)
+void Engine::Write(const std::string & /*variableName*/,
+ const char * /*values*/)
{
}
void Engine::Write(const std::string & /*variableName*/,
const unsigned char * /*values*/)
{
}
-void Engine::Write(const std::string & /*variableName*/, const short * /*values*/)
+void Engine::Write(const std::string & /*variableName*/,
+ const short * /*values*/)
{
}
void Engine::Write(const std::string & /*variableName*/,
@@ -135,7 +136,8 @@ void Engine::Write(const std::string & /*variableName*/,
const unsigned long long int * /*values*/)
{
}
-void Engine::Write(const std::string & /*variableName*/, const float * /*values*/)
+void Engine::Write(const std::string & /*variableName*/,
+ const float * /*values*/)
{
}
void Engine::Write(const std::string & /*variableName*/,
@@ -158,7 +160,8 @@ void Engine::Write(const std::string & /*variableName*/,
const std::complex<long double> * /*values*/)
{
}
-void Engine::Write(const std::string & /*variableName*/, const void * /*values*/)
+void Engine::Write(const std::string & /*variableName*/,
+ const void * /*values*/)
{
}
diff --git a/source/core/Method.cpp b/source/core/Method.cpp
index f3738786a..a97f101fc 100644
--- a/source/core/Method.cpp
+++ b/source/core/Method.cpp
@@ -15,7 +15,7 @@ namespace adios
{
Method::Method(const std::string name, const bool debugMode)
- : m_Name{name}, m_DebugMode{debugMode}
+: m_Name{name}, m_DebugMode{debugMode}
{
// m_Type can stay empty (forcing the choice of the default engine)
m_nThreads = 1;
diff --git a/source/core/Transport.cpp b/source/core/Transport.cpp
index 9b1f7f5ee..3f3fd7728 100644
--- a/source/core/Transport.cpp
+++ b/source/core/Transport.cpp
@@ -15,7 +15,7 @@ namespace adios
Transport::Transport(const std::string type, MPI_Comm mpiComm,
const bool debugMode)
- : m_Type{type}, m_MPIComm{mpiComm}, m_DebugMode{debugMode}
+: m_Type{type}, m_MPIComm{mpiComm}, m_DebugMode{debugMode}
{
MPI_Comm_rank(m_MPIComm, &m_RankMPI);
MPI_Comm_size(m_MPIComm, &m_SizeMPI);
diff --git a/source/engine/adios1/ADIOS1Reader.cpp b/source/engine/adios1/ADIOS1Reader.cpp
index a44996c14..406c752d3 100644
--- a/source/engine/adios1/ADIOS1Reader.cpp
+++ b/source/engine/adios1/ADIOS1Reader.cpp
@@ -26,10 +26,9 @@ BPFileReader::BPFileReader(ADIOS &adios, const std::string name,
const Method &method, const IOMode iomode,
const float timeout_sec, const bool debugMode,
const unsigned int nthreads)
- : Engine(adios, "BPFileReader", name, accessMode, mpiComm, method,
- debugMode, nthreads,
- " BPFileReader constructor (or call to ADIOS Open).\n"),
- m_Buffer(accessMode, m_RankMPI, m_DebugMode)
+: Engine(adios, "BPFileReader", name, accessMode, mpiComm, method, debugMode,
+ nthreads, " BPFileReader constructor (or call to ADIOS Open).\n"),
+ m_Buffer(accessMode, m_RankMPI, m_DebugMode)
{
Init();
}
diff --git a/source/engine/adios1/ADIOS1Writer.cpp b/source/engine/adios1/ADIOS1Writer.cpp
index d8c95ffe8..dc45da793 100644
--- a/source/engine/adios1/ADIOS1Writer.cpp
+++ b/source/engine/adios1/ADIOS1Writer.cpp
@@ -24,11 +24,9 @@ ADIOS1Writer::ADIOS1Writer(ADIOS &adios, const std::string name,
const Method &method, const IOMode iomode,
const float timeout_sec, const bool debugMode,
const unsigned int nthreads)
- : Engine(adios, "ADIOS1Writer", name, accessMode, mpiComm, method,
- debugMode, nthreads,
- " ADIOS1Writer constructor (or call to ADIOS Open).\n"),
- m_groupname{method.m_Name.c_str()}, m_filename{name.c_str()},
- m_comm{mpiComm}
+: Engine(adios, "ADIOS1Writer", name, accessMode, mpiComm, method, debugMode,
+ nthreads, " ADIOS1Writer constructor (or call to ADIOS Open).\n"),
+ m_groupname{method.m_Name.c_str()}, m_filename{name.c_str()}, m_comm{mpiComm}
{
Init();
adios_open(&m_adios_file, m_groupname, m_filename, accessMode.c_str(),
diff --git a/source/engine/bp/BPFileReader.cpp b/source/engine/bp/BPFileReader.cpp
index a44996c14..406c752d3 100644
--- a/source/engine/bp/BPFileReader.cpp
+++ b/source/engine/bp/BPFileReader.cpp
@@ -26,10 +26,9 @@ BPFileReader::BPFileReader(ADIOS &adios, const std::string name,
const Method &method, const IOMode iomode,
const float timeout_sec, const bool debugMode,
const unsigned int nthreads)
- : Engine(adios, "BPFileReader", name, accessMode, mpiComm, method,
- debugMode, nthreads,
- " BPFileReader constructor (or call to ADIOS Open).\n"),
- m_Buffer(accessMode, m_RankMPI, m_DebugMode)
+: Engine(adios, "BPFileReader", name, accessMode, mpiComm, method, debugMode,
+ nthreads, " BPFileReader constructor (or call to ADIOS Open).\n"),
+ m_Buffer(accessMode, m_RankMPI, m_DebugMode)
{
Init();
}
diff --git a/source/engine/bp/BPFileWriter.cpp b/source/engine/bp/BPFileWriter.cpp
index e68fae284..2785781f0 100644
--- a/source/engine/bp/BPFileWriter.cpp
+++ b/source/engine/bp/BPFileWriter.cpp
@@ -24,12 +24,11 @@ BPFileWriter::BPFileWriter(ADIOS &adios, const std::string name,
const Method &method, const IOMode iomode,
const float timeout_sec, const bool debugMode,
const unsigned int nthreads)
- : Engine(adios, "BPFileWriter", name, accessMode, mpiComm, method,
- debugMode, nthreads,
- " BPFileWriter constructor (or call to ADIOS Open).\n"),
- m_Buffer{capsule::STLVector(accessMode, m_RankMPI, m_DebugMode)},
- m_BP1Aggregator{format::BP1Aggregator(m_MPIComm, debugMode)},
- m_MaxBufferSize{m_Buffer.m_Data.max_size()}
+: Engine(adios, "BPFileWriter", name, accessMode, mpiComm, method, debugMode,
+ nthreads, " BPFileWriter constructor (or call to ADIOS Open).\n"),
+ m_Buffer{capsule::STLVector(accessMode, m_RankMPI, m_DebugMode)},
+ m_BP1Aggregator{format::BP1Aggregator(m_MPIComm, debugMode)},
+ m_MaxBufferSize{m_Buffer.m_Data.max_size()}
{
m_MetadataSet.TimeStep = 1; // starting at one to be compatible with ADIOS1.x
Init();
diff --git a/source/engine/dataman/DataManReader.cpp b/source/engine/dataman/DataManReader.cpp
index 2e65596e7..941fe8f60 100644
--- a/source/engine/dataman/DataManReader.cpp
+++ b/source/engine/dataman/DataManReader.cpp
@@ -29,10 +29,9 @@ DataManReader::DataManReader(ADIOS &adios, const std::string name,
const Method &method, const IOMode iomode,
const float timeout_sec, const bool debugMode,
const unsigned int nthreads)
- : Engine(adios, "DataManReader", name, accessMode, mpiComm, method,
- debugMode, nthreads,
- " DataManReader constructor (or call to ADIOS Open).\n"),
- m_Buffer(accessMode, m_RankMPI, m_DebugMode)
+: Engine(adios, "DataManReader", name, accessMode, mpiComm, method, debugMode,
+ nthreads, " DataManReader constructor (or call to ADIOS Open).\n"),
+ m_Buffer(accessMode, m_RankMPI, m_DebugMode)
{
Init();
}
diff --git a/source/engine/dataman/DataManWriter.cpp b/source/engine/dataman/DataManWriter.cpp
index 8430a5921..edb527579 100644
--- a/source/engine/dataman/DataManWriter.cpp
+++ b/source/engine/dataman/DataManWriter.cpp
@@ -27,10 +27,9 @@ DataManWriter::DataManWriter(ADIOS &adios, const std::string name,
const Method &method, const IOMode iomode,
const float timeout_sec, const bool debugMode,
const unsigned int nthreads)
- : Engine(adios, "DataManWriter", name, accessMode, mpiComm, method,
- debugMode, nthreads,
- " DataManWriter constructor (or call to ADIOS Open).\n"),
- m_Buffer(accessMode, m_RankMPI, m_DebugMode)
+: Engine(adios, "DataManWriter", name, accessMode, mpiComm, method, debugMode,
+ nthreads, " DataManWriter constructor (or call to ADIOS Open).\n"),
+ m_Buffer(accessMode, m_RankMPI, m_DebugMode)
{
Init();
}
diff --git a/source/format/BP1Aggregator.cpp b/source/format/BP1Aggregator.cpp
index 442c22f61..c81a72bbf 100644
--- a/source/format/BP1Aggregator.cpp
+++ b/source/format/BP1Aggregator.cpp
@@ -22,7 +22,7 @@ namespace format
{
BP1Aggregator::BP1Aggregator(MPI_Comm mpiComm, const bool debugMode)
- : m_MPIComm{mpiComm}, m_DebugMode{debugMode}
+: m_MPIComm{mpiComm}, m_DebugMode{debugMode}
{
MPI_Comm_rank(m_MPIComm, &m_RankMPI);
MPI_Comm_size(m_MPIComm, &m_SizeMPI);
diff --git a/source/transport/file/FStream.cpp b/source/transport/file/FStream.cpp
index 6496f4e05..15bf60b58 100644
--- a/source/transport/file/FStream.cpp
+++ b/source/transport/file/FStream.cpp
@@ -20,7 +20,7 @@ namespace transport
{
FStream::FStream(MPI_Comm mpiComm, const bool debugMode)
- : Transport("fstream", mpiComm, debugMode)
+: Transport("fstream", mpiComm, debugMode)
{
}
diff --git a/source/transport/file/FileDescriptor.cpp b/source/transport/file/FileDescriptor.cpp
index bfa9439d0..d3433d2e5 100644
--- a/source/transport/file/FileDescriptor.cpp
+++ b/source/transport/file/FileDescriptor.cpp
@@ -25,7 +25,7 @@ namespace transport
{
FileDescriptor::FileDescriptor(MPI_Comm mpiComm, const bool debugMode)
- : Transport("POSIX_IO", mpiComm, debugMode)
+: Transport("POSIX_IO", mpiComm, debugMode)
{
}
diff --git a/source/transport/file/FilePointer.cpp b/source/transport/file/FilePointer.cpp
index ce9c10723..704b93f08 100644
--- a/source/transport/file/FilePointer.cpp
+++ b/source/transport/file/FilePointer.cpp
@@ -20,7 +20,7 @@ namespace transport
{
FilePointer::FilePointer(MPI_Comm mpiComm, const bool debugMode)
- : Transport("FILE*", mpiComm, debugMode)
+: Transport("FILE*", mpiComm, debugMode)
{
}
diff --git a/source/transport/wan/MdtmMan.cpp b/source/transport/wan/MdtmMan.cpp
index 6238bbe3d..55324e0c2 100644
--- a/source/transport/wan/MdtmMan.cpp
+++ b/source/transport/wan/MdtmMan.cpp
@@ -20,10 +20,10 @@ MdtmMan::MdtmMan(const std::string localIP, const std::string remoteIP,
const int numberOfPipes, const std::vector<int> tolerances,
const std::vector<int> priorities, MPI_Comm mpiComm,
const bool debugMode)
- : Transport("File", mpiComm, debugMode), m_LocalIP{localIP},
- m_RemoteIP{remoteIP}, m_Mode{mode}, m_Prefix{prefix},
- m_NumberOfPipes{numberOfPipes}, m_Tolerances{tolerances},
- m_Priorities{priorities}
+: Transport("File", mpiComm, debugMode), m_LocalIP{localIP},
+ m_RemoteIP{remoteIP}, m_Mode{mode}, m_Prefix{prefix},
+ m_NumberOfPipes{numberOfPipes}, m_Tolerances{tolerances},
+ m_Priorities{priorities}
{
}
--
GitLab