From fef03607aa4b7b45ec0a3a087de29473fa0b1bb0 Mon Sep 17 00:00:00 2001
From: scott snyder <sss@karma>
Date: Wed, 14 Feb 2024 13:41:56 -0500
Subject: [PATCH] D3PDMakerUtils: Suppress cppcheck false positives.

Bogus cppcheck missingReturn warnings.
---
 .../D3PDMakerUtils/D3PDMakerUtils/BlockFillerTool.icc       | 5 ++---
 .../D3PDMakerUtils/D3PDMakerUtils/BlockFillerToolMulti.icc  | 3 ++-
 .../D3PDMakerUtils/D3PDMakerUtils/CollectionGetterTool.icc  | 3 ++-
 .../D3PDMakerUtils/D3PDMakerUtils/MultiAssociationTool.icc  | 6 +++---
 .../D3PDMakerUtils/MultiAssociationToolMulti.icc            | 3 ++-
 .../D3PDMakerUtils/SGCollectionGetterTool.icc               | 5 ++---
 6 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/BlockFillerTool.icc b/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/BlockFillerTool.icc
index 077bd02b2407..47e07602e900 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/BlockFillerTool.icc
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/BlockFillerTool.icc
@@ -1,8 +1,6 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file D3PDMakerUtils/BlockFillerTool.h
  * @author scott snyder <snyder@bnl.gov>
@@ -26,6 +24,7 @@ BlockFillerTool<T>::BlockFillerTool (const std::string& type,
                                      const IInterface* parent)
   : BlockFillerToolImpl (type, name, parent)
 {
+  // cppcheck-suppress missingReturn; false positive
 }
 
 
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/BlockFillerToolMulti.icc b/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/BlockFillerToolMulti.icc
index 723ddf9d9190..d32f9f8212c7 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/BlockFillerToolMulti.icc
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/BlockFillerToolMulti.icc
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 /**
  * @file D3PDMakerUtils/BlockFillerToolMulti.icc
@@ -32,6 +32,7 @@ BlockFillerTool<Types<T0> >::BlockFillerTool
   : BlockFillerToolImpl (type, name, parent),
     m_which (0)
 {
+  // cppcheck-suppress missingReturn; false positive
 }
 
 
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/CollectionGetterTool.icc b/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/CollectionGetterTool.icc
index a18e8ef3f6a1..5196636fddad 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/CollectionGetterTool.icc
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/CollectionGetterTool.icc
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 /**
  * @file D3PDMakerUtils/CollectionGetterTool.h 
@@ -80,6 +80,7 @@ CollectionGetterTool<CONT>::CollectionGetterTool (const std::string& type,
                                                   const IInterface* parent)
   : CollectionGetterToolImpl (type, name, parent)
 {
+  // cppcheck-suppress missingReturn; false positive
 }
 
 
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/MultiAssociationTool.icc b/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/MultiAssociationTool.icc
index 90e0ed4a3fb8..05a69f5b8853 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/MultiAssociationTool.icc
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/MultiAssociationTool.icc
@@ -1,8 +1,6 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file D3PDMakerUtils/MultiAssociationTool.icc
  * @author scott snyder <snyder@bnl.gov>
@@ -27,6 +25,7 @@ MultiAssociationToolTo<TO_T>::MultiAssociationToolTo
    const IInterface* parent)
     : MultiAssociationToolImpl (type, name, parent)
 {
+  // cppcheck-suppress missingReturn; false positive
 }
 
 
@@ -104,6 +103,7 @@ MultiAssociationTool<FROM_T, TO_T>::MultiAssociationTool
    const IInterface* parent)
     : MultiAssociationToolTo<TO_T> (type, name, parent)
 {
+  // cppcheck-suppress missingReturn; false positive
 }
 
 
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/MultiAssociationToolMulti.icc b/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/MultiAssociationToolMulti.icc
index 2e5fad9cd683..c9c9c02ab2ef 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/MultiAssociationToolMulti.icc
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/MultiAssociationToolMulti.icc
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 /**
  * @file D3PDMakerUtils/MultiAssociationToolMulti.icc
@@ -175,6 +175,7 @@ MultiAssociationTool<Types<T0>, Types<U0> >::MultiAssociationTool
    const IInterface* parent)
     : MultiAssociationTool<Types<T0>, U0> (type, name, parent)
 {
+  // cppcheck-suppress missingReturn; false positive
 }
 
 
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/SGCollectionGetterTool.icc b/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/SGCollectionGetterTool.icc
index f0a912670f21..08b1517efac3 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/SGCollectionGetterTool.icc
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/SGCollectionGetterTool.icc
@@ -1,8 +1,6 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file D3PDMakerUtils/SGCollectionGetterTool.icc
  * @author scott snyder <snyder@bnl.gov>
@@ -35,6 +33,7 @@ SGCollectionGetterTool<CONT>::SGCollectionGetterTool
   {
     REPORT_MESSAGE (MSG::ERROR) << "Can't set TypeName property for tool "
                                 << type << "/" << name;
+    // cppcheck-suppress missingReturn; false positive
   }
 }
 
-- 
GitLab