From adad96bfe35f9c57e2fe90f361a1ef6689bb2ff0 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Thu, 30 Nov 2023 15:44:31 +0100
Subject: [PATCH] ...
---
Tests/Unit/Numeric/BisectFF.cpp | 7 +++----
devtools/checks/check-scg-cpp-style.py | 9 +++++++--
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/Tests/Unit/Numeric/BisectFF.cpp b/Tests/Unit/Numeric/BisectFF.cpp
index ccf24d0cca2..ec5e793042a 100644
--- a/Tests/Unit/Numeric/BisectFF.cpp
+++ b/Tests/Unit/Numeric/BisectFF.cpp
@@ -1,9 +1,5 @@
#ifdef ALGORITHM_DIAGNOSTIC
-#include <numbers>
-
-using std::numbers::pi;
-
#include "Sample/HardParticle/HardParticles.h"
#include "Tests/GTestWrapper/google_test.h"
#include <cassert>
@@ -12,6 +8,9 @@ using std::numbers::pi;
#include <iomanip>
#include <iostream>
#include <vector>
+#include <numbers>
+
+using std::numbers::pi;
const auto qlist = testing::Combine(
testing::Values(C3({1, 0, 0}), C3({0, 1, 0}), C3({0, 0, 1}), C3({1, 1, 0}), C3({1, 0, 1}),
diff --git a/devtools/checks/check-scg-cpp-style.py b/devtools/checks/check-scg-cpp-style.py
index d975effd03c..4d7468bbc84 100755
--- a/devtools/checks/check-scg-cpp-style.py
+++ b/devtools/checks/check-scg-cpp-style.py
@@ -63,8 +63,13 @@ def check_block(fn, t, starter, errs):
matches = [m for m in re.finditer(r'(\n+)('+starter+r' .*?\n)+(\n+)', t)]
- if len(matches) > 1:
- errs.append(f"several {starter} blocks in file {fn}")
+ if len(matches) <= 1:
+ return
+
+ if starter == "#include" and re.search('#include.*#if.*#include', t, re.DOTALL):
+ return
+
+ errs.append(f"several {starter} blocks in file {fn}")
####################################################################################################
--
GitLab