From 304dda96f91bf3ac6383ad6f7ab4be3c9d05c702 Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Tue, 17 Dec 2019 16:19:01 +0100
Subject: [PATCH] RHadrons: Fix clang warnings.
clang warnings:
- Do not use std::move in a return statement.
- Unused private data members.
---
.../G4Extensions/RHadrons/src/FullModelHadronicProcess.cxx | 2 +-
.../G4Extensions/RHadrons/src/FullModelHadronicProcess.hh | 3 +--
Simulation/G4Extensions/RHadrons/src/SG_StepNtupleTool.cxx | 4 ++--
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/Simulation/G4Extensions/RHadrons/src/FullModelHadronicProcess.cxx b/Simulation/G4Extensions/RHadrons/src/FullModelHadronicProcess.cxx
index 3fd9f54e9d1..5424e77e435 100644
--- a/Simulation/G4Extensions/RHadrons/src/FullModelHadronicProcess.cxx
+++ b/Simulation/G4Extensions/RHadrons/src/FullModelHadronicProcess.cxx
@@ -13,7 +13,7 @@
FullModelHadronicProcess::FullModelHadronicProcess(const G4String& processName) :
- G4VDiscreteProcess(processName,fUserDefined),m_theParticle(0),m_newParticle(0),m_toyModel(false),m_cache(0)
+ G4VDiscreteProcess(processName,fUserDefined),m_theParticle(0),m_newParticle(0),m_cache(0)
{
// Instantiating helper class
m_theHelper = G4ProcessHelper::Instance();
diff --git a/Simulation/G4Extensions/RHadrons/src/FullModelHadronicProcess.hh b/Simulation/G4Extensions/RHadrons/src/FullModelHadronicProcess.hh
index 882d7d9acb5..abddf29e085 100644
--- a/Simulation/G4Extensions/RHadrons/src/FullModelHadronicProcess.hh
+++ b/Simulation/G4Extensions/RHadrons/src/FullModelHadronicProcess.hh
@@ -1,5 +1,5 @@
/*
- 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 FullModelHadronicProcess_h
@@ -68,7 +68,6 @@ private:
const G4DynamicParticle* FindRhadron(G4ParticleChange*);
G4ProcessHelper* m_theHelper;
- G4bool m_toyModel;
G4double m_cache;
G4ThreeVector m_what;
diff --git a/Simulation/G4Extensions/RHadrons/src/SG_StepNtupleTool.cxx b/Simulation/G4Extensions/RHadrons/src/SG_StepNtupleTool.cxx
index 5b7ebac8926..fe9f3c840c8 100644
--- a/Simulation/G4Extensions/RHadrons/src/SG_StepNtupleTool.cxx
+++ b/Simulation/G4Extensions/RHadrons/src/SG_StepNtupleTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#include "SG_StepNtupleTool.h"
@@ -23,7 +23,7 @@ namespace G4UA
actionList.runActions.push_back( action.get() );
actionList.eventActions.push_back( action.get() );
actionList.steppingActions.push_back( action.get() );
- return std::move(action);
+ return action;
}
} // namespace G4UA
--
GitLab