Calorimeter/CaloRec/src/CaloCellContainerMergerTool.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /********************************************************************
@@ -30,10 +30,9 @@ CaloCellContainerMergerTool::CaloCellContainerMergerTool(
 			     const std::string& type, 
 			     const std::string& name, 
 			     const IInterface* parent)
-  :AthAlgTool(type, name, parent),
+  :base_class (type, name, parent),
    m_caloCellsKey("")
 {
-  declareInterface<ICaloCellMakerTool>(this);
   declareProperty ("CaloCellsName",m_caloCellsKey);
   declareProperty ("CaloNums",m_caloNums);
   m_caloNums.clear();
@@ -77,9 +76,11 @@ StatusCode CaloCellContainerMergerTool::initialize()
 
 }
 
-StatusCode CaloCellContainerMergerTool::process(CaloCellContainer * theCont )
+StatusCode
+CaloCellContainerMergerTool::process (CaloCellContainer* theCont,
+                                      const EventContext& ctx) const
 {
-  SG::ReadHandle<CaloCellContainer> theCellContainer (m_caloCellsKey);
+  SG::ReadHandle<CaloCellContainer> theCellContainer (m_caloCellsKey, ctx);
 
 
   if (!theCellContainer.isValid()) {

Calorimeter/CaloRec/src/CaloCellContainerMergerTool.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef CALOREC_CALOCELLCONTAINERMERGERTOOL_H
@@ -11,11 +11,9 @@ class StoreGateSvc;
 
 #include "CaloInterface/ICaloCellMakerTool.h"
 
-class CaloCellContainerMergerTool: public AthAlgTool,
-	             virtual public ICaloCellMakerTool 
-
+class CaloCellContainerMergerTool
+  : public extends<AthAlgTool, ICaloCellMakerTool>
 {
- 
 public:    
   
   CaloCellContainerMergerTool(const std::string& type, 
@@ -23,10 +21,11 @@ public:
                               const IInterface* parent) ;
 
 
-  virtual StatusCode initialize() ; 
+  virtual StatusCode initialize() override;
 
   // update theCellContainer
-  virtual StatusCode process( CaloCellContainer * theCellContainer) ;
+  virtual StatusCode process (CaloCellContainer* theCellContainer,
+                              const EventContext& ctx) const override;
 
 
  private:

Calorimeter/CaloRec/src/CaloCellFastCopyTool.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /*
@@ -108,7 +108,8 @@ StatusCode CaloCellFastCopyTool::initialize() {
 }
 
 
-StatusCode CaloCellFastCopyTool::process(CaloCellContainer* theCont)
+StatusCode CaloCellFastCopyTool::process (CaloCellContainer* theCont,
+                                          const EventContext& /*ctx*/) const
 {
   // Retrieve source cell container
   SG::ReadHandle<CaloCellContainer> srcCont(m_srcCellContainerKey);
@@ -124,7 +125,8 @@ StatusCode CaloCellFastCopyTool::process(CaloCellContainer* theCont)
 }
 
 
