From 31074c238f96b0bcd6cd96ad87a8f16cac80f9c1 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Thu, 23 Jun 2022 22:15:06 +0200
Subject: [PATCH] MAINT: (re-)enable some linter checks
---
CMakeLists.txt | 2 +-
src/caosdb/configuration.cpp | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6ead996..7ee6d19 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -323,7 +323,7 @@ if(_LINTING)
else()
message(STATUS "clang-tidy: ${clang_tidy}")
set(_CMAKE_CXX_CLANG_TIDY_CHECKS
- "--checks=*,-fuchsia-*,-llvmlibc-*,-readability-convert-member-functions-to-static,-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-hicpp-no-array-decay,-llvm-else-after-return,-readability-else-after-return,-modernize-use-trailing-return-type,-bugprone-branch-clone,-altera-*,-cppcoreguidelines-macro-usage")
+ "--checks=*,-fuchsia-*,-llvmlibc-*,-readability-convert-member-functions-to-static,-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-hicpp-no-array-decay,-llvm-else-after-return,-readability-else-after-return,-modernize-use-trailing-return-type,-bugprone-branch-clone,-altera-*")
set(_CMAKE_C_CLANG_TIDY_CHECKS "${_CMAKE_CXX_CLANG_TIDY_CHECKS}")
set(_CMAKE_CXX_CLANG_TIDY "${clang_tidy}"
"--header-filter=caosdb/.*[^\(\.pb\.h\)]$"
diff --git a/src/caosdb/configuration.cpp b/src/caosdb/configuration.cpp
index a8dd650..e1ffb23 100644
--- a/src/caosdb/configuration.cpp
+++ b/src/caosdb/configuration.cpp
@@ -45,9 +45,11 @@
#include <string> // for string, operator+
#include <utility> // for move
+// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
#define WRAPPED_JSON_CONFIGURATION(obj) \
(static_cast<value *>((obj)->json_configuration.wrapped.get()))
+// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
#define GET_CONNECTIONS \
if (!this->json_configuration.wrapped) { \
throw ConfigurationError("This CaosDB client has not been configured."); \
--
GitLab