Merge branch 'cppcheck.AthContainers-20200619' into 'master'

AthContainers+xAODCore: Fix cppcheck warnings.

See merge request atlas/athena!33941

Control/AthContainers/AthContainers/tools/ElementProxy.icc

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file AthContainers/tools/ElementProxy.icc
  * @author scott snyder <snyder@bnl.gov>
@@ -46,9 +44,11 @@ ElementProxy<DVL>::ElementProxy (typename DVL::BaseContainer::iterator i,
  * @c DataVector/List's, both of which own their elements.
  */
 template <class DVL>
+// cppcheck-suppress operatorEqVarError
 ElementProxy<DVL>& ElementProxy<DVL>::operator= (const ElementProxy& rhs)
 {
   if (*rhs.m_proxied != *m_proxied) {
+    // cppcheck-suppress assertWithSideEffect
     ATHCONTAINERS_ASSERT (! (container()->ownPolicy() == SG::OWN_ELEMENTS &&
                              rhs.container()->ownPolicy() == SG::OWN_ELEMENTS));
     container()->assignBaseElement (m_proxied, *rhs.m_proxied);

Control/AthContainers/test/supportsThinning_test.cxx

 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 /**
  * @file AthContainers/test/supportsThinning_test.cxx
@@ -21,6 +21,7 @@ struct A {};
 struct B : public DataVector<int> {};
 struct B0 : public DataVector<int> { static bool constexpr supportsThinning = false; };
 struct C : public SG::AuxElement {};
+// cppcheck-suppress duplInheritedMember
 struct C0 : public SG::AuxElement { static bool constexpr supportsThinning = false; };
 struct D : public SG::AuxStoreInternal {};
 struct D0 : public SG::AuxStoreInternal { static bool constexpr supportsThinning = false; };

Event/xAOD/xAODCore/Root/AuxContainerBase.cxx

@@ -57,6 +57,7 @@ namespace xAOD {
 
       // Unfortunately the dynamic variables can not be copied this easily...
       if( parent.m_store ) {
+         // cppcheck-suppress copyCtorPointerCopying
          m_store = parent.m_store;
          m_ownsStore = false;
          m_storeIO = dynamic_cast< SG::IAuxStoreIO* >( m_store );

Event/xAOD/xAODCore/Root/AuxInfoBase.cxx

 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: AuxInfoBase.cxx 793737 2017-01-24 20:11:10Z ssnyder $
@@ -55,6 +55,7 @@ namespace xAOD {
 
       // Unfortunately the dynamic variables can not be copied this easily...
       if( parent.m_store ) {
+         // cppcheck-suppress copyCtorPointerCopying
          m_store = parent.m_store;
          m_ownsStore = false;
          m_storeIO = dynamic_cast< SG::IAuxStoreIO* >( m_store );