-StatusCode CaloCellFastCopyTool::process(CaloConstCellContainer* theCont)
+StatusCode CaloCellFastCopyTool::process (CaloConstCellContainer* theCont,
+                                          const EventContext& /*ctx*/) const
 {
   // Retrieve source cell container
   SG::ReadHandle<CaloCellContainer> srcCont(m_srcCellContainerKey);

Calorimeter/CaloRec/src/CaloCellFastCopyTool.h

 // This file's extension implies that it's C, but it's really -*- C++ -*-.
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /*
@@ -60,8 +60,10 @@ class CaloCellFastCopyTool
                          const IInterface* parent);
 
     virtual StatusCode initialize() override;
-    virtual StatusCode process(CaloCellContainer* theCellContainer) override;
-    virtual StatusCode process(CaloConstCellContainer* theCellContainer) override;
+    virtual StatusCode process (CaloCellContainer* theCellContainer,
+                                const EventContext& ctx) const override;
+    virtual StatusCode process (CaloConstCellContainer* theCellContainer,
+                                const EventContext& ctx) const override;
 
 
 private:

Calorimeter/CaloRec/src/CaloCellMaker.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /********************************************************************
@@ -102,7 +102,8 @@ StatusCode CaloCellMaker::initialize() {
 
 StatusCode CaloCellMaker::execute() {
 
-  SG::WriteHandle<CaloCellContainer> caloCellsOutput(m_caloCellsOutputKey);
+  const EventContext& ctx = Gaudi::Hive::currentContext();
+  SG::WriteHandle<CaloCellContainer> caloCellsOutput(m_caloCellsOutputKey, ctx);
 
   ATH_CHECK( caloCellsOutput.record(CxxUtils::make_unique<CaloCellContainer>(static_cast<SG::OwnershipPolicy>(m_ownPolicy))) );
 
@@ -118,7 +119,7 @@ StatusCode CaloCellMaker::execute() {
     std::string chronoName = this->name() + "_" + itrTool->name();
 
     m_chrono->chronoStart(chronoName);
-    StatusCode sc = (*itrTool)->process(caloCellsOutput.ptr());
+    StatusCode sc = (*itrTool)->process(caloCellsOutput.ptr(), ctx);
     m_chrono->chronoStop(chronoName);
 
     ATH_MSG_DEBUG( "Chrono stop : delta "

Calorimeter/CaloRec/test/CaloCellFastCopyTool_test.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /*
@@ -156,7 +156,8 @@ public:
   StatusCode testProcess (CaloCellFastCopyTool* tool,
                           CONT* destCont)
   {
-    return tool->process (destCont);
+    EventContext ctx;
+    return tool->process (destCont, ctx);
   }
 
 

Control/AthAllocators/AthAllocators/ArenaBlockAllocatorBase.h

 // This file's extension implies that it's C, but it's really -*- C++ -*-.
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: ArenaBlockAllocatorBase.h 470529 2011-11-24 23:54:22Z ssnyder $
@@ -49,7 +49,7 @@ public:
   /**
    * @brief Destructor.
    */
-  ~ArenaBlockAllocatorBase();
+  virtual ~ArenaBlockAllocatorBase();
 
 
   /// Don't allow copy construction or assignment.
@@ -93,7 +93,7 @@ public:
    * It may not be possible to release the number of elements requested;
    * this should be implemented on a best-effort basis.
    */
-  virtual void reserve (size_t size);
+  virtual void reserve (size_t size) override;
 
 
   /**
@@ -104,19 +104,19 @@ public:
    * @c destructor should be called on them if it was provided
    * (preceded by @c clear if provided and @c mustClear was set).
    */
-  virtual void erase();
+  virtual void erase() override;
 
 
   /**
    * @brief Return the statistics block for this allocator.
    */
-  virtual Stats stats() const;
+  virtual Stats stats() const override;
 
 
   /**
    * @brief Return the name of this allocator.
    */
-  virtual const std::string& name() const;
+  virtual const std::string& name() const override;
 
 
   /**

Control/AthAllocators/AthAllocators/ArenaHeapAllocator.h

 // This file's extension implies that it's C, but it's really -*- C++ -*-.
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: ArenaHeapAllocator.h 470529 2011-11-24 23:54:22Z ssnyder $
@@ -119,7 +119,7 @@ public:
   /**
    * @brief Destructor.  This will free all the Allocator's storage.
    */
-  ~ArenaHeapAllocator();
+  virtual ~ArenaHeapAllocator();
 
 
   /// Don't allow copy construction or assignment.
@@ -171,7 +171,7 @@ public:
    * The elements may continue to be cached internally, without
    * returning to the system.
    */
-  virtual void reset();
+  virtual void reset() override;
 
 
   /**
@@ -182,7 +182,8 @@ public:
    * @c destructor should be called on them if it was provided
    * (preceded by @c clear if provided and @c mustClear was set).
    */
-  virtual void erase();
+  // cppcheck-suppress virtualCallInConstructor ; false positive
+  virtual void erase() override final;
 
 
   // These are just placeholders --- the iterators are not implemented.

Control/AthAllocators/AthAllocators/ArenaHeapSTLAllocator.icc

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: ArenaHeapSTLAllocator.icc,v 1.2 2008-08-26 02:12:26 ssnyder Exp $
@@ -68,6 +68,7 @@ ArenaAllocatorBase::Params ArenaHeapSTLAllocator_initParams<T>::params() const
  *               allocator name.
  */
 template <class T, class VETO>
+// cppcheck-suppress uninitMemberVar ; false positive
 ArenaHeapSTLAllocator<T, VETO>::ArenaHeapSTLAllocator
  (size_t nblock /*= 1000*/, const std::string& name /*= ""*/)
    : m_pool (ArenaHeapSTLAllocator_initParams<T> (nblock, name))
@@ -81,6 +82,7 @@ ArenaHeapSTLAllocator<T, VETO>::ArenaHeapSTLAllocator
  * The @c name and @c nblock parameters are copied, but the data are not.
  */
 template <class T, class VETO>
+// cppcheck-suppress uninitMemberVar ; false positive
 ArenaHeapSTLAllocator<T, VETO>::ArenaHeapSTLAllocator
   (const ArenaHeapSTLAllocator& a)
     : m_pool (ArenaHeapSTLAllocator_initParams<T> (a.nblock(), a.name()))
@@ -95,6 +97,7 @@ ArenaHeapSTLAllocator<T, VETO>::ArenaHeapSTLAllocator
  */
 template <class T, class VETO>
 template <class U, class V>
+// cppcheck-suppress uninitMemberVar ; false positive
 ArenaHeapSTLAllocator<T, VETO>::ArenaHeapSTLAllocator
   (const ArenaHeapSTLAllocator<U, V>& a)
     : m_pool (ArenaHeapSTLAllocator_initParams<T> (a.nblock(), a.name()))
@@ -399,6 +402,7 @@ const ArenaAllocatorBase* ArenaHeapSTLAllocator<T, VETO>::poolptr() const
  *               allocator name.
  */
 template <class T>
+// cppcheck-suppress uninitMemberVar ; false positive
 ArenaHeapSTLAllocator<T, T>::ArenaHeapSTLAllocator
  (size_t nblock /*= 1000*/, const std::string& name /*= ""*/)
     : m_nblock (nblock),
@@ -415,6 +419,7 @@ ArenaHeapSTLAllocator<T, T>::ArenaHeapSTLAllocator
  */
 template <class T>
 template <class U, class V>
+// cppcheck-suppress uninitMemberVar ; false positive
 ArenaHeapSTLAllocator<T, T>::ArenaHeapSTLAllocator
   (const ArenaHeapSTLAllocator<U, V>& a)
     : m_nblock (a.nblock()),

Control/AthAllocators/AthAllocators/ArenaPoolAllocator.h

 // This file's extension implies that it's C, but it's really -*- C++ -*-.
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: ArenaPoolAllocator.h 470529 2011-11-24 23:54:22Z ssnyder $
@@ -152,7 +152,7 @@ public:
   /**
    * @brief Destructor.  This will free all the Allocator's storage.
    */
-  ~ArenaPoolAllocator();
+  virtual ~ArenaPoolAllocator();
 
 
   /// Don't allow copy construction or assignment.
@@ -194,7 +194,7 @@ public:
    * The elements may continue to be cached internally, without
    * returning to the system.
    */
-  virtual void reset();
+  virtual void reset() override;
 
 
   /**
@@ -205,7 +205,8 @@ public:
    * @c destructor should be called on them if it was provided
    * (preceded by @c clear if provided and @c mustClear was set).
    */
-  virtual void erase();
+  // cppcheck-suppress virtualCallInConstructor ; false positive
+  virtual void erase() override final;
 
 
   /**

Control/AthAllocators/AthAllocators/ArenaPoolSTLAllocator.icc

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: ArenaPoolSTLAllocator.icc,v 1.2 2008-08-26 02:12:26 ssnyder Exp $
@@ -425,6 +425,7 @@ ArenaPoolSTLAllocator<T*, VETO>::ArenaPoolSTLAllocator
  *               allocator name.
  */
 template <class T>
+// cppcheck-suppress uninitMemberVar ; false positive
 ArenaPoolSTLAllocator<T, T>::ArenaPoolSTLAllocator
  (size_t nblock /*= 1000*/, const std::string& name /*= ""*/)
     : m_nblock (nblock),

Control/AthAllocators/src/ArenaAllocatorBase.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: ArenaAllocatorBase.cxx 470529 2011-11-24 23:54:22Z ssnyder $
@@ -22,6 +22,7 @@ namespace SG {
 /**
  * @brief Constructor for a single statistic.
  */
+// cppcheck-suppress uninitMemberVar ; false positive
 ArenaAllocatorBase::Stats::Stat::Stat()
   : inuse (0),
     free (0),

Control/AthAllocators/src/ArenaBlockAllocatorBase.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: ArenaBlockAllocatorBase.cxx 470529 2011-11-24 23:54:22Z ssnyder $
@@ -26,7 +26,8 @@ namespace SG {
 ArenaBlockAllocatorBase::ArenaBlockAllocatorBase (const Params& params)
   : m_params (params),
     m_blocks (nullptr),
-    m_freeblocks (nullptr)
+    m_freeblocks (nullptr),
+    m_stats()
 {
 }
 

Control/AthAllocators/src/ArenaHeapAllocator.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: ArenaHeapAllocator.cxx 470529 2011-11-24 23:54:22Z ssnyder $
@@ -186,7 +186,7 @@ void ArenaHeapAllocator::slowClear()
   std::vector<ArenaBlock*>::iterator bi = blocks.begin();
   std::vector<ArenaBlock*>::iterator bi_end = blocks.end();
   func_t* clear = m_params.clear;
-  for (; bi != bi_end; bi++) {
+  for (; bi != bi_end; ++bi) {
     ArenaBlock& bl = **bi;
     size_t sz = bl.size();
     size_t elt_size = bl.eltSize();

Control/AthAllocators/test/ArenaBase_test.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: ArenaBase_test.cxx 470529 2011-11-24 23:54:22Z ssnyder $
@@ -51,6 +51,7 @@ Alloc::Alloc (int x)
 
   std::ostringstream os;
   os << "alloc" << x;
+  // cppcheck-suppress useInitializationList
   m_name = os.str();
 }
 

Control/AthAllocators/test/ArenaHandleBaseAllocT_test.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: ArenaHandleBaseAllocT_test.cxx 470529 2011-11-24 23:54:22Z ssnyder $
@@ -20,7 +20,7 @@ class TestAlloc
   : public SG::ArenaAllocatorBase
 {
 public:
-  TestAlloc (Params  params) : m_params (std::move(params)) {}
+  TestAlloc (Params  params) : m_stats(), m_params (std::move(params)) {}
   virtual void reset() override {}
   virtual void erase() override {}
   virtual void reserve(size_t) override {}

Control/AthAllocators/test/ArenaHandleBaseT_test.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: ArenaHandleBaseT_test.cxx 470529 2011-11-24 23:54:22Z ssnyder $
@@ -53,7 +53,7 @@ public:
     iterator (std::vector<Payload>::iterator it)
       : m_it (std::move(it)) {}
     reference operator*() const { return *m_it; }
-    iterator& operator++() { m_it++; return *this; }
+    iterator& operator++() { ++m_it; return *this; }
     bool operator== (const iterator& other) const
     { return m_it == other.m_it; }
 
@@ -72,7 +72,7 @@ public:
     const_iterator (TestAlloc::iterator it)
       : m_it (&*it) {}
     reference operator*() const { return *m_it; }
-    const_iterator& operator++() { m_it++; return *this; }
+    const_iterator& operator++() { ++m_it; return *this; }
     bool operator== (const const_iterator& other) const
     { return m_it == other.m_it; }
     bool operator== (const TestAlloc::iterator& other) const
@@ -99,7 +99,8 @@ private:
 
 
 TestAlloc::TestAlloc (Params  params)
-  : m_params (std::move(params))
+  : m_stats(),
+    m_params (std::move(params))
 {
   for (int i = 0; i < 10; i++)
     m_vec.push_back (i);

Control/AthAllocators/test/ArenaSharedHeapSTLAllocator_test.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: ArenaSharedHeapSTLAllocator_test.cxx 470825 2011-11-25 23:20:57Z ssnyder $
@@ -41,6 +41,7 @@ struct Payload
   static std::vector<int> v ATLAS_THREAD_SAFE;
 };
 
+// cppcheck-suppress uninitMemberVar ; false positive
 Payload::Payload(int the_y)
 {
   x = n++;

Control/AthAllocators/test/Arena_test.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: Arena_test.cxx 470529 2011-11-24 23:54:22Z ssnyder $
@@ -48,6 +48,7 @@ Alloc::Alloc (int x)
 
   std::ostringstream os;
   os << "alloc" << x;
+  // cppcheck-suppress useInitializationList
   m_name = os.str();
 }
 

Control/AthAllocators/test/DataPool_test.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #undef NDEBUG
@@ -21,17 +21,12 @@ class Fluff
 {
 	public:
 		virtual ~Fluff() { }
-		Fluff() : m_int(1), m_float(-379.456f),
+		Fluff() : m_int(1),
 			m_string("this is the Fluff struct")
 		{
 		}
 
-		Fluff(const Fluff& f)
-		{
-			m_int = f.m_int;
-			m_float = f.m_float;
-			m_string = f.m_string;
-		}
+		Fluff(const Fluff& f) = default;
                 Fluff& operator= (const Fluff&) = default;
 
 		void setPar(int j) { m_int = j; }
@@ -40,7 +35,6 @@ class Fluff
 	private:
 
 		int m_int;
-		float m_float;
 		string m_string;
 
 };
@@ -127,7 +121,7 @@ int main ATLAS_NOT_THREAD_SAFE ()
 	int k = 10;
 	DataPool<Fluff>::const_iterator iter2 = df->begin();
 	DataPool<Fluff>::const_iterator iend2 = df->end();
-	for (; iter2 != iend2; iter2++)
+	for (; iter2 != iend2; ++iter2)
 	{
 		assert(nullptr != (*iter2));
                 // Note: we iterate backwards...