From b5243c99c598bae3ad89103fdffccc158c18486d Mon Sep 17 00:00:00 2001 From: David Rohr Date: Mon, 30 Nov 2020 14:36:05 +0100 Subject: [PATCH 1/2] Revert "Workaround for readability-braces-around-statements bug" This reverts commit 69cd85baa210249309b4e1c3c588781a7de1ad94. --- GPU/GPUTracking/Global/GPUChainTracking.h | 2 +- GPU/GPUTracking/Global/GPUChainTrackingIO.cxx | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/GPU/GPUTracking/Global/GPUChainTracking.h b/GPU/GPUTracking/Global/GPUChainTracking.h index 6b89f3b25acd3..f9cb5022e9830 100644 --- a/GPU/GPUTracking/Global/GPUChainTracking.h +++ b/GPU/GPUTracking/Global/GPUChainTracking.h @@ -87,7 +87,7 @@ class GPUChainTracking : public GPUChain, GPUReconstructionHelpers::helperDelega InOutMemory(); ~InOutMemory(); InOutMemory(InOutMemory&&); - InOutMemory& operator=(InOutMemory&&) = default; + InOutMemory& operator=(InOutMemory&&); std::unique_ptr tpcZSpages; std::unique_ptr tpcZSpagesChar; // Same as above, but as char (needed for reading dumps, but deprecated, since alignment can be wrong) diff --git a/GPU/GPUTracking/Global/GPUChainTrackingIO.cxx b/GPU/GPUTracking/Global/GPUChainTrackingIO.cxx index 9f0bcbb6fc2ec..e5127f94654b5 100644 --- a/GPU/GPUTracking/Global/GPUChainTrackingIO.cxx +++ b/GPU/GPUTracking/Global/GPUChainTrackingIO.cxx @@ -65,6 +65,7 @@ static constexpr char DUMP_HEADER[DUMP_HEADER_SIZE + 1] = "CAv1"; GPUChainTracking::InOutMemory::InOutMemory() = default; GPUChainTracking::InOutMemory::~InOutMemory() = default; GPUChainTracking::InOutMemory::InOutMemory(GPUChainTracking::InOutMemory&&) = default; +GPUChainTracking::InOutMemory& GPUChainTracking::InOutMemory::operator=(GPUChainTracking::InOutMemory&&) = default; void GPUChainTracking::DumpData(const char* filename) { From f1b671a92a856edcec1d8ddc98509a059d0e339d Mon Sep 17 00:00:00 2001 From: David Rohr Date: Mon, 30 Nov 2020 14:37:53 +0100 Subject: [PATCH 2/2] GPU: Disable clang-tidy on this line since it triggers a false positive --- GPU/GPUTracking/Global/GPUChainTrackingIO.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GPU/GPUTracking/Global/GPUChainTrackingIO.cxx b/GPU/GPUTracking/Global/GPUChainTrackingIO.cxx index e5127f94654b5..ed94ad362d9c3 100644 --- a/GPU/GPUTracking/Global/GPUChainTrackingIO.cxx +++ b/GPU/GPUTracking/Global/GPUChainTrackingIO.cxx @@ -65,7 +65,7 @@ static constexpr char DUMP_HEADER[DUMP_HEADER_SIZE + 1] = "CAv1"; GPUChainTracking::InOutMemory::InOutMemory() = default; GPUChainTracking::InOutMemory::~InOutMemory() = default; GPUChainTracking::InOutMemory::InOutMemory(GPUChainTracking::InOutMemory&&) = default; -GPUChainTracking::InOutMemory& GPUChainTracking::InOutMemory::operator=(GPUChainTracking::InOutMemory&&) = default; +GPUChainTracking::InOutMemory& GPUChainTracking::InOutMemory::operator=(GPUChainTracking::InOutMemory&&) = default; // NOLINT: False positive in clang-tidy void GPUChainTracking::DumpData(const char* filename) {