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

SGComps: Fix cppcheck warnings.

See merge request atlas/athena!33977

Control/SGComps/src/ProxyProviderSvc.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
 */
 
 #include <algorithm>
@@ -261,7 +261,7 @@ ProxyProviderSvc::retrieveProxy(const CLID& id, const std::string& key,
     const EventContext& ctx = contextFromStore (store);
     SG::TransientAddress pTAd (id, key);
     pAPiterator iProvider(m_providers.begin()), iEnd(m_providers.end());
-    for (; iProvider != iEnd; iProvider++) {
+    for (; iProvider != iEnd; ++iProvider) {
       if ( ((*iProvider)->updateAddress(store.storeID(),&pTAd,ctx)).isSuccess() ) 
 	{
 	  pTAd.setProvider(*iProvider, store.storeID());

Control/SGComps/src/SGFolder.h

 // -*- 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
 */
 
 #ifndef SGCOMPS_FOLDER_H
@@ -46,8 +46,8 @@ namespace SG {
   public:
     /// \name structors
     //@{
-    Folder(const std::string& name, 
-	   const std::string& type,
+    Folder(const std::string& type,
+	   const std::string& name,
 	   const IInterface* parent);
     virtual ~Folder() override;
     //@}