Merge branch 'cppcheck.CxxUtils-20200620' into 'master'

CxxUtils: Suppress cppcheck warning.

See merge request atlas/athena!33981

Control/CxxUtils/CxxUtils/ones.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-2020 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file CxxUtils/ones.h
  * @author scott snyder <snyder@bnl.gov>
@@ -29,6 +26,7 @@ T ones (unsigned int n)
 {
   if (n >= sizeof(T) * 8)
     return ~static_cast<T>(0);
+  // cppcheck-suppress shiftTooManyBits
   return (static_cast<T>(1) << n) - 1;
 }
 

Control/CxxUtils/test/phihelper_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 CxxUtils/test/phihelper_test.cxx
@@ -64,6 +64,7 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(test_wrap, T, test_types)
   BOOST_TEST(wrapToPi<T>(-40.1 * PI) == wrapToPi<T>(-10.1 * PI));
 }
 
+// cppcheck-suppress unknownMacro
 BOOST_TEST_DECORATOR(TOLERANCE)
 BOOST_AUTO_TEST_CASE_TEMPLATE(test_delta, T, test_types)
 {