From d44c6373dbbccb63682f961ebe49f76466e1782a Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Mon, 18 Nov 2024 08:36:22 +0100
Subject: [PATCH] cppcheck: remove suppression of fixed false positives

Many of the "false positives" have been fixed in our current version of
cppcheck (2.16). Remove the suppression of these defects.
---
 .../ControlTest/test/SGDataLink_test.cxx      |  2 --
 .../CaloRec/src/CaloTopoClusterSplitter.cxx   |  1 -
 .../CaloRec/src/CaloTopoTmpHashClusterBase.h  |  2 --
 .../AthAllocators/ArenaHeapAllocator.h        |  1 -
 .../AthAllocators/ArenaPoolAllocator.h        |  1 -
 .../AthAllocators/ArenaPoolSTLAllocator.icc   |  1 -
 .../AthAllocators/src/ArenaAllocatorBase.cxx  |  1 -
 .../test/ArenaHeapSTLAllocator_test.cxx       |  1 -
 .../test/ArenaPoolSTLAllocator_test.cxx       |  1 -
 .../test/ArenaSharedHeapSTLAllocator_test.cxx |  1 -
 .../AthAnalysisBaseComps/AthAnalysisHelper.h  |  4 ---
 .../AthContainers/ConstAccessor.icc           |  2 --
 .../AthContainers/AthContainers/Decorator.icc |  1 -
 .../AthContainers/JaggedVecAccessor.icc       |  1 -
 .../AthContainers/JaggedVecConstAccessor.icc  |  3 ---
 .../AthContainers/PackedLinkAccessor.icc      |  1 -
 .../AthContainers/PackedLinkConstAccessor.icc |  2 --
 .../AthContainers/PackedLinkDecorator.icc     |  1 -
 .../AthContainers/tools/ELProxy.icc           |  1 -
 .../tools/PackedLinkConversions.icc           |  1 -
 .../AthContainers/Root/AuxTypeRegistry.cxx    |  1 -
 Control/AthLinks/AthLinks/AssociationMap.h    |  1 -
 .../AsgServices/AsgServices/ServiceStore.h    |  1 -
 .../AsgTools/AsgTools/AnaToolHandle.icc       |  1 -
 .../AsgTools/AsgTools/ToolStore.h             |  1 -
 .../AthenaKernel/AthenaKernel/DataBucket.icc  |  1 -
 .../src/HistogramFiller/HistogramFactory.cxx  |  1 -
 .../src/MixingEventSelector.cxx               |  1 -
 .../CxxUtils/ConcurrentHashmapImpl.icc        |  1 -
 .../CxxUtils/CxxUtils/ConcurrentRangeMap.h    |  2 --
 Control/CxxUtils/CxxUtils/sincos.h            |  1 -
 Control/CxxUtils/CxxUtils/span.icc            |  2 --
 Control/CxxUtils/Root/xxhash.h                | 27 -------------------
 Control/CxxUtils/test/vec_test_common.h       |  2 --
 Control/StoreGate/StoreGate/ReadCondHandle.h  |  1 -
 Control/StoreGate/StoreGate/ReadHandle.icc    |  1 -
 Control/StoreGate/StoreGate/WriteHandle.icc   |  1 -
 Database/IOVDbSvc/src/IOVDbFolder.h           |  1 -
 .../xAODBTagging/Root/BTaggingUtilities.cxx   |  1 -
 Event/xAOD/xAODJet/xAODJet/JetAccessors.h     |  1 -
 .../GeneratorFilters/src/BSignalFilter.cxx    |  1 -
 .../src/TTbarWToLeptonFilter.cxx              |  1 -
 .../src/xAODBSignalFilter.cxx                 |  1 -
 .../src/HGTD_DetectorFactory.cxx              |  1 -
 .../PixelCalibAlgs/Macro/PlotCs.C             |  1 -
 .../HamburgModel/data_processing.cpp          |  1 -
 .../SiSpacePoint/src/SCT_SpacePoint.cxx       |  1 -
 .../LArCalibTools/src/LArOFCBinAlg.cxx        |  1 -
 LArCalorimeter/LArG4/LArG4EC/src/HVHelper.cc  |  1 -
 .../src/EMECDetectorManager.cxx               |  2 --
 .../src/TGCDatabaseASDToPP.cxx                |  2 --
 MuonSpectrometer/MuonRDO/MuonRDO/TgcRdo.h     |  1 -
 .../src/MuonCombinePatternTool.cxx            |  1 -
 .../MuonPrepDataCollection.icc                |  1 -
 .../MuonPrepRawData/MuonPrepDataContainer.icc |  1 -
 .../src/MuPatCandidateTool.cxx                |  6 -----
 .../MuonTesterTree/VectorBranch.icc           |  1 -
 .../SystObjectUnioniserAlg.icc                |  1 -
 .../Root/ParsingInternals.h                   |  1 -
 .../D3PDMakerUtils/BlockFillerTool.icc        |  1 -
 .../D3PDMakerUtils/BlockFillerToolMulti.icc   |  1 -
 .../D3PDMakerUtils/CollectionGetterTool.icc   |  1 -
 .../D3PDMakerUtils/MultiAssociationTool.icc   |  2 --
 .../MultiAssociationToolMulti.icc             |  1 -
 .../D3PDMakerUtils/SGCollectionGetterTool.icc |  1 -
 .../src/VectorFillerToolBase.cxx              |  1 -
 .../src/BVertexClosestTrackTool.cxx           |  1 -
 .../FlavorTagDiscriminants/BacklinkAlg.icc    |  1 -
 .../FlavorTagDiscriminants/DecoratorAlg.icc   |  1 -
 .../src/LinkCounterAlg.icc                    |  1 -
 .../ParticleCaloAssociation.h                 |  1 -
 .../Monopole/src/G4mplEquationSetup.cxx       |  1 -
 .../CaloGeometry.h                            |  1 -
 .../tools/Identifier/Identifier.h             |  1 -
 .../src/DNNCaloSimSvc.cxx                     |  1 -
 .../src/dSFMTEngine.cxx                       |  1 -
 .../team5/TileCosmicView/TileGeoBuild.C       |  1 -
 .../src/detail/OnTrackCalibrator.icc          |  1 -
 .../TrkParametersBase/ParametersBase.icc      |  2 --
 ...TestTrkParametersIdentificationHelpers.cxx |  1 -
 .../TrkPrepRawData/PrepRawDataContainer.icc   |  1 -
 .../src/GlobalChi2Fitter.cxx                  |  2 --
 .../src/TargetBuffer_t.h                      |  2 --
 .../src/FullVertexFitter.cxx                  |  2 --
 .../TrigConfBase/TrigDBConnectionConfig.h     |  1 -
 .../TrigConfxAOD/src/xAODMenuWriterMT.cxx     | 12 ---------
 .../L1TopoSimulationUtils/L1TopoDataTypes.h   |  1 -
 .../IDScanZFinder/src/IDScanZFinderInternal.h |  1 -
 88 files changed, 149 deletions(-)

diff --git a/AtlasTest/ControlTest/test/SGDataLink_test.cxx b/AtlasTest/ControlTest/test/SGDataLink_test.cxx
index 7b820dc60da0..ece70255b8e0 100644
--- a/AtlasTest/ControlTest/test/SGDataLink_test.cxx
+++ b/AtlasTest/ControlTest/test/SGDataLink_test.cxx
@@ -230,7 +230,6 @@ namespace Athena_test
     assert(liint.index() == 1);
     assert(liint.dataID() == "a vector");
     cout << "*** DataLink_test StoreGate OK ***\n\n" <<endl;
-    // cppcheck-suppress memleak; false positive
   }
 
   void dummyToRemoveWarning(const Foo&) 
@@ -334,7 +333,6 @@ namespace Athena_test
     std::cout << "xxx " << der << " " << link.cptr() << "\n";
     //assert (link.cptr() == der);
     cout << "*** DataLink_test FwdBase OK ***\n\n" <<endl;
-    // cppcheck-suppress memleak; false positive
   }
 } //end namespace
 
