From fdbe8f3357a18b8c10daacf8dd2c0a7629541c4a Mon Sep 17 00:00:00 2001
From: Soeren Peters <peters.soeren@gmx.net>
Date: Fri, 12 Feb 2021 10:59:32 +0000
Subject: [PATCH] Remove some unnecessary semicolons.
---
src/basics/Core/StringUtilities/StringUtil.h | 6 +++---
src/basics/basics/parallel/PbMpi.h | 2 +-
src/basics/basics/utilities/UbComparators.h | 2 +-
src/basics/basics/utilities/UbEqual.h | 2 +-
src/basics/basics/utilities/UbSystem.h | 2 +-
src/basics/geometry3d/GbMeshTools3D.h | 2 +-
src/cpu/VirtualFluidsCore/Connectors/ConnectorFactory.h | 4 ++--
src/cpu/VirtualFluidsCore/Data/DistributionArray3D.h | 4 ++--
src/cpu/VirtualFluidsCore/Data/EsoTwist3D.h | 4 ++--
src/cpu/VirtualFluidsCore/Data/VoidData3D.h | 4 ++--
src/cpu/VirtualFluidsCore/Grid/BasicCalculator.cpp | 2 --
src/cpu/VirtualFluidsCore/Parallel/MPIIODataStructures.h | 2 +-
src/cpu/VirtualFluidsCore/Utilities/MathUtil.hpp | 2 +-
13 files changed, 18 insertions(+), 20 deletions(-)
diff --git a/src/basics/Core/StringUtilities/StringUtil.h b/src/basics/Core/StringUtilities/StringUtil.h
index 5d458f7e4..1927a69bc 100644
--- a/src/basics/Core/StringUtilities/StringUtil.h
+++ b/src/basics/Core/StringUtilities/StringUtil.h
@@ -48,11 +48,11 @@ public:
private:
StringUtil() = default;
- ;
+
StringUtil(const StringUtil &) = default;
- ;
+
virtual ~StringUtil() = default;
- ;
+
static bool toBool(bool &t, const std::string &input, std::ios_base &(*f)(std::ios_base &));
};
diff --git a/src/basics/basics/parallel/PbMpi.h b/src/basics/basics/parallel/PbMpi.h
index 63470c2d8..857ff7b10 100644
--- a/src/basics/basics/parallel/PbMpi.h
+++ b/src/basics/basics/parallel/PbMpi.h
@@ -287,7 +287,7 @@ inline void sendStringVector(const std::vector<std::string> &v, int dest, int ta
/*======================================================================*/
// send a vector of strings
inline void receiveStringVector(std::vector<std::string> &v, int dest, int tag, PbMpi::Comm comm);
-}; // namespace PbMpi
+} // namespace PbMpi
/*======================================================================*/
// send a single value of MPI_Datatype
diff --git a/src/basics/basics/utilities/UbComparators.h b/src/basics/basics/utilities/UbComparators.h
index bc507e456..d461e27cb 100644
--- a/src/basics/basics/utilities/UbComparators.h
+++ b/src/basics/basics/utilities/UbComparators.h
@@ -170,7 +170,7 @@ struct compareMember {
// l.sort( compareConstMethods<Klasse, double, &Klasse::getVal1 >() );
//}
-}; // namespace UbComparators
+} // namespace UbComparators
#endif // UBCOMPARATOR_H
diff --git a/src/basics/basics/utilities/UbEqual.h b/src/basics/basics/utilities/UbEqual.h
index b3ca9102d..87955b181 100644
--- a/src/basics/basics/utilities/UbEqual.h
+++ b/src/basics/basics/utilities/UbEqual.h
@@ -259,7 +259,7 @@ inline bool isUbEqual(const T1 &a, const T2 &b)
{
using Low = typename UbEqualTrait<T1, T2>::Low;
return specific_equal<Low, Low>(static_cast<Low>(a), static_cast<Low>(b));
-};
+}
//////////////////////////////////////////////////////////////////////////
// UbEqual-Functor
diff --git a/src/basics/basics/utilities/UbSystem.h b/src/basics/basics/utilities/UbSystem.h
index 8e676811a..0436a360c 100644
--- a/src/basics/basics/utilities/UbSystem.h
+++ b/src/basics/basics/utilities/UbSystem.h
@@ -530,7 +530,7 @@ struct select2nd {
const result_type &operator()(const argument_type &p) const { return p.second; }
};
-}; // namespace UbSystem
+} // namespace UbSystem
#define UB_STATIC_ASSERT(expr) static_cast<void>(sizeof(UbSystem::ub_static_assert<expr>));
// zum ueberpruefen von STATISCHEN ausdruecken waehrend der compile-zeit
diff --git a/src/basics/geometry3d/GbMeshTools3D.h b/src/basics/geometry3d/GbMeshTools3D.h
index 2a93319ac..5c260e9c6 100644
--- a/src/basics/geometry3d/GbMeshTools3D.h
+++ b/src/basics/geometry3d/GbMeshTools3D.h
@@ -281,7 +281,7 @@ inline int triBoxOverlap(float boxcenter[3], float boxhalfsize[3], float trivert
return 1; /* box and triangle overlaps */
}
-}; // namespace GbMeshTools3D
+} // namespace GbMeshTools3D
#endif
diff --git a/src/cpu/VirtualFluidsCore/Connectors/ConnectorFactory.h b/src/cpu/VirtualFluidsCore/Connectors/ConnectorFactory.h
index 65307fe3a..3e8828639 100644
--- a/src/cpu/VirtualFluidsCore/Connectors/ConnectorFactory.h
+++ b/src/cpu/VirtualFluidsCore/Connectors/ConnectorFactory.h
@@ -12,9 +12,9 @@ class ConnectorFactory
{
public:
ConnectorFactory() = default;
- ;
+
virtual ~ConnectorFactory() = default;
- ;
+
virtual SPtr<Block3DConnector> createSameLevelDirectConnector(SPtr<Block3D> from, SPtr<Block3D> to,
int sendDir) = 0;
diff --git a/src/cpu/VirtualFluidsCore/Data/DistributionArray3D.h b/src/cpu/VirtualFluidsCore/Data/DistributionArray3D.h
index 593778cd0..fc1c67ad1 100644
--- a/src/cpu/VirtualFluidsCore/Data/DistributionArray3D.h
+++ b/src/cpu/VirtualFluidsCore/Data/DistributionArray3D.h
@@ -7,9 +7,9 @@ class DistributionArray3D
{
public:
DistributionArray3D() = default;
- ;
+
virtual ~DistributionArray3D() = default;
- ;
+
virtual size_t getNX1() const = 0;
virtual size_t getNX2() const = 0;
diff --git a/src/cpu/VirtualFluidsCore/Data/EsoTwist3D.h b/src/cpu/VirtualFluidsCore/Data/EsoTwist3D.h
index e7d9b90de..319a9200c 100644
--- a/src/cpu/VirtualFluidsCore/Data/EsoTwist3D.h
+++ b/src/cpu/VirtualFluidsCore/Data/EsoTwist3D.h
@@ -57,9 +57,9 @@ class EsoTwist3D : public DistributionArray3D
{
public:
EsoTwist3D() = default;
- ;
+
~EsoTwist3D() override = default;
- ;
+
//////////////////////////////////////////////////////////////////////////
void swap() override = 0;
//////////////////////////////////////////////////////////////////////////
diff --git a/src/cpu/VirtualFluidsCore/Data/VoidData3D.h b/src/cpu/VirtualFluidsCore/Data/VoidData3D.h
index bab8eca0d..12afae57d 100644
--- a/src/cpu/VirtualFluidsCore/Data/VoidData3D.h
+++ b/src/cpu/VirtualFluidsCore/Data/VoidData3D.h
@@ -7,7 +7,7 @@ class VoidData3D : public EsoTwist3D
{
public:
VoidData3D() = default;
- ;
+
VoidData3D(size_t nx1, size_t nx2, size_t nx3, LBMReal /*value*/)
{
this->NX1 = nx1;
@@ -15,7 +15,7 @@ public:
this->NX3 = nx3;
}
~VoidData3D() override = default;
- ;
+
size_t getNX1() const override { return NX1; }
size_t getNX2() const override { return NX2; }
size_t getNX3() const override { return NX3; }
diff --git a/src/cpu/VirtualFluidsCore/Grid/BasicCalculator.cpp b/src/cpu/VirtualFluidsCore/Grid/BasicCalculator.cpp
index e41e73725..d55a59b58 100644
--- a/src/cpu/VirtualFluidsCore/Grid/BasicCalculator.cpp
+++ b/src/cpu/VirtualFluidsCore/Grid/BasicCalculator.cpp
@@ -64,7 +64,6 @@ void BasicCalculator::calculate()
int maxInitLevel = maxLevel - minLevel;
int straightStartLevel = minInitLevel;
int internalIterations = 1 << (maxInitLevel - minInitLevel);
- int forwardStartLevel;
int threshold;
#ifdef TIMING
@@ -82,7 +81,6 @@ void BasicCalculator::calculate()
for (int staggeredStep = 1; staggeredStep <= internalIterations; staggeredStep++)
{
- forwardStartLevel = straightStartLevel;
if (staggeredStep == internalIterations) straightStartLevel = minInitLevel;
else
{
diff --git a/src/cpu/VirtualFluidsCore/Parallel/MPIIODataStructures.h b/src/cpu/VirtualFluidsCore/Parallel/MPIIODataStructures.h
index 6a21caab6..2d79817cc 100644
--- a/src/cpu/VirtualFluidsCore/Parallel/MPIIODataStructures.h
+++ b/src/cpu/VirtualFluidsCore/Parallel/MPIIODataStructures.h
@@ -165,5 +165,5 @@ struct DSArraysPresence {
bool isShearStressValArrayPresent;
bool isRelaxationFactorPresent;
};
-}; // namespace MPIIODataStructures
+} // namespace MPIIODataStructures
#endif
\ No newline at end of file
diff --git a/src/cpu/VirtualFluidsCore/Utilities/MathUtil.hpp b/src/cpu/VirtualFluidsCore/Utilities/MathUtil.hpp
index 00556b842..5c6fe4e8e 100644
--- a/src/cpu/VirtualFluidsCore/Utilities/MathUtil.hpp
+++ b/src/cpu/VirtualFluidsCore/Utilities/MathUtil.hpp
@@ -92,6 +92,6 @@ namespace Utilities
double y = a * x + b;
return y;
}
-};
+}
#endif
--
GitLab