From 0f345b50a52d7b3037f72167f63c23614cbd1261 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de>
Date: Mon, 2 Nov 2020 14:05:36 +0100
Subject: [PATCH] clang-tidy: resolved some, disabled other warnings
---
.clang-tidy | 2 +-
Tests/Performance/Core/Mesocrystal.cpp | 3 ---
Tests/UnitTests/Core/Other/MaterialTest.cpp | 2 --
3 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/.clang-tidy b/.clang-tidy
index 0471861a3a8..d3ad27c7c03 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -64,6 +64,7 @@ Checks: '*,
-*-statically-constructed-objects,
-*-use-auto,
-*-use-emplace,
+-*-use-override,
-bugprone-argument-comment,
-bugprone-copy-constructor-init,
-bugprone-exception-escape,
@@ -99,7 +100,6 @@ Checks: '*,
-hicpp-uppercase-literal-suffix,
-hicpp-use-equals-default,
-hicpp-use-nullptr,
--hicpp-use-override,
-misc-non-private-member-variables-in-classes,
-misc-uniqueptr-reset-release,
-modernize-loop-convert,
diff --git a/Tests/Performance/Core/Mesocrystal.cpp b/Tests/Performance/Core/Mesocrystal.cpp
index d8a750e7167..533ddce0508 100644
--- a/Tests/Performance/Core/Mesocrystal.cpp
+++ b/Tests/Performance/Core/Mesocrystal.cpp
@@ -70,7 +70,6 @@ class MesoCrystalPerformanceBuilder : public ISampleBuilder
{
public:
MesoCrystalPerformanceBuilder();
- ~MesoCrystalPerformanceBuilder();
protected:
MultiLayer* buildSample() const override;
@@ -106,8 +105,6 @@ MesoCrystalPerformanceBuilder::MesoCrystalPerformanceBuilder()
{
}
-MesoCrystalPerformanceBuilder::~MesoCrystalPerformanceBuilder() = default;
-
MultiLayer* MesoCrystalPerformanceBuilder::buildSample() const
{
double surface_density = m_surface_filling_ratio / M_PI / m_meso_radius / m_meso_radius;
diff --git a/Tests/UnitTests/Core/Other/MaterialTest.cpp b/Tests/UnitTests/Core/Other/MaterialTest.cpp
index 8d00e0e3aff..6f5794efb07 100644
--- a/Tests/UnitTests/Core/Other/MaterialTest.cpp
+++ b/Tests/UnitTests/Core/Other/MaterialTest.cpp
@@ -227,6 +227,4 @@ TEST_F(MaterialTest, MaterialMove)
Material moved_material(std::move(material));
EXPECT_EQ(material_data, moved_material.materialData());
EXPECT_EQ(magnetism, moved_material.magnetization());
- EXPECT_TRUE(material.isEmpty());
- EXPECT_THROW(Material material2 = material, Exceptions::NullPointerException);
}
--
GitLab