From c33d3dff77b63ce0c37e5f8d1d7be25529aa9e94 Mon Sep 17 00:00:00 2001
From: scott snyder <sss@karma>
Date: Fri, 19 Jun 2020 15:14:02 +0200
Subject: [PATCH] SGComps: Fix cppcheck warnings.
- Parameter name ordering mismatch.
- Use preincrement rather than postincrement.
---
Control/SGComps/src/ProxyProviderSvc.cxx | 4 ++--
Control/SGComps/src/SGFolder.h | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Control/SGComps/src/ProxyProviderSvc.cxx b/Control/SGComps/src/ProxyProviderSvc.cxx
index 2b2b938530e8..06a4b847fab8 100644
--- a/Control/SGComps/src/ProxyProviderSvc.cxx
+++ b/Control/SGComps/src/ProxyProviderSvc.cxx
@@ -1,5 +1,5 @@
/*
- 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());
diff --git a/Control/SGComps/src/SGFolder.h b/Control/SGComps/src/SGFolder.h
index 4bd4d02dc08c..011fdc7a76a9 100644
--- a/Control/SGComps/src/SGFolder.h
+++ b/Control/SGComps/src/SGFolder.h
@@ -1,7 +1,7 @@
// -*- 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;
//@}
--
GitLab