[Rivet-svn] rivet: undo CLANG warning fix

Rivet Mercurial rivet at projects.hepforge.org
Tue May 22 15:15:02 BST 2018


details:   https://rivet.hepforge.org/hg/rivet/rev/20a1c9e84863
branches:  release-2-6-x
changeset: 6295:20a1c9e84863
user:      Christian Gutschow <chris.g at cern.ch>
date:      Tue May 22 15:10:34 2018 +0100
description:
undo CLANG warning fix

diffs (20 lines):

--- a/include/Rivet/Tools/ParticleUtils.hh	Tue May 22 14:32:57 2018 +0100
+++ b/include/Rivet/Tools/ParticleUtils.hh	Tue May 22 15:10:34 2018 +0100
@@ -535,7 +535,7 @@
 
   /// PID matching functor
   struct HasPID : public BoolParticleFunctor {
-    HasPID(PdgId pid) : targetpids{ pid } { }
+    HasPID(PdgId pid) : targetpids{ {pid} } { }
     HasPID(vector<PdgId> pids) : targetpids{pids} { }
     HasPID(initializer_list<PdgId> pids) : targetpids{pids} { }
     bool operator()(const Particle& p) const { return contains(targetpids, p.pid()); }
@@ -545,7 +545,7 @@
 
   /// |PID| matching functor
   struct HasAbsPID : public BoolParticleFunctor {
-    HasAbsPID(PdgId pid) : targetapids{ abs(pid) } { }
+    HasAbsPID(PdgId pid) : targetapids{ {abs(pid)} } { }
     HasAbsPID(vector<PdgId> pids) { for (PdgId pid : pids) targetapids.push_back(abs(pid)); }
     HasAbsPID(initializer_list<PdgId> pids) { for (PdgId pid : pids) targetapids.push_back(abs(pid)); }
     bool operator()(const Particle& p) const { return contains(targetapids, p.abspid()); }


More information about the Rivet-svn mailing list