diff --git a/Calorimeter/CaloRec/src/CaloTopoClusterSplitter.cxx b/Calorimeter/CaloRec/src/CaloTopoClusterSplitter.cxx
index f4fee9cc3535..5d28368a6ec9 100644
--- a/Calorimeter/CaloRec/src/CaloTopoClusterSplitter.cxx
+++ b/Calorimeter/CaloRec/src/CaloTopoClusterSplitter.cxx
@@ -945,7 +945,6 @@ StatusCode CaloTopoClusterSplitter::execute(const EventContext& ctx,
 	      // myNextCell list it is a shared cell, added to the
 	      // list of shared cells and removed from the cluster it
 	      // first was added to
-              // cppcheck-suppress invalidContainer; false positive
 	      while ( !isRemoved && nextCellIter != nextCellIterEnd ) {
 		if ( (*nextCellIter) == neighborCell ) {
 		  nextCellIter = myNextCells.erase(nextCellIter);
diff --git a/Calorimeter/CaloRec/src/CaloTopoTmpHashClusterBase.h b/Calorimeter/CaloRec/src/CaloTopoTmpHashClusterBase.h
index f8705900bee7..7d6ffffb272e 100644
--- a/Calorimeter/CaloRec/src/CaloTopoTmpHashClusterBase.h
+++ b/Calorimeter/CaloRec/src/CaloTopoTmpHashClusterBase.h
@@ -56,13 +56,11 @@ public:
 
     reference operator*()
     {
-      // cppcheck-suppress returnTempReference; false positive
       return reinterpret_cast<reference> (pointer_list::iterator::operator*());
     }
 
     reference operator->()
     {
-      // cppcheck-suppress returnTempReference; false positive
       return reinterpret_cast<reference> (pointer_list::iterator::operator*());
     }
   };
diff --git a/Control/AthAllocators/AthAllocators/ArenaHeapAllocator.h b/Control/AthAllocators/AthAllocators/ArenaHeapAllocator.h
index 204115d85de3..09a96606b297 100644
--- a/Control/AthAllocators/AthAllocators/ArenaHeapAllocator.h
+++ b/Control/AthAllocators/AthAllocators/ArenaHeapAllocator.h
@@ -182,7 +182,6 @@ public:
    * @c destructor should be called on them if it was provided
    * (preceded by @c clear if provided and @c mustClear was set).
    */
-  // cppcheck-suppress virtualCallInConstructor ; false positive
   virtual void erase() override final;
 
 
diff --git a/Control/AthAllocators/AthAllocators/ArenaPoolAllocator.h b/Control/AthAllocators/AthAllocators/ArenaPoolAllocator.h
index a3da6cc4d61e..5b7e5b356916 100644
--- a/Control/AthAllocators/AthAllocators/ArenaPoolAllocator.h
+++ b/Control/AthAllocators/AthAllocators/ArenaPoolAllocator.h
@@ -201,7 +201,6 @@ public:
    * @c destructor should be called on them if it was provided
    * (preceded by @c clear if provided and @c mustClear was set).
    */
-  // cppcheck-suppress virtualCallInConstructor ; false positive
   virtual void erase() override final;
 
 
diff --git a/Control/AthAllocators/AthAllocators/ArenaPoolSTLAllocator.icc b/Control/AthAllocators/AthAllocators/ArenaPoolSTLAllocator.icc
index ce8589816673..75ae8c771048 100644
--- a/Control/AthAllocators/AthAllocators/ArenaPoolSTLAllocator.icc
+++ b/Control/AthAllocators/AthAllocators/ArenaPoolSTLAllocator.icc
@@ -473,7 +473,6 @@ const std::string& ArenaPoolSTLAllocator<T*, VETO>::name() const
  *               allocator name.
  */
 template <class T>
-// cppcheck-suppress uninitMemberVar ; false positive
 ArenaPoolSTLAllocator<T, ATHVETO>::ArenaPoolSTLAllocator
  (size_t nblock /*= 1000*/, const std::string& name /*= ""*/)
     : m_nblock (nblock),
diff --git a/Control/AthAllocators/src/ArenaAllocatorBase.cxx b/Control/AthAllocators/src/ArenaAllocatorBase.cxx
index f95058ce1caf..4aa2e4d8ee8c 100644
--- a/Control/AthAllocators/src/ArenaAllocatorBase.cxx
+++ b/Control/AthAllocators/src/ArenaAllocatorBase.cxx
@@ -22,7 +22,6 @@ namespace SG {
 /**
  * @brief Constructor for a single statistic.
  */
-// cppcheck-suppress uninitMemberVar ; false positive
 ArenaAllocatorBase::Stats::Stat::Stat()
   : inuse (0),
     free (0),
diff --git a/Control/AthAllocators/test/ArenaHeapSTLAllocator_test.cxx b/Control/AthAllocators/test/ArenaHeapSTLAllocator_test.cxx
index 9e464a67675f..f62f453f32d9 100644
--- a/Control/AthAllocators/test/ArenaHeapSTLAllocator_test.cxx
+++ b/Control/AthAllocators/test/ArenaHeapSTLAllocator_test.cxx
@@ -37,7 +37,6 @@ struct Payload
   static std::vector<int> v ATLAS_THREAD_SAFE;
 };
 
-// cppcheck-suppress uninitMemberVar  // false positive
 Payload::Payload(int the_y)
 {
   x = n++;
diff --git a/Control/AthAllocators/test/ArenaPoolSTLAllocator_test.cxx b/Control/AthAllocators/test/ArenaPoolSTLAllocator_test.cxx
index d117bb9400aa..860fa4c98705 100644
--- a/Control/AthAllocators/test/ArenaPoolSTLAllocator_test.cxx
+++ b/Control/AthAllocators/test/ArenaPoolSTLAllocator_test.cxx
@@ -38,7 +38,6 @@ struct Payload
   static std::vector<int> v ATLAS_THREAD_SAFE;
 };
 
-// cppcheck-suppress uninitMemberVar  // false positive
 Payload::Payload(int the_y)
 {
   x = n++;
diff --git a/Control/AthAllocators/test/ArenaSharedHeapSTLAllocator_test.cxx b/Control/AthAllocators/test/ArenaSharedHeapSTLAllocator_test.cxx
index 734f630edc0e..455721308a07 100644
--- a/Control/AthAllocators/test/ArenaSharedHeapSTLAllocator_test.cxx
+++ b/Control/AthAllocators/test/ArenaSharedHeapSTLAllocator_test.cxx
@@ -41,7 +41,6 @@ struct Payload
   static std::vector<int> v ATLAS_THREAD_SAFE;
 };
 
-// cppcheck-suppress uninitMemberVar ; false positive
 Payload::Payload(int the_y)
 {
   x = n++;
diff --git a/Control/AthAnalysisBaseComps/AthAnalysisBaseComps/AthAnalysisHelper.h b/Control/AthAnalysisBaseComps/AthAnalysisBaseComps/AthAnalysisHelper.h
index d4d3c928e5bb..a51f57e992ea 100644
--- a/Control/AthAnalysisBaseComps/AthAnalysisBaseComps/AthAnalysisHelper.h
+++ b/Control/AthAnalysisBaseComps/AthAnalysisBaseComps/AthAnalysisHelper.h
@@ -329,14 +329,10 @@ public:
       //if the typeName is std::string, we will try to use the gaudi parsers to parse it
       //otherwise we try to do a straight assignment 
       try {
-        // cppcheck-suppress danglingTempReference; false positive
 	const coral::Attribute& attr = attrlist->second[key];
-        // cppcheck-suppress danglingTempReference; false positive
 	if(attr.specification().typeName()=="string") {
-          // cppcheck-suppress danglingTempReference; false positive
 	  if(Gaudi::Parsers::parse(out,attr.data<std::string>()).isFailure()) return StatusCode::FAILURE;
 	} else { //do a straight conversion, and just hope its ok (FIXME: should probably do a check of typeid(T) vs typeName)
-          // cppcheck-suppress danglingTempReference; false positive
 	  out = attr.data<T>();
 	}
       }
diff --git a/Control/AthContainers/AthContainers/ConstAccessor.icc b/Control/AthContainers/AthContainers/ConstAccessor.icc
index e2e8d94d0129..1a87d8c53f7f 100644
--- a/Control/AthContainers/AthContainers/ConstAccessor.icc
+++ b/Control/AthContainers/AthContainers/ConstAccessor.icc
@@ -44,7 +44,6 @@ ConstAccessor<T, ALLOC>::ConstAccessor
   (const std::string& name, const std::string& clsname)
   : ConstAccessor (name, clsname, SG::AuxVarFlags::None)
 {
-  // cppcheck-suppress missingReturn; false positive
 }
 
 
@@ -59,7 +58,6 @@ inline
 ConstAccessor<T, ALLOC>::ConstAccessor (const SG::auxid_t auxid)
   : ConstAccessor (auxid, SG::AuxVarFlags::None)
 {
-  // cppcheck-suppress missingReturn; false positive
 }
 
 
diff --git a/Control/AthContainers/AthContainers/Decorator.icc b/Control/AthContainers/AthContainers/Decorator.icc
index 16a099e4859e..8c3212fabe74 100644
--- a/Control/AthContainers/AthContainers/Decorator.icc
+++ b/Control/AthContainers/AthContainers/Decorator.icc
@@ -58,7 +58,6 @@ inline
 Decorator<T, ALLOC>::Decorator (const SG::auxid_t auxid)
   : Decorator (auxid, SG::AuxVarFlags::None)
 {
-  // cppcheck-suppress missingReturn; false positive
 }
 
 
diff --git a/Control/AthContainers/AthContainers/JaggedVecAccessor.icc b/Control/AthContainers/AthContainers/JaggedVecAccessor.icc
index 626541e41f20..1b6b750ae251 100644
--- a/Control/AthContainers/AthContainers/JaggedVecAccessor.icc
+++ b/Control/AthContainers/AthContainers/JaggedVecAccessor.icc
@@ -60,7 +60,6 @@ inline
 Accessor<JaggedVecElt<PAYLOAD_T>, ALLOC>::Accessor (const SG::auxid_t auxid)
   : Base (auxid)
 {
-  // cppcheck-suppress missingReturn; false positive
 }
 
 
diff --git a/Control/AthContainers/AthContainers/JaggedVecConstAccessor.icc b/Control/AthContainers/AthContainers/JaggedVecConstAccessor.icc
index 5c3da8782cd2..f6fb9dae2dd5 100644
--- a/Control/AthContainers/AthContainers/JaggedVecConstAccessor.icc
+++ b/Control/AthContainers/AthContainers/JaggedVecConstAccessor.icc
@@ -40,12 +40,10 @@ ConstAccessor<JaggedVecElt<PAYLOAD_T>, ALLOC>::ConstAccessor (const std::string&
  */
 template <class PAYLOAD_T, class ALLOC>
 inline
-// cppcheck-suppress uninitDerivedMemberVar; false positive
 ConstAccessor<JaggedVecElt<PAYLOAD_T>, ALLOC>::ConstAccessor
   (const std::string& name, const std::string& clsname)
   : ConstAccessor (name, clsname, AuxVarFlags::None)
 {
-  // cppcheck-suppress missingReturn; false positive
 }
 
 
@@ -101,7 +99,6 @@ inline
 ConstAccessor<JaggedVecElt<PAYLOAD_T>, ALLOC>::ConstAccessor (const detail::LinkedVarAccessorBase& b)
   : detail::LinkedVarAccessorBase (b)
 {
-  // cppcheck-suppress missingReturn; false positive
 }
 
 
diff --git a/Control/AthContainers/AthContainers/PackedLinkAccessor.icc b/Control/AthContainers/AthContainers/PackedLinkAccessor.icc
index 7304e84213c7..f90e11bf92c7 100644
--- a/Control/AthContainers/AthContainers/PackedLinkAccessor.icc
+++ b/Control/AthContainers/AthContainers/PackedLinkAccessor.icc
@@ -60,7 +60,6 @@ inline
 Accessor<PackedLink<CONT>, ALLOC>::Accessor (const SG::auxid_t auxid)
   : Base (auxid)
 {
-  // cppcheck-suppress missingReturn; false positive
 }
 
 
diff --git a/Control/AthContainers/AthContainers/PackedLinkConstAccessor.icc b/Control/AthContainers/AthContainers/PackedLinkConstAccessor.icc
index c865ab85d0b8..81f5513ce7f9 100644
--- a/Control/AthContainers/AthContainers/PackedLinkConstAccessor.icc
+++ b/Control/AthContainers/AthContainers/PackedLinkConstAccessor.icc
@@ -45,7 +45,6 @@ ConstAccessor<PackedLink<CONT>, ALLOC>::ConstAccessor
   (const std::string& name, const std::string& clsname)
   : ConstAccessor (name, clsname, AuxVarFlags::None)
 {
-  // cppcheck-suppress missingReturn; false positive
 }
 
 
@@ -65,7 +64,6 @@ ConstAccessor<PackedLink<CONT>, ALLOC>::ConstAccessor (const SG::auxid_t auxid)
   m_linkedAuxid = r.linkedVariable (m_auxid);
   if (m_linkedAuxid == static_cast<uint32_t>(null_auxid)) {
     throw SG::ExcNoLinkedVar (auxid, typeid (CONT));
-    // cppcheck-suppress missingReturn; false positive
   }
 }
 
diff --git a/Control/AthContainers/AthContainers/PackedLinkDecorator.icc b/Control/AthContainers/AthContainers/PackedLinkDecorator.icc
index 2d55765c26dd..31b7835c1291 100644
--- a/Control/AthContainers/AthContainers/PackedLinkDecorator.icc
+++ b/Control/AthContainers/AthContainers/PackedLinkDecorator.icc
@@ -63,7 +63,6 @@ Decorator<PackedLink<CONT>, ALLOC>::Decorator (const SG::auxid_t auxid)
   m_linkedAuxid = r.linkedVariable (m_auxid);
   if (m_linkedAuxid == static_cast<uint32_t>(null_auxid)) {
     throw SG::ExcNoLinkedVar (auxid, typeid (CONT));
-    // cppcheck-suppress missingReturn; false positive
   }
 }
 
diff --git a/Control/AthContainers/AthContainers/tools/ELProxy.icc b/Control/AthContainers/AthContainers/tools/ELProxy.icc
index cf1b5de48ac7..9ce7ac42e7cf 100644
--- a/Control/AthContainers/AthContainers/tools/ELProxy.icc
+++ b/Control/AthContainers/AthContainers/tools/ELProxy.icc
@@ -37,7 +37,6 @@ ELProxyValBase<CONT>::ELProxyValBase (AuxVectorData& container,
                                       SG::auxid_t linked_auxid)
   : m_cnv (container, auxid, linked_auxid)
 {
-  // cppcheck-suppress missingReturn; false positive
 }
 
 
diff --git a/Control/AthContainers/AthContainers/tools/PackedLinkConversions.icc b/Control/AthContainers/AthContainers/tools/PackedLinkConversions.icc
index 4e99be71b31d..a241f3750f02 100644
--- a/Control/AthContainers/AthContainers/tools/PackedLinkConversions.icc
+++ b/Control/AthContainers/AthContainers/tools/PackedLinkConversions.icc
@@ -96,7 +96,6 @@ PackedLinkConverter<CONT>::PackedLinkConverter (AuxVectorData& container,
     m_linkedVec (container, auxid),
     m_dlinks (*container.getDataSpan (linked_auxid))
 {
-  // cppcheck-suppress missingReturn; false positive
 }
 
 
diff --git a/Control/AthContainers/Root/AuxTypeRegistry.cxx b/Control/AthContainers/Root/AuxTypeRegistry.cxx
index b41afdd59622..5b15a2839376 100644
--- a/Control/AthContainers/Root/AuxTypeRegistry.cxx
+++ b/Control/AthContainers/Root/AuxTypeRegistry.cxx
@@ -554,7 +554,6 @@ AuxTypeRegistryImpl::addFactory (lock_t& /*lock*/,
   else
     m_factories.insert_or_assign (key, factory.release());
 
-  // cppcheck-suppress returnDanglingLifetime; false positive
   return fac;
 }
 
diff --git a/Control/AthLinks/AthLinks/AssociationMap.h b/Control/AthLinks/AthLinks/AssociationMap.h
index fe6265edcb0f..844f45629ba7 100644
--- a/Control/AthLinks/AthLinks/AssociationMap.h
+++ b/Control/AthLinks/AthLinks/AssociationMap.h
@@ -137,7 +137,6 @@ class AssociationMap
 
   /// \brief finding an object with allocation
   object_iterator findObject(const object_type* theObject) const
-    // cppcheck-suppress returnDanglingLifetime; false positive
     { return object_iterator(m_associationMap).find(theObject); }
 
   /// \brief testing if object is in store
diff --git a/Control/AthToolSupport/AsgServices/AsgServices/ServiceStore.h b/Control/AthToolSupport/AsgServices/AsgServices/ServiceStore.h
index 1b035626a124..ba47c9bfea9f 100644
--- a/Control/AthToolSupport/AsgServices/AsgServices/ServiceStore.h
+++ b/Control/AthToolSupport/AsgServices/AsgServices/ServiceStore.h
@@ -52,7 +52,6 @@ namespace asg
 
     /// Retrieve a service by name and interface.
     template< typename T >
-    // cppcheck-suppress constStatement; false positive
     static std::shared_ptr<T> get( const std::string& name )
     {
       return std::dynamic_pointer_cast< T >( get( name ) );
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/AnaToolHandle.icc b/Control/AthToolSupport/AsgTools/AsgTools/AnaToolHandle.icc
index 0ca7388f5efe..78678fb4df33 100644
--- a/Control/AthToolSupport/AsgTools/AsgTools/AnaToolHandle.icc
+++ b/Control/AthToolSupport/AsgTools/AsgTools/AnaToolHandle.icc
@@ -586,7 +586,6 @@ namespace asg
       break;
     }
 
-    // cppcheck-suppress constStatement; false positive
     T *toolPtr = nullptr;
     ANA_CHECK (makeToolRetrieve (toolPtr, th));
 
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/ToolStore.h b/Control/AthToolSupport/AsgTools/AsgTools/ToolStore.h
index 78a6923a01ec..30aede7da035 100644
--- a/Control/AthToolSupport/AsgTools/AsgTools/ToolStore.h
+++ b/Control/AthToolSupport/AsgTools/AsgTools/ToolStore.h
@@ -41,7 +41,6 @@ namespace asg {
 
       /// Retrieve a tool by name and interface.
       template< typename T >
-      // cppcheck-suppress constStatement; false positive
       static T* get( const std::string& name ) {
 
          return dynamic_cast< T* >( get( name ) );
diff --git a/Control/AthenaKernel/AthenaKernel/DataBucket.icc b/Control/AthenaKernel/AthenaKernel/DataBucket.icc
index 52d5bc9da902..86ce35a2de51 100755
--- a/Control/AthenaKernel/AthenaKernel/DataBucket.icc
+++ b/Control/AthenaKernel/AthenaKernel/DataBucket.icc
@@ -68,7 +68,6 @@ SG::DataBucket<T>::DataBucket(T* data)
 
 template <typename T>
 template <typename U>
-// cppcheck-suppress uninitMemberVar ; false positive
 SG::DataBucket<T>::DataBucket(std::unique_ptr<U> data)
     // Rely on our caller to retain constness.
     // cppcheck 2.12 puts the identifier used for the argument here in the
diff --git a/Control/AthenaMonitoringKernel/src/HistogramFiller/HistogramFactory.cxx b/Control/AthenaMonitoringKernel/src/HistogramFiller/HistogramFactory.cxx
index eb007d84ce61..1496795aac53 100644
--- a/Control/AthenaMonitoringKernel/src/HistogramFiller/HistogramFactory.cxx
+++ b/Control/AthenaMonitoringKernel/src/HistogramFiller/HistogramFactory.cxx
@@ -223,7 +223,6 @@ HBASE* HistogramFactory::create(const HistogramDef& def, Types&&... hargs) {
   { 
     std::scoped_lock<std::mutex> dirLock(globalROOTMutex());
     h = new H(def.alias.c_str(), def.title.c_str(), std::forward<Types>(hargs)...);
-    // cppcheck-suppress nullPointer; false positive
     h->SetDirectory(0);
   }
   if ( !m_histSvc->regHist( fullName, std::unique_ptr<TH1>(h) ) ) {
diff --git a/Control/AthenaServices/src/MixingEventSelector.cxx b/Control/AthenaServices/src/MixingEventSelector.cxx
index 8a5bf21eaab4..9866db82357d 100644
--- a/Control/AthenaServices/src/MixingEventSelector.cxx
+++ b/Control/AthenaServices/src/MixingEventSelector.cxx
@@ -423,7 +423,6 @@ IEvtSelector::Context& MixingEventSelector::Trigger::currentContext() const {
       throw GaudiException("MixingEventSelector::Trigger::currentContext(): can't create context",
 			   name(),StatusCode::FAILURE);
   }
-  // cppcheck-suppress nullPointerRedundantCheck; false positive
   //  createContext() sets m_current
   return *m_current;
 }
diff --git a/Control/CxxUtils/CxxUtils/ConcurrentHashmapImpl.icc b/Control/CxxUtils/CxxUtils/ConcurrentHashmapImpl.icc
index a34b3bfc41c5..c8ff77ad8282 100644
--- a/Control/CxxUtils/CxxUtils/ConcurrentHashmapImpl.icc
+++ b/Control/CxxUtils/CxxUtils/ConcurrentHashmapImpl.icc
@@ -291,7 +291,6 @@ CHMIMPL::ConcurrentHashmapImpl (Updater_t&& updater,
   // Round up capacity to a power of 2.
   size_t capacity = round_up (capacity_in);
 
-  // cppcheck-suppress noDestructor // false positive
   m_table = new (capacity) Table (capacity, hasher, matcher);
   m_updater.update (std::unique_ptr<Table> (m_table), ctx);
 }
diff --git a/Control/CxxUtils/CxxUtils/ConcurrentRangeMap.h b/Control/CxxUtils/CxxUtils/ConcurrentRangeMap.h
index 1a39969ad22f..2b5430d82995 100644
--- a/Control/CxxUtils/CxxUtils/ConcurrentRangeMap.h
+++ b/Control/CxxUtils/CxxUtils/ConcurrentRangeMap.h
@@ -243,7 +243,6 @@ public:
   struct DeletePayload
   {
     /// Initialize with an explicit deletion function.
-    // cppcheck-suppress uninitMemberVar  // false positive
     DeletePayload (delete_function* delfcn)
       : m_delete (delfcn)
     {
@@ -256,7 +255,6 @@ public:
       delete reinterpret_cast<const U*>(p);
     }
     template <class U>
-    // cppcheck-suppress uninitMemberVar  // false positive
     DeletePayload (const std::default_delete<U>&)
     {
       m_delete = delfcn<U>;
diff --git a/Control/CxxUtils/CxxUtils/sincos.h b/Control/CxxUtils/CxxUtils/sincos.h
index e6ba0026b441..b3c41f133890 100644
--- a/Control/CxxUtils/CxxUtils/sincos.h
+++ b/Control/CxxUtils/CxxUtils/sincos.h
@@ -74,7 +74,6 @@ namespace CxxUtils {
  */
 struct sincos
 {
-  // cppcheck-suppress uninitMemberVar  ; false positive
   /// Calculate sine and cosine of x.
   sincos (double x)
 #if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
diff --git a/Control/CxxUtils/CxxUtils/span.icc b/Control/CxxUtils/CxxUtils/span.icc
index 0f37f8d17528..2aa515fdf779 100644
--- a/Control/CxxUtils/CxxUtils/span.icc
+++ b/Control/CxxUtils/CxxUtils/span.icc
@@ -42,7 +42,6 @@ span<T>::span (U* ptr, size_type sz)
   : m_ptr (ptr),
     m_size (sz)
 {
-  // cppcheck-suppress missingReturn; false positive
 }
 
 
@@ -63,7 +62,6 @@ span<T>::span (U* beg, U* end)
   : m_ptr (beg),
     m_size (end-beg)
 {
-  // cppcheck-suppress missingReturn; false positive
 }
 
 
diff --git a/Control/CxxUtils/Root/xxhash.h b/Control/CxxUtils/Root/xxhash.h
index 6b4729f8fd97..66fae435cea2 100644
--- a/Control/CxxUtils/Root/xxhash.h
+++ b/Control/CxxUtils/Root/xxhash.h
@@ -2531,15 +2531,10 @@ XXH_PUBLIC_API void XXH32_copyState(XXH32_state_t* dstState, const XXH32_state_t
 XXH_PUBLIC_API XXH_errorcode XXH32_reset(XXH32_state_t* statePtr, XXH32_hash_t seed)
 {
     XXH_ASSERT(statePtr != NULL);
-    // cppcheck-suppress nullPointerRedundantCheck; false positive
     memset(statePtr, 0, sizeof(*statePtr));
-    // cppcheck-suppress nullPointerRedundantCheck; false positive
     statePtr->v[0] = seed + XXH_PRIME32_1 + XXH_PRIME32_2;
-    // cppcheck-suppress nullPointerRedundantCheck; false positive
     statePtr->v[1] = seed + XXH_PRIME32_2;
-    // cppcheck-suppress nullPointerRedundantCheck; false positive
     statePtr->v[2] = seed + 0;
-    // cppcheck-suppress nullPointerRedundantCheck; false positive
     statePtr->v[3] = seed - XXH_PRIME32_1;
     return XXH_OK;
 }
@@ -2978,15 +2973,10 @@ XXH_PUBLIC_API void XXH64_copyState(XXH_NOESCAPE XXH64_state_t* dstState, const
 XXH_PUBLIC_API XXH_errorcode XXH64_reset(XXH_NOESCAPE XXH64_state_t* statePtr, XXH64_hash_t seed)
 {
     XXH_ASSERT(statePtr != NULL);
-    // cppcheck-suppress nullPointerRedundantCheck; false positive
     memset(statePtr, 0, sizeof(*statePtr));
-    // cppcheck-suppress nullPointerRedundantCheck; false positive
     statePtr->v[0] = seed + XXH_PRIME64_1 + XXH_PRIME64_2;
-    // cppcheck-suppress nullPointerRedundantCheck; false positive
     statePtr->v[1] = seed + XXH_PRIME64_2;
-    // cppcheck-suppress nullPointerRedundantCheck; false positive
     statePtr->v[2] = seed + 0;
-    // cppcheck-suppress nullPointerRedundantCheck; false positive
     statePtr->v[3] = seed - XXH_PRIME64_1;
     return XXH_OK;
 }
@@ -3955,7 +3945,6 @@ XXH3_len_1to3_64b(const xxh_u8* input, size_t len, const xxh_u8* secret, XXH64_h
         xxh_u8  const c3 = input[len - 1];
         xxh_u32 const combined = ((xxh_u32)c1 << 16) | ((xxh_u32)c2  << 24)
                                | ((xxh_u32)c3 <<  0) | ((xxh_u32)len << 8);
-        // cppcheck-suppress nullPointerArithmeticRedundantCheck; false positive
         xxh_u64 const bitflip = (XXH_readLE32(secret) ^ XXH_readLE32(secret+4)) + seed;
         xxh_u64 const keyed = (xxh_u64)combined ^ bitflip;
         return XXH64_avalanche(keyed);
@@ -5513,29 +5502,17 @@ XXH3_reset_internal(XXH3_state_t* statePtr,
     XXH_ASSERT(offsetof(XXH3_state_t, nbStripesPerBlock) > initStart);
     XXH_ASSERT(statePtr != NULL);
     /* set members from bufferedSize to nbStripesPerBlock (excluded) to 0 */
-    // cppcheck-suppress nullPointerArithmeticRedundantCheck; false positive
     memset((char*)statePtr + initStart, 0, initLength);
-    // cppcheck-suppress nullPointerRedundantCheck; false positive
     statePtr->acc[0] = XXH_PRIME32_3;
-    // cppcheck-suppress nullPointerRedundantCheck; false positive
     statePtr->acc[1] = XXH_PRIME64_1;
-    // cppcheck-suppress nullPointerRedundantCheck; false positive
     statePtr->acc[2] = XXH_PRIME64_2;
-    // cppcheck-suppress nullPointerRedundantCheck; false positive
     statePtr->acc[3] = XXH_PRIME64_3;
-    // cppcheck-suppress nullPointerRedundantCheck; false positive
     statePtr->acc[4] = XXH_PRIME64_4;
-    // cppcheck-suppress nullPointerRedundantCheck; false positive
     statePtr->acc[5] = XXH_PRIME32_2;
-    // cppcheck-suppress nullPointerRedundantCheck; false positive
     statePtr->acc[6] = XXH_PRIME64_5;
-    // cppcheck-suppress nullPointerRedundantCheck; false positive
     statePtr->acc[7] = XXH_PRIME32_1;
-    // cppcheck-suppress nullPointerRedundantCheck; false positive
     statePtr->seed = seed;
-    // cppcheck-suppress nullPointerRedundantCheck; false positive
     statePtr->useSeed = (seed != 0);
-    // cppcheck-suppress nullPointerRedundantCheck; false positive
     statePtr->extSecret = (const unsigned char*)secret;
     XXH_ASSERT(secretSize >= XXH3_SECRET_SIZE_MIN);
     statePtr->secretLimit = secretSize - XXH_STRIPE_LEN;
@@ -5660,7 +5637,6 @@ XXH3_update(XXH3_state_t* XXH_RESTRICT const state,
 
     XXH_ASSERT(state != NULL);
     {   const xxh_u8* const bEnd = input + len;
-        // cppcheck-suppress nullPointerRedundantCheck; false positive
         const unsigned char* const secret = (state->extSecret == NULL) ? state->customSecret : state->extSecret;
 #if defined(XXH3_STREAM_USE_STACK) && XXH3_STREAM_USE_STACK >= 1
         /* For some reason, gcc and MSVC seem to suffer greatly
@@ -5828,9 +5804,7 @@ XXH3_len_1to3_128b(const xxh_u8* input, size_t len, const xxh_u8* secret, XXH64_
         xxh_u32 const combinedl = ((xxh_u32)c1 <<16) | ((xxh_u32)c2 << 24)
                                 | ((xxh_u32)c3 << 0) | ((xxh_u32)len << 8);
         xxh_u32 const combinedh = XXH_rotl32(XXH_swap32(combinedl), 13);
-        // cppcheck-suppress nullPointerArithmeticRedundantCheck; false positive
         xxh_u64 const bitflipl = (XXH_readLE32(secret) ^ XXH_readLE32(secret+4)) + seed;
-        // cppcheck-suppress nullPointerArithmeticRedundantCheck; false positive
         xxh_u64 const bitfliph = (XXH_readLE32(secret+8) ^ XXH_readLE32(secret+12)) - seed;
         xxh_u64 const keyed_lo = (xxh_u64)combinedl ^ bitflipl;
         xxh_u64 const keyed_hi = (xxh_u64)combinedh ^ bitfliph;
@@ -6417,7 +6391,6 @@ XXH3_generateSecret_fromSeed(XXH_NOESCAPE void* secretBuffer, XXH64_hash_t seed)
     XXH_ALIGN(XXH_SEC_ALIGN) xxh_u8 secret[XXH_SECRET_DEFAULT_SIZE];
     XXH3_initCustomSecret(secret, seed);
     XXH_ASSERT(secretBuffer != NULL);
-    // cppcheck-suppress nullPointerRedundantCheck; false positive
     memcpy(secretBuffer, secret, XXH_SECRET_DEFAULT_SIZE);
 }
 
diff --git a/Control/CxxUtils/test/vec_test_common.h b/Control/CxxUtils/test/vec_test_common.h
index 9d48cd1504d3..77aca7e3df4d 100644
--- a/Control/CxxUtils/test/vec_test_common.h
+++ b/Control/CxxUtils/test/vec_test_common.h
@@ -159,10 +159,8 @@ NO_SANITIZE_UNDEFINED(const VEC& v1)
   TEST(&, _);
   TEST(%, _);
   if (!std::is_signed_v<T>) {
-    // cppcheck-suppress compareBoolExpressionWithInt  // false positive
     TEST(<<, MOD);
   }
-  // cppcheck-suppress compareBoolExpressionWithInt  // false positive
   TEST(>>, MOD);
 
 #undef TEST
diff --git a/Control/StoreGate/StoreGate/ReadCondHandle.h b/Control/StoreGate/StoreGate/ReadCondHandle.h
index b563c05de285..2534a6522686 100644
--- a/Control/StoreGate/StoreGate/ReadCondHandle.h
+++ b/Control/StoreGate/StoreGate/ReadCondHandle.h
@@ -95,7 +95,6 @@ namespace SG {
   ReadCondHandle<T>::ReadCondHandle(const SG::ReadCondHandleKey<T>& key):
   ReadCondHandle(key, Gaudi::Hive::currentContext())
   {
-    // cppcheck-suppress missingReturn; false positive
   }
 
   //---------------------------------------------------------------------------
diff --git a/Control/StoreGate/StoreGate/ReadHandle.icc b/Control/StoreGate/StoreGate/ReadHandle.icc
index 504d37a66ba9..815f3043e67b 100644
--- a/Control/StoreGate/StoreGate/ReadHandle.icc
+++ b/Control/StoreGate/StoreGate/ReadHandle.icc
@@ -278,7 +278,6 @@ inline
 ReadHandle<T>::ReadHandle (const VarHandleKey& key, const EventContext* ctx)
   : VarHandleBase (key, ctx)
 {
-  // cppcheck-suppress missingReturn; false positive
 }
 
 
diff --git a/Control/StoreGate/StoreGate/WriteHandle.icc b/Control/StoreGate/StoreGate/WriteHandle.icc
index 6e9a991aa189..6c612591b9c8 100644
--- a/Control/StoreGate/StoreGate/WriteHandle.icc
+++ b/Control/StoreGate/StoreGate/WriteHandle.icc
@@ -86,7 +86,6 @@ WriteHandle<T>::WriteHandle (const WriteHandleKey<T>& key,
                              const EventContext& ctx)
   : VarHandleBase (key, &ctx)
 {
-  // cppcheck-suppress missingReturn; false positive
 }
 
 
diff --git a/Database/IOVDbSvc/src/IOVDbFolder.h b/Database/IOVDbSvc/src/IOVDbFolder.h
index 112e365b7c87..04a76401521e 100644
--- a/Database/IOVDbSvc/src/IOVDbFolder.h
+++ b/Database/IOVDbSvc/src/IOVDbFolder.h
@@ -386,7 +386,6 @@ inline const IOVRange& IOVDbFolder::currentRange() const { return m_currange; }
 
 inline bool IOVDbFolder::cacheValid(const cool::ValidityKey reftime) const {
   const auto & [cacheStart, cacheStop]=m_iovs.getCacheBounds();
-  // cppcheck-suppress incorrectLogicOperator; cppcheck 2.6 false positive: it doesn't understand destructuring
   return ((reftime>cacheStart) and (reftime<cacheStop));
 }
 
diff --git a/Event/xAOD/xAODBTagging/Root/BTaggingUtilities.cxx b/Event/xAOD/xAODBTagging/Root/BTaggingUtilities.cxx
index c761a43f0ecf..07e06ec3aa93 100644
--- a/Event/xAOD/xAODBTagging/Root/BTaggingUtilities.cxx
+++ b/Event/xAOD/xAODBTagging/Root/BTaggingUtilities.cxx
@@ -49,7 +49,6 @@ namespace xAOD::BTaggingUtilities {
    const ElementLink< xAOD::BTaggingContainer >&
    getBTaggingLink( const SG::AuxElement& part ) {
 
-     // cppcheck-suppress returnTempReference; false positive
      return DEFAULT_ACC( part );
    }
 
diff --git a/Event/xAOD/xAODJet/xAODJet/JetAccessors.h b/Event/xAOD/xAODJet/xAODJet/JetAccessors.h
index 6e972807c028..5b6de5dcccf0 100644
--- a/Event/xAOD/xAODJet/xAODJet/JetAccessors.h
+++ b/Event/xAOD/xAODJet/xAODJet/JetAccessors.h
@@ -282,7 +282,6 @@ namespace xAOD {
       bool isAvailable(const SG::AuxElement& p) const { return m_a.isAvailable(p);}
 
       // // forward calls to internal accessor. useful for performance critical code.
-      // cppcheck-suppress CastIntegerToAddressAtReturn // false positive
       const TYPE* operator()  (const SG::AuxElement& p)  const  { return getAttribute(p); }
       // TYPE& operator()(SG::AuxElement& p)  { LinkType &el=m_a(p); return *el;}
 
diff --git a/Generators/GeneratorFilters/src/BSignalFilter.cxx b/Generators/GeneratorFilters/src/BSignalFilter.cxx
index 98c181a02ae4..88ea04a9c8cc 100644
--- a/Generators/GeneratorFilters/src/BSignalFilter.cxx
+++ b/Generators/GeneratorFilters/src/BSignalFilter.cxx
@@ -230,7 +230,6 @@ StatusCode BSignalFilter::filterEvent()
 		  ATH_MSG_DEBUG(" *** BSignalFilter.cxx: B-signal found ***  ");
 		  ATH_MSG_DEBUG(" ------------------------------------------ ");
 		  ATH_MSG_DEBUG("");
-                  // cppcheck-suppress shiftNegative; false positive
 		  ATH_MSG_DEBUG(" Event " << m_EventCnt << " --> B-hadron/B-meson (" << HadronName << ") " << part);
 		  ATH_MSG_DEBUG("");
 
diff --git a/Generators/GeneratorFilters/src/TTbarWToLeptonFilter.cxx b/Generators/GeneratorFilters/src/TTbarWToLeptonFilter.cxx
index dacd166811d2..9053689b4b7d 100644
--- a/Generators/GeneratorFilters/src/TTbarWToLeptonFilter.cxx
+++ b/Generators/GeneratorFilters/src/TTbarWToLeptonFilter.cxx
@@ -156,7 +156,6 @@ StatusCode TTbarWToLeptonFilter::filterEvent() {
       HepMC::GenParticle * grandchild_mcpart = (*grandchild_mcpartItr);
 		  int grandchild_pid = grandchild_mcpart->pdg_id();
 
-                  // cppcheck-suppress shiftNegative; false positive!
 		  ATH_MSG_DEBUG("W (t/tbar) has " << mcpart_n_particles_out << " children and the pdg_id of the next is " << grandchild_pid);
 
 		  // Check if the W's child is W again. If yes, then move to its next decay vertex in a decay tree
diff --git a/Generators/GeneratorFilters/src/xAODBSignalFilter.cxx b/Generators/GeneratorFilters/src/xAODBSignalFilter.cxx
index e57608c8851f..4f7fe7ec509e 100644
--- a/Generators/GeneratorFilters/src/xAODBSignalFilter.cxx
+++ b/Generators/GeneratorFilters/src/xAODBSignalFilter.cxx
@@ -243,7 +243,6 @@ if (LVL1Passed && (m_localLVL2MuonCutOn || m_localLVL2ElectronCutOn))
                     ATH_MSG_DEBUG(" *** xAODBSignalFilter.cxx: B-signal found ***  ");
                     ATH_MSG_DEBUG(" ------------------------------------------ ");
                     ATH_MSG_DEBUG("");
-                    // cppcheck-suppress shiftNegative; false positive
                     ATH_MSG_DEBUG(" Event " << m_EventCnt << " --> B-hadron/B-meson (" << HadronName << ") " << part);
                     ATH_MSG_DEBUG("");
 
diff --git a/HighGranularityTimingDetector/HGTD_DetDescr/HGTD_GeoModel/src/HGTD_DetectorFactory.cxx b/HighGranularityTimingDetector/HGTD_DetDescr/HGTD_GeoModel/src/HGTD_DetectorFactory.cxx
index e3a82a9bb8b1..123399269a56 100644
--- a/HighGranularityTimingDetector/HGTD_DetDescr/HGTD_GeoModel/src/HGTD_DetectorFactory.cxx
+++ b/HighGranularityTimingDetector/HGTD_DetDescr/HGTD_GeoModel/src/HGTD_DetectorFactory.cxx
@@ -1117,7 +1117,6 @@ std::vector<ModulePosition> HGTD_DetectorFactory::prepareModulePositionsInRowTwo
         }
         // the rest of the modules follow sequential, radius-dependent placement rules
         else {
-            // cppcheck-suppress containerOutOfBounds; false positive
             ModulePosition prev = modulePositions.back();
             double spacing = m_hgtdPars.moduleSpaceInner;
             // if the previous module was completely outside rMid, increase the spacing
diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/Macro/PlotCs.C b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/Macro/PlotCs.C
index c96f9d924265..9f410ca6af6b 100644
--- a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/Macro/PlotCs.C
+++ b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/Macro/PlotCs.C
@@ -105,7 +105,6 @@ for(int iCS = 0; iCS < maxcs; iCS++){
 	if(sum) index = maxcs-1-iCS;
 	int color = index+2;
 	if(color == 10) color = 1;
-        // cppcheck-suppress arrayIndexOutOfBoundsCond; false positive
 	TH1F *swap = histo[index];
 	if(sum) swap->Scale(1/first->GetEntries());
 	swap->Draw(options.c_str());
diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/RadDamage/HamburgModel/data_processing.cpp b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/RadDamage/HamburgModel/data_processing.cpp
index 53d5d6abd20b..280987ac6047 100644
--- a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/RadDamage/HamburgModel/data_processing.cpp
+++ b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/RadDamage/HamburgModel/data_processing.cpp
@@ -554,7 +554,6 @@ get_Profile(const string & filename)                                 // reads in
 
             if(input_file.eof())break;                          	// if end of file is reached: break the loop
 
-            // cppcheck-suppress constStatement; false positve
             limit_file_size_input--;
             if(limit_file_size_input==0)break;
         }
diff --git a/InnerDetector/InDetRecEvent/SiSpacePoint/src/SCT_SpacePoint.cxx b/InnerDetector/InDetRecEvent/SiSpacePoint/src/SCT_SpacePoint.cxx
index 72fc65f9c545..8f245c6632d6 100755
--- a/InnerDetector/InDetRecEvent/SiSpacePoint/src/SCT_SpacePoint.cxx
+++ b/InnerDetector/InDetRecEvent/SiSpacePoint/src/SCT_SpacePoint.cxx
@@ -59,7 +59,6 @@ void SCT_SpacePoint::setupLocalCovarianceSCT() {
   constexpr double elem11 = 1600. * deltaY;
   Amg::MatrixX cov(2, 2);
   cov << deltaY, offdiag,
-      // cppcheck-suppress constStatement; false positive
       offdiag, elem11;
 
   Trk::MeasurementBase::m_localCovariance = std::move(cov);
diff --git a/LArCalorimeter/LArCalibTools/src/LArOFCBinAlg.cxx b/LArCalorimeter/LArCalibTools/src/LArOFCBinAlg.cxx
index 5ab0545e3016..bf6052c43ee5 100644
--- a/LArCalorimeter/LArCalibTools/src/LArOFCBinAlg.cxx
+++ b/LArCalorimeter/LArCalibTools/src/LArOFCBinAlg.cxx
@@ -74,7 +74,6 @@ StatusCode LArOFCBinAlg::execute() {
     unsigned chidint;
     float offset[3];
        rein >> std::hex>>chidint >>std::dec>> offset[0] >>offset[1] >>offset[2];
-       // cppcheck-suppress identicalInnerCondition; false positive
        if(rein.good()){
           const HWIdentifier fid(chidint);
           for(unsigned i=0; i<3; ++i) offsetMap[i][fid]=offset[i];
diff --git a/LArCalorimeter/LArG4/LArG4EC/src/HVHelper.cc b/LArCalorimeter/LArG4/LArG4EC/src/HVHelper.cc
index d110d670a529..b8f473bd0fa4 100644
--- a/LArCalorimeter/LArG4/LArG4EC/src/HVHelper.cc
+++ b/LArCalorimeter/LArG4/LArG4EC/src/HVHelper.cc
@@ -71,7 +71,6 @@ FILE * HVHelper::OpenFileAndCheckVersion(const G4String &version)
 
     const size_t buf_size = 80;
     char buf[buf_size] = { 0 };
-    // cppcheck-suppress nullPointerRedundantCheck; false positive: G4Exception doesn't return
     fgets(buf, buf_size, F);
     char *v = buf + 9;
     if(version == "v02" || version == "v99") v ++;
diff --git a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/src/EMECDetectorManager.cxx b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/src/EMECDetectorManager.cxx
index d6fa87931189..ed9f3d80858c 100755
--- a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/src/EMECDetectorManager.cxx
+++ b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/src/EMECDetectorManager.cxx
@@ -146,7 +146,6 @@ const EMECHVManager& EMECDetectorManager::getHVManager (EMECHVManager::IOType io
       m_HVManager[io].set (&(manager->getEMECHVManager(io)));
     }
   }
-  // cppcheck-suppress nullPointerRedundantCheck; false positive
   return *(m_HVManager[io].get());
 }
 
@@ -159,6 +158,5 @@ const EMECPresamplerHVManager& EMECDetectorManager::getPresamplerHVManager () co
       m_presamplerHVManager.set (&(manager->getEMECPresamplerHVManager()));
     }
   }
-  // cppcheck-suppress nullPointerRedundantCheck; false positive
   return *m_presamplerHVManager.get();
 }
diff --git a/MuonSpectrometer/MuonCablings/MuonTGC_Cabling/src/TGCDatabaseASDToPP.cxx b/MuonSpectrometer/MuonCablings/MuonTGC_Cabling/src/TGCDatabaseASDToPP.cxx
index 33c47dcfbf39..09c2a0132e1f 100644
--- a/MuonSpectrometer/MuonCablings/MuonTGC_Cabling/src/TGCDatabaseASDToPP.cxx
+++ b/MuonSpectrometer/MuonCablings/MuonTGC_Cabling/src/TGCDatabaseASDToPP.cxx
@@ -280,7 +280,6 @@ void TGCDatabaseASDToPP::makeIndexDBIn(void)
 
 int TGCDatabaseASDToPP::convertIndexDBIn(int* indexIn) const
 {
-  // cppcheck-suppress uninitvar; false positive
   int converted = indexIn[0]-m_minIndexIn[0];
   for(int iIndexIn=1; iIndexIn<NIndexIn; iIndexIn++) {
     converted *= (m_maxIndexIn[iIndexIn]-m_minIndexIn[iIndexIn]+1);
@@ -311,7 +310,6 @@ void TGCDatabaseASDToPP::makeIndexDBOut(void)
 
 int TGCDatabaseASDToPP::convertIndexDBOut(int* indexOut) const
 {
-  // cppcheck-suppress uninitvar; false positive
   int converted = indexOut[0]-m_minIndexOut[0];
   for(int iIndexOut=1; iIndexOut<NIndexOut; iIndexOut++) {
     converted *= (m_maxIndexOut[iIndexOut]-m_minIndexOut[iIndexOut]+1);
diff --git a/MuonSpectrometer/MuonRDO/MuonRDO/TgcRdo.h b/MuonSpectrometer/MuonRDO/MuonRDO/TgcRdo.h
index c6bae9f7fecd..258ce3ffa9f3 100755
--- a/MuonSpectrometer/MuonRDO/MuonRDO/TgcRdo.h
+++ b/MuonSpectrometer/MuonRDO/MuonRDO/TgcRdo.h
@@ -225,7 +225,6 @@ public:
     // ??? This overrides DataVector::clear() with something that
     //     does something different.  Should probably be called
     //     something else.
-    // cppcheck-suppress duplInheritedMember  ; false positive
     void clear();
 
     // online ID calculator
diff --git a/MuonSpectrometer/MuonReconstruction/MuonPatternFinders/MuonPatternFinderTools/MuonCombinePatternTools/src/MuonCombinePatternTool.cxx b/MuonSpectrometer/MuonReconstruction/MuonPatternFinders/MuonPatternFinderTools/MuonCombinePatternTools/src/MuonCombinePatternTool.cxx
index ba82f2908305..79c3fcd54e83 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonPatternFinders/MuonPatternFinderTools/MuonCombinePatternTools/src/MuonCombinePatternTool.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonPatternFinders/MuonPatternFinderTools/MuonCombinePatternTools/src/MuonCombinePatternTool.cxx
@@ -1666,7 +1666,6 @@ void MuonCombinePatternTool::cleanCandidates(std::vector<CandidatePatPair>& cand
         }
         hitsMap.insert(std::make_pair((*it1), std::make_pair(etahits, phihits)));
     }
-    // cppcheck-suppress invalidContainer; false positive
     for (it1 = candidates.begin(); it1 != candidates.end(); ++it1) {
         std::pair<PrepDataSet, PrepDataSet>& hits1 = hitsMap[(*it1)];
         it2 = it1 + 1;
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPrepRawData/MuonPrepRawData/MuonPrepDataCollection.icc b/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPrepRawData/MuonPrepRawData/MuonPrepDataCollection.icc
index c1f00351e358..ef616c72df81 100755
--- a/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPrepRawData/MuonPrepRawData/MuonPrepDataCollection.icc
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPrepRawData/MuonPrepRawData/MuonPrepDataCollection.icc
@@ -18,7 +18,6 @@ MuonPrepDataCollection< PrepDataT >::MuonPrepDataCollection(const
   Identifiable(),
   m_idHash(idHash),
   m_id()
-  // cppcheck-suppress missingReturn; false positive
 {}
 
 template< class PrepDataT >
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPrepRawData/MuonPrepRawData/MuonPrepDataContainer.icc b/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPrepRawData/MuonPrepRawData/MuonPrepDataContainer.icc
index 925e5be8a81a..f16b327c5c60 100755
--- a/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPrepRawData/MuonPrepRawData/MuonPrepDataContainer.icc
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPrepRawData/MuonPrepRawData/MuonPrepDataContainer.icc
@@ -18,5 +18,4 @@ template< class CollectionT>
 // Constructor with IdentifiableCache:
 MuonPrepDataContainer<CollectionT>::MuonPrepDataContainer(EventContainers::IdentifiableCache<CollectionT> * cache):
   IdentifiableContainer<CollectionT>(cache)
-  // cppcheck-suppress missingReturn; false positive
 {}
diff --git a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MuPatCandidateTool.cxx b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MuPatCandidateTool.cxx
index 4558f5a35ba2..b834adffb5cc 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MuPatCandidateTool.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MuPatCandidateTool.cxx
@@ -154,7 +154,6 @@ namespace Muon {
         // loop over hits
         bool is_first_meas = true;
         for (const Trk::MeasurementBase* meas : measurements) {
-            // cppcheck-suppress invalidLifetime; false positive
             Identifier id = m_edmHelperSvc->getIdentifier(*meas);
             if (!id.is_valid()) {
                 fakePhiHits.push_back(meas);
@@ -241,25 +240,20 @@ namespace Muon {
                 // if selected create competing ROTs for trigger hits
                 if (createComp && (isRpc || isTgc)) {
                     if (measuresPhi && m_createCompetingROTsPhi) {
-                        // cppcheck-suppress invalidLifetime; false positive
                         addCluster(*meas, triggerHitsPhi);
                         continue;
                     } else if (!measuresPhi && m_createCompetingROTsEta) {
-                        // cppcheck-suppress invalidLifetime; false positive
                         addCluster(*meas, triggerHitsEta);
                         continue;
                     }
                 }
             }
 
-            // cppcheck-suppress invalidLifetime; false positive
             allHits.push_back(meas);
 
             if (measuresPhi) {
-                // cppcheck-suppress invalidLifetime; false positive
                 phiHits.push_back(meas);
             } else {
-                // cppcheck-suppress invalidLifetime; false positive
                 etaHits.push_back(meas);
             }
         }
diff --git a/MuonSpectrometer/MuonValidation/MuonTesterTree/MuonTesterTree/VectorBranch.icc b/MuonSpectrometer/MuonValidation/MuonTesterTree/MuonTesterTree/VectorBranch.icc
index 89b7c78cfe37..792f6691b3c2 100644
--- a/MuonSpectrometer/MuonValidation/MuonTesterTree/MuonTesterTree/VectorBranch.icc
+++ b/MuonSpectrometer/MuonValidation/MuonTesterTree/MuonTesterTree/VectorBranch.icc
@@ -8,7 +8,6 @@
 namespace MuonVal {
 template <class T> VectorBranch<T>::VectorBranch(TTree* tree, const std::string& name) : MuonTesterBranch(tree, name) {}
 
-// cppcheck-suppress missingReturn; false positive
 template <class T> VectorBranch<T>::VectorBranch(MuonTesterTree& tree, const std::string& name) : MuonTesterBranch(tree, name) {}
 template <class T> VectorBranch<T>::VectorBranch(TTree* tree, const std::string& name, const T& def) : VectorBranch<T>(tree, name) {
     VectorBranch<T>::setDefault(def);
diff --git a/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/AsgAnalysisAlgorithms/SystObjectUnioniserAlg.icc b/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/AsgAnalysisAlgorithms/SystObjectUnioniserAlg.icc
index 79ffb723d669..35daa00cd653 100644
--- a/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/AsgAnalysisAlgorithms/SystObjectUnioniserAlg.icc
+++ b/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/AsgAnalysisAlgorithms/SystObjectUnioniserAlg.icc
@@ -18,7 +18,6 @@ namespace CP
       : EL::AnaReentrantAlgorithm(name, pSvcLocator)
   {
 
-    // cppcheck-suppress missingReturn; false positive
   }
 
   template<class T, class C>
diff --git a/PhysicsAnalysis/CommonTools/ExpressionEvaluation/Root/ParsingInternals.h b/PhysicsAnalysis/CommonTools/ExpressionEvaluation/Root/ParsingInternals.h
index fdb676daa1fc..4ee8fbdb2045 100644
--- a/PhysicsAnalysis/CommonTools/ExpressionEvaluation/Root/ParsingInternals.h
+++ b/PhysicsAnalysis/CommonTools/ExpressionEvaluation/Root/ParsingInternals.h
@@ -290,7 +290,6 @@ namespace ExpressionParsing
 
 
       primary_expr =
-        // cppcheck-suppress compareBoolExpressionWithInt; false positive
         ('(' > expression > ')')
         |   (uint_ >> !char_('.')) | double_ | bool_ | identifier 
         ;
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/BlockFillerTool.icc b/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/BlockFillerTool.icc
index 47e07602e900..c0a3ff641702 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/BlockFillerTool.icc
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/BlockFillerTool.icc
@@ -24,7 +24,6 @@ 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 d32f9f8212c7..e3d7f3480376 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/BlockFillerToolMulti.icc
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/BlockFillerToolMulti.icc
@@ -32,7 +32,6 @@ 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 5196636fddad..464a538ff964 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/CollectionGetterTool.icc
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/CollectionGetterTool.icc
@@ -80,7 +80,6 @@ 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 05a69f5b8853..573d3bf3b5fa 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/MultiAssociationTool.icc
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/MultiAssociationTool.icc
@@ -25,7 +25,6 @@ MultiAssociationToolTo<TO_T>::MultiAssociationToolTo
    const IInterface* parent)
     : MultiAssociationToolImpl (type, name, parent)
 {
-  // cppcheck-suppress missingReturn; false positive
 }
 
 
@@ -103,7 +102,6 @@ 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 c9c9c02ab2ef..7afa44bb9c94 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/MultiAssociationToolMulti.icc
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/MultiAssociationToolMulti.icc
@@ -175,7 +175,6 @@ 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 08b1517efac3..df4d91e56b45 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/SGCollectionGetterTool.icc
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/D3PDMakerUtils/SGCollectionGetterTool.icc
@@ -33,7 +33,6 @@ SGCollectionGetterTool<CONT>::SGCollectionGetterTool
   {
     REPORT_MESSAGE (MSG::ERROR) << "Can't set TypeName property for tool "
                                 << type << "/" << name;
-    // cppcheck-suppress missingReturn; false positive
   }
 }
 
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/src/VectorFillerToolBase.cxx b/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/src/VectorFillerToolBase.cxx
index 5a73a75dd863..63b470935078 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/src/VectorFillerToolBase.cxx
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/src/VectorFillerToolBase.cxx
@@ -481,7 +481,6 @@ StatusCode VectorFillerToolBase::Var::init (IAddVariable* tree,
   m_contptr = 0;
   return tree->addVariable (prefix + m_name,
                             *m_proxy->GetCollectionClass()->GetTypeInfo(),
-                            // cppcheck-suppress nullPointer; false positive
                             m_contptr,
                             m_docstring);
 }
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/src/BVertexClosestTrackTool.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/src/BVertexClosestTrackTool.cxx
index 951ab5bf5db6..82668a879c83 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/src/BVertexClosestTrackTool.cxx
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/src/BVertexClosestTrackTool.cxx
@@ -231,7 +231,6 @@ namespace DerivationFramework {
       } // for i
     } else {
       std::string f5 = std::format("Mismatch: nTracks: {} nVtap: {} nSelpat: {}\n",tracks.size(), vtap.size(), selpat.size());
-      // cppcheck-suppress ignoredReturnValue; false positive
       rstr.append(f5);
     } // if sizes
 
diff --git a/PhysicsAnalysis/JetTagging/FlavorTagDiscriminants/FlavorTagDiscriminants/BacklinkAlg.icc b/PhysicsAnalysis/JetTagging/FlavorTagDiscriminants/FlavorTagDiscriminants/BacklinkAlg.icc
index 44c38c686a10..6b65e2fef53f 100644
--- a/PhysicsAnalysis/JetTagging/FlavorTagDiscriminants/FlavorTagDiscriminants/BacklinkAlg.icc
+++ b/PhysicsAnalysis/JetTagging/FlavorTagDiscriminants/FlavorTagDiscriminants/BacklinkAlg.icc
@@ -18,7 +18,6 @@ namespace FlavorTagDiscriminants {
     const std::string& name, ISvcLocator* svcloc):
     AthReentrantAlgorithm(name, svcloc)
   {
-    // cppcheck-suppress missingReturn; false positive
   }
 
 
diff --git a/PhysicsAnalysis/JetTagging/FlavorTagDiscriminants/FlavorTagDiscriminants/DecoratorAlg.icc b/PhysicsAnalysis/JetTagging/FlavorTagDiscriminants/FlavorTagDiscriminants/DecoratorAlg.icc
index 1a98e4fc0c29..062a51b9cde3 100644
--- a/PhysicsAnalysis/JetTagging/FlavorTagDiscriminants/FlavorTagDiscriminants/DecoratorAlg.icc
+++ b/PhysicsAnalysis/JetTagging/FlavorTagDiscriminants/FlavorTagDiscriminants/DecoratorAlg.icc
@@ -13,7 +13,6 @@ namespace FlavorTagDiscriminants {
     const std::string& name, ISvcLocator* svcloc):
     AthReentrantAlgorithm(name, svcloc)
   {
-    // cppcheck-suppress missingReturn; false positive
   }
 
   template <typename C, typename D, typename N>
diff --git a/PhysicsAnalysis/JetTagging/FlavorTagDiscriminants/src/LinkCounterAlg.icc b/PhysicsAnalysis/JetTagging/FlavorTagDiscriminants/src/LinkCounterAlg.icc
index c74538066f88..a0d9339d3519 100644
--- a/PhysicsAnalysis/JetTagging/FlavorTagDiscriminants/src/LinkCounterAlg.icc
+++ b/PhysicsAnalysis/JetTagging/FlavorTagDiscriminants/src/LinkCounterAlg.icc
@@ -16,7 +16,6 @@ namespace FlavorTagDiscriminants {
     const std::string& name, ISvcLocator* svcloc):
     AthReentrantAlgorithm(name, svcloc)
   {
-    // cppcheck-suppress missingReturn; false positive
   }
 
   template <typename T, typename C>
diff --git a/Reconstruction/RecoEvent/ParticleCaloExtension/ParticleCaloExtension/ParticleCaloAssociation.h b/Reconstruction/RecoEvent/ParticleCaloExtension/ParticleCaloExtension/ParticleCaloAssociation.h
index 78c22b472960..cac988de84fd 100644
--- a/Reconstruction/RecoEvent/ParticleCaloExtension/ParticleCaloExtension/ParticleCaloAssociation.h
+++ b/Reconstruction/RecoEvent/ParticleCaloExtension/ParticleCaloExtension/ParticleCaloAssociation.h
@@ -91,7 +91,6 @@ namespace Rec {
     m_data(data),
     m_associationConeSize(coneSize) {
 
-    // cppcheck-suppress missingReturn; false positive
   }
 
 
diff --git a/Simulation/G4Extensions/Monopole/src/G4mplEquationSetup.cxx b/Simulation/G4Extensions/Monopole/src/G4mplEquationSetup.cxx
index 1a00c7d421e2..9eb220eb2693 100644
--- a/Simulation/G4Extensions/Monopole/src/G4mplEquationSetup.cxx
+++ b/Simulation/G4Extensions/Monopole/src/G4mplEquationSetup.cxx
@@ -208,7 +208,6 @@ G4mplEquationSetup::CreateStepperToChordFinder(G4MagneticField* magFieldNC)
   delete fMonopoleChordFinder;
 
   auto integrDriver = new G4MagInt_Driver( fMinStep, fMonopoleStepper,
-                                           // cppcheck-suppress nullPointerRedundantCheck; false positive
                                            fMonopoleStepper->GetNumberOfVariables() );
   fMonopoleChordFinder = new G4ChordFinder( integrDriver );
 }
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/ISF_FastCaloSimParametrization/CaloGeometry.h b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/ISF_FastCaloSimParametrization/CaloGeometry.h
index 73fd632b612c..ab4fa455ee6e 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/ISF_FastCaloSimParametrization/CaloGeometry.h
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/ISF_FastCaloSimParametrization/CaloGeometry.h
@@ -59,7 +59,6 @@ class CaloGeometry : virtual public ICaloGeometry {
     double rpos(int sample,double eta,int subpos = CaloSubPos::SUBPOS_MID) const;
     double zpos(int sample,double eta,int subpos = CaloSubPos::SUBPOS_MID) const;
     double rzpos(int sample,double eta,int subpos = CaloSubPos::SUBPOS_MID) const;
-    // cppcheck-suppress negativeContainerIndex; false positive
     bool   isCaloBarrel(int sample) const {return m_isCaloBarrel[sample];};
     static std::string SamplingName(int sample);
 
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/tools/Identifier/Identifier.h b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/tools/Identifier/Identifier.h
index 85ab28e25cf0..032c0990060f 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/tools/Identifier/Identifier.h
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/tools/Identifier/Identifier.h
@@ -35,7 +35,6 @@ class Identifier
   
   operator value_type() const { return m_id; }
 
-  // cppcheck-suppress operatorEqVarError; false positive
   Identifier& operator = (const Identifier& old) {m_id=old;return (*this);};
   Identifier& operator = (value_type value) {m_id=value;return (*this);};
   bool operator == (const Identifier& other) const {return (m_id == other.m_id);}
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/src/DNNCaloSimSvc.cxx b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/src/DNNCaloSimSvc.cxx
index 640af1059f9c..f0150e3437ea 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/src/DNNCaloSimSvc.cxx
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/src/DNNCaloSimSvc.cxx
@@ -100,7 +100,6 @@ StatusCode ISF::DNNCaloSimSvc::initialize()
   const FCALDetectorManager * fcalManager=nullptr;
   ATH_CHECK(detStore()->retrieve(fcalManager));
 
-  // cppcheck-suppress nullPointerRedundantCheck; false positive
   const CaloIdManager* caloId_mgr = m_caloDetDescrManager->getCalo_Mgr();
   m_emID = caloId_mgr->getEM_ID();
   
diff --git a/Simulation/Tools/AtlasCLHEP_RandomGenerators/src/dSFMTEngine.cxx b/Simulation/Tools/AtlasCLHEP_RandomGenerators/src/dSFMTEngine.cxx
index e7a35a4409a1..ea177d24347c 100755
--- a/Simulation/Tools/AtlasCLHEP_RandomGenerators/src/dSFMTEngine.cxx
+++ b/Simulation/Tools/AtlasCLHEP_RandomGenerators/src/dSFMTEngine.cxx
@@ -148,7 +148,6 @@ void dSFMTEngine::setSeeds(const long *seeds, int) {
       buf[i]=seeds[i];
       ++i;
     }
-    // cppcheck-suppress uninitvar; false positive
     int dum ATLAS_THREAD_SAFE [[maybe_unused]] = wrap_init_by_array(m_dsfmt,buf,i);
   } else {
     setSeed(1234567);
diff --git a/TileCalorimeter/TileMonitoring/team5/TileCosmicView/TileGeoBuild.C b/TileCalorimeter/TileMonitoring/team5/TileCosmicView/TileGeoBuild.C
index 875737b27673..4c8615412413 100644
--- a/TileCalorimeter/TileMonitoring/team5/TileCosmicView/TileGeoBuild.C
+++ b/TileCalorimeter/TileMonitoring/team5/TileCosmicView/TileGeoBuild.C
@@ -496,7 +496,6 @@ grTileCal::grTileCal(): grTileBase()
 		pcon->DefineSection(0, sector_tz[3]-sector_dz[3],2290,3850.0);
 
 	if (EBA_LBA > 0)
-                // cppcheck-suppress arrayIndexOutOfBoundsCond; false positive
 		pcon->DefineSection(1, sector_tz[0]+sector_dz[0],2290,3850.0);
 	else
 		pcon->DefineSection(1, sector_tz[2]+sector_dz[2],2290,3850.0);
diff --git a/Tracking/Acts/ActsTrackReconstruction/src/detail/OnTrackCalibrator.icc b/Tracking/Acts/ActsTrackReconstruction/src/detail/OnTrackCalibrator.icc
index 1f5d3c4b2c24..95eeb181d09e 100644
--- a/Tracking/Acts/ActsTrackReconstruction/src/detail/OnTrackCalibrator.icc
+++ b/Tracking/Acts/ActsTrackReconstruction/src/detail/OnTrackCalibrator.icc
@@ -31,7 +31,6 @@ namespace ActsTrk::detail {
     if (stripTool.isEnabled()) {
       stripTool->connect(*this);
     } else {
-      // cppcheck-suppress missingReturn; false positive
       stripCalibrator.template connect<&OnTrackCalibrator<traj_t>::passthrough<1, xAOD::StripCluster>>(this);
     }
   }
diff --git a/Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/ParametersBase.icc b/Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/ParametersBase.icc
index b47165a95b32..7718af954b4d 100644
--- a/Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/ParametersBase.icc
+++ b/Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/ParametersBase.icc
@@ -30,14 +30,12 @@ template <int DIM, class T>
 ParametersBase<DIM, T>::ParametersBase(
     const AmgVector(DIM) parameters,
     std::optional<AmgSymMatrix(DIM)>&& covariance, const T chargeDef)
-    // cppcheck-suppress missingReturn; false positive
     : ParametersCommon<DIM, T>(parameters, std::move(covariance), chargeDef) {}
 
 // Helper protected ctor
 template <int DIM, class T>
 ParametersBase<DIM, T>::ParametersBase(
     std::optional<AmgSymMatrix(DIM)>&& covariance)
-    // cppcheck-suppress missingReturn; false positive
     : ParametersCommon<DIM, T>(std::move(covariance)) {}
 
 // Protected Constructor with local arguments - persistency only
diff --git a/Tracking/TrkEvent/TrkParametersIdentificationHelpers/exe/TestTrkParametersIdentificationHelpers.cxx b/Tracking/TrkEvent/TrkParametersIdentificationHelpers/exe/TestTrkParametersIdentificationHelpers.cxx
index 16cd6b868e2f..31aa8111d474 100644
--- a/Tracking/TrkEvent/TrkParametersIdentificationHelpers/exe/TestTrkParametersIdentificationHelpers.cxx
+++ b/Tracking/TrkEvent/TrkParametersIdentificationHelpers/exe/TestTrkParametersIdentificationHelpers.cxx
@@ -41,7 +41,6 @@ void testCalo() {
       
       for( unsigned int isEntry = 0; isEntry < 2 ; ++isEntry ){
         bool entry = isEntry == 1;
-        // cppcheck-suppress uninitvar; false positive
         TrackParametersIdentifier id = helper.encode( static_cast<AtlasDetDescr::AtlasDetTechnology>(tech), 
                                                       static_cast<CaloSampling::CaloSample>(sample), entry );
         AtlasDetDescr::AtlasDetTechnology itech = helper.technology(id);
diff --git a/Tracking/TrkEvent/TrkPrepRawData/TrkPrepRawData/PrepRawDataContainer.icc b/Tracking/TrkEvent/TrkPrepRawData/TrkPrepRawData/PrepRawDataContainer.icc
index 4275647d3924..acf9aaf3f2b6 100755
--- a/Tracking/TrkEvent/TrkPrepRawData/TrkPrepRawData/PrepRawDataContainer.icc
+++ b/Tracking/TrkEvent/TrkPrepRawData/TrkPrepRawData/PrepRawDataContainer.icc
@@ -40,7 +40,6 @@ template< class CollectionT>
 PrepRawDataContainer< CollectionT>::PrepRawDataContainer(EventContainers::IdentifiableCache<CollectionT>* cache) :
 	IdentifiableContainer<CollectionT>(cache)
 {
-  // cppcheck-suppress missingReturn; false positive
 }
 
 
diff --git a/Tracking/TrkFitter/TrkGlobalChi2Fitter/src/GlobalChi2Fitter.cxx b/Tracking/TrkFitter/TrkGlobalChi2Fitter/src/GlobalChi2Fitter.cxx
index 9e79fa3e9aed..2707dd0b4e3c 100644
--- a/Tracking/TrkFitter/TrkGlobalChi2Fitter/src/GlobalChi2Fitter.cxx
+++ b/Tracking/TrkFitter/TrkGlobalChi2Fitter/src/GlobalChi2Fitter.cxx
@@ -1737,7 +1737,6 @@ namespace Trk {
           errors[1] = 10;
 
           pseudostate2->setMeasurementErrors(errors);
-          // cppcheck-suppress invalidLifetime; false positive
           outlierstates2.push_back(pseudostate2.get());
           trajectory.addMeasurementState(std::move(pseudostate2));
         }
@@ -5095,7 +5094,6 @@ namespace Trk {
     if (cache.m_fittercode != FitterStatusCode::Success) {
       ATH_MSG_DEBUG("Silicon cleaner failed, returning null...");
       if (finaltrajectory != &trajectory) {
-        // cppcheck-suppress autovarInvalidDeallocation; false positive
         delete finaltrajectory;
       }
       return nullptr;
diff --git a/Tracking/TrkUtilityPackages/TrkNeuralNetworkUtils/src/TargetBuffer_t.h b/Tracking/TrkUtilityPackages/TrkNeuralNetworkUtils/src/TargetBuffer_t.h
index 6db563574032..c7ada1742ed4 100644
--- a/Tracking/TrkUtilityPackages/TrkNeuralNetworkUtils/src/TargetBuffer_t.h
+++ b/Tracking/TrkUtilityPackages/TrkNeuralNetworkUtils/src/TargetBuffer_t.h
@@ -33,7 +33,6 @@ namespace TTN {
         , m_bufferEnd(m_bufferStart + buffer.size())//assumed contiguous
 #endif
     {
-      // cppcheck-suppress missingReturn; false positive
     }
 
   protected:
@@ -47,7 +46,6 @@ namespace TTN {
       , m_bufferEnd(buffer.m_bufferEnd)
 #endif
     {
-      // cppcheck-suppress missingReturn; false positive
     }
 
     template <typename T1, typename T2,typename T3>
diff --git a/Tracking/TrkVertexFitter/TrkVertexBilloirTools/src/FullVertexFitter.cxx b/Tracking/TrkVertexFitter/TrkVertexBilloirTools/src/FullVertexFitter.cxx
index 307985fd9b05..6853b4b6ef4d 100755
--- a/Tracking/TrkVertexFitter/TrkVertexBilloirTools/src/FullVertexFitter.cxx
+++ b/Tracking/TrkVertexFitter/TrkVertexBilloirTools/src/FullVertexFitter.cxx
@@ -356,13 +356,11 @@ namespace Trk
 				if ( mom_at_Origin[iRP] ( 1 ) > M_PI )
 				{
 					mom_at_Origin[iRP] ( 1 ) = 2*M_PI - mom_at_Origin[iRP] ( 1 );
-                                        // cppcheck-suppress identicalInnerCondition; false positive
 					if ( mom_at_Origin[iRP] ( 0 ) >= 0 )   mom_at_Origin[iRP] ( 0 )  += ( mom_at_Origin[iRP] ( 0 ) >0 ) ? -M_PI : M_PI;
 				}
 				if ( mom_at_Origin[iRP] ( 1 ) < 0.0 )
 				{
 					mom_at_Origin[iRP] ( 1 )  = - mom_at_Origin[iRP] ( 1 );
-                                        // cppcheck-suppress identicalInnerCondition; false positive
 					if ( mom_at_Origin[iRP] ( 0 ) >= 0 )  mom_at_Origin[iRP] ( 0 ) += ( mom_at_Origin[iRP] ( 0 ) >0 ) ? -M_PI : M_PI;
 				}
 
diff --git a/Trigger/TrigConfiguration/TrigConfBase/TrigConfBase/TrigDBConnectionConfig.h b/Trigger/TrigConfiguration/TrigConfBase/TrigConfBase/TrigDBConnectionConfig.h
index b4b8cb08be09..54c891c72854 100644
--- a/Trigger/TrigConfiguration/TrigConfBase/TrigConfBase/TrigDBConnectionConfig.h
+++ b/Trigger/TrigConfiguration/TrigConfBase/TrigConfBase/TrigDBConnectionConfig.h
@@ -111,7 +111,6 @@ TrigDBConnectionConfig::TrigDBConnectionConfig(DBType type,
                                                const PSKeys& hltPsKeys)
   : TrigDBConnectionConfig(type, server, smKey)
 {
-  // cppcheck-suppress useInitializationList  --- false positive
   m_hltkeys = hltPsKeys;
 }
 
diff --git a/Trigger/TrigConfiguration/TrigConfxAOD/src/xAODMenuWriterMT.cxx b/Trigger/TrigConfiguration/TrigConfxAOD/src/xAODMenuWriterMT.cxx
index 2a9d6f0c00a0..be7c69b8339a 100644
--- a/Trigger/TrigConfiguration/TrigConfxAOD/src/xAODMenuWriterMT.cxx
+++ b/Trigger/TrigConfiguration/TrigConfxAOD/src/xAODMenuWriterMT.cxx
@@ -69,9 +69,7 @@ namespace TrigConf
       // HLT JSON object - contains HLT menus
       std::unique_ptr<xAOD::TriggerMenuJsonAuxContainer> aux_hlt = std::make_unique<xAOD::TriggerMenuJsonAuxContainer>();
       std::unique_ptr<xAOD::TriggerMenuJsonContainer> hlt = std::make_unique<xAOD::TriggerMenuJsonContainer>();
-      // cppcheck-suppress danglingLifetime; false positive
       m_menuJSON_hlt = hlt.get(); // Keep a cached pointer from which we can add to the output metastore
-      // cppcheck-suppress danglingLifetime; false positive
       m_menuJSON_hlt->setStore(aux_hlt.get());
 
       ATH_CHECK(m_metaStore->record(std::move(aux_hlt), m_metaNameJSON_hlt + "Aux."));
@@ -80,9 +78,7 @@ namespace TrigConf
       // HLT Monitoring JSON object - contains Monitoring groups for HLT menus
       std::unique_ptr<xAOD::TriggerMenuJsonAuxContainer> aux_hltmonitoring = std::make_unique<xAOD::TriggerMenuJsonAuxContainer>();
       std::unique_ptr<xAOD::TriggerMenuJsonContainer> hltmonitoring = std::make_unique<xAOD::TriggerMenuJsonContainer>();
-      // cppcheck-suppress danglingLifetime; false positive
       m_menuJSON_hltmonitoring = hltmonitoring.get(); // Keep a cached pointer from which we can add to the output metastore
-      // cppcheck-suppress danglingLifetime; false positive
       m_menuJSON_hltmonitoring->setStore(aux_hltmonitoring.get());
 
       ATH_CHECK(m_metaStore->record(std::move(aux_hltmonitoring), m_metaNameJSON_hltmonitoring + "Aux."));
@@ -91,9 +87,7 @@ namespace TrigConf
       // L1 JSON object - contains L1 menus
       std::unique_ptr<xAOD::TriggerMenuJsonAuxContainer> aux_l1 = std::make_unique<xAOD::TriggerMenuJsonAuxContainer>();
       std::unique_ptr<xAOD::TriggerMenuJsonContainer> l1 = std::make_unique<xAOD::TriggerMenuJsonContainer>();
-      // cppcheck-suppress danglingLifetime; false positive
       m_menuJSON_l1 = l1.get(); // Keep a cached pointer from which we can add to the output metastore
-      // cppcheck-suppress danglingLifetime; false positive
       m_menuJSON_l1->setStore(aux_l1.get());
 
       ATH_CHECK(m_metaStore->record(std::move(aux_l1), m_metaNameJSON_l1 + "Aux."));
@@ -102,9 +96,7 @@ namespace TrigConf
       // HLT PS JSON object - contains prescales sets for HLT menus
       std::unique_ptr<xAOD::TriggerMenuJsonAuxContainer> aux_hltps = std::make_unique<xAOD::TriggerMenuJsonAuxContainer>();
       std::unique_ptr<xAOD::TriggerMenuJsonContainer> hltps = std::make_unique<xAOD::TriggerMenuJsonContainer>();
-      // cppcheck-suppress danglingLifetime; false positive
       m_menuJSON_hltps = hltps.get(); // Keep a cached pointer from which we can add to the output metastore
-      // cppcheck-suppress danglingLifetime; false positive
       m_menuJSON_hltps->setStore(aux_hltps.get());
 
       ATH_CHECK(m_metaStore->record(std::move(aux_hltps), m_metaNameJSON_hltps + "Aux."));
@@ -113,9 +105,7 @@ namespace TrigConf
       // L1 PS JSON object - contains prescales sets for L1 menus
       std::unique_ptr<xAOD::TriggerMenuJsonAuxContainer> aux_l1ps = std::make_unique<xAOD::TriggerMenuJsonAuxContainer>();
       std::unique_ptr<xAOD::TriggerMenuJsonContainer> l1ps = std::make_unique<xAOD::TriggerMenuJsonContainer>();
-      // cppcheck-suppress danglingLifetime; false positive
       m_menuJSON_l1ps = l1ps.get(); // Keep a cached pointer from which we can add to the output metastore
-      // cppcheck-suppress danglingLifetime; false positive
       m_menuJSON_l1ps->setStore(aux_l1ps.get());
 
       ATH_CHECK(m_metaStore->record(std::move(aux_l1ps), m_metaNameJSON_l1ps + "Aux."));
@@ -124,9 +114,7 @@ namespace TrigConf
       // Bunchgroup JSON object - contains bungchgroup configuration
       std::unique_ptr<xAOD::TriggerMenuJsonAuxContainer> aux_bg = std::make_unique<xAOD::TriggerMenuJsonAuxContainer>();
       std::unique_ptr<xAOD::TriggerMenuJsonContainer> bg = std::make_unique<xAOD::TriggerMenuJsonContainer>();
-      // cppcheck-suppress danglingLifetime; false positive
       m_menuJSON_bg = bg.get(); // Keep a cached pointer from which we can add to the output metastore
-      // cppcheck-suppress danglingLifetime; false positive
       m_menuJSON_bg->setStore( aux_bg.get() );
 
       ATH_CHECK( m_metaStore->record(std::move(aux_bg), m_metaNameJSON_bg + "Aux." ) );
diff --git a/Trigger/TrigT1/L1Topo/L1TopoSimulationUtils/L1TopoSimulationUtils/L1TopoDataTypes.h b/Trigger/TrigT1/L1Topo/L1TopoSimulationUtils/L1TopoSimulationUtils/L1TopoDataTypes.h
index 78409ea00e59..7dedda627523 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoSimulationUtils/L1TopoSimulationUtils/L1TopoDataTypes.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoSimulationUtils/L1TopoSimulationUtils/L1TopoDataTypes.h
@@ -198,7 +198,6 @@ namespace TSU {
           // Do the fractional part
           if (F > 0) {
             unsigned frac = m_tvalue & ( (1ull<<F)-1ull );
-            // cppcheck-suppress shiftNegative; false positive
             res += static_cast<float>(frac) / (2ull<<(F-1ull));
           }
           return res;
diff --git a/Trigger/TrigTools/IDScanZFinder/src/IDScanZFinderInternal.h b/Trigger/TrigTools/IDScanZFinder/src/IDScanZFinderInternal.h
index 5ca25a4e3915..7997ad0cc621 100644
--- a/Trigger/TrigTools/IDScanZFinder/src/IDScanZFinderInternal.h
+++ b/Trigger/TrigTools/IDScanZFinder/src/IDScanZFinderInternal.h
@@ -217,7 +217,6 @@ IDScanZFinderInternal<SpacePoint>::IDScanZFinderInternal( const std::string& typ
   /// do not call that here
   ///  initializeInternal( m_IdScan_MaxNumLayers, m_IdScan_LastBrlLayer );
 
-  // cppcheck-suppress missingReturn; false positive
   m_Status = 0;
 }
   
-- 
GitLab