From 0cffc0ec224b759d6f6b2e8517151d5fb39f1cab Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Sun, 4 Aug 2019 15:04:33 +0200
Subject: [PATCH] RHadrons: Fix non-standard marking of unused parameters.

Unused parameters should simply not be named.
---
 .../RHadrons/src/FullModelHadronicProcess.cxx   | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/Simulation/G4Extensions/RHadrons/src/FullModelHadronicProcess.cxx b/Simulation/G4Extensions/RHadrons/src/FullModelHadronicProcess.cxx
index 997bd0806f2..3fd9f54e9d1 100644
--- a/Simulation/G4Extensions/RHadrons/src/FullModelHadronicProcess.cxx
+++ b/Simulation/G4Extensions/RHadrons/src/FullModelHadronicProcess.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 "FullModelHadronicProcess.hh"
@@ -12,17 +12,6 @@
 #include "CustomParticle.h"
 
 
-// Macro to help with overzealous compiler warnings
-#ifdef UNUSED
-#elif defined(__GNUC__)
-# define UNUSED(x) UNUSED_ ## x __attribute__((unused))
-#elif defined(__LCLINT__)
-# define UNUSED(x) /*@unused@*/ x
-#else
-# define UNUSED(x) x
-#endif
-
-
 FullModelHadronicProcess::FullModelHadronicProcess(const G4String& processName) :
   G4VDiscreteProcess(processName,fUserDefined),m_theParticle(0),m_newParticle(0),m_toyModel(false),m_cache(0)
 {
@@ -41,7 +30,7 @@ G4bool FullModelHadronicProcess::IsApplicable(const G4ParticleDefinition& aP)
 
 G4double FullModelHadronicProcess::GetMicroscopicCrossSection(const G4DynamicParticle *aParticle,
                                                               const G4Element *anElement,
-                                                              G4double UNUSED(aTemp))
+                                                              G4double /*aTemp*/)
 {
   // Get the cross section for this particle/element combination from the ProcessHelper
   G4double InclXsec = m_theHelper->GetInclusiveCrossSection(aParticle,anElement);
@@ -88,7 +77,7 @@ G4double FullModelHadronicProcess::GetMeanFreePath(const G4Track& aTrack, G4doub
 
 
 G4VParticleChange* FullModelHadronicProcess::PostStepDoIt(const G4Track& aTrack,
-                                                          const G4Step&  UNUSED(aStep))
+                                                          const G4Step&  /*aStep*/)
 {
   // A little setting up
   aParticleChange.Initialize(aTrack);
-- 
GitLab