[Rivet-svn] rivet: 2 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/1052da91b3c2
branches:  multiweight
changeset: 6357:1052da91b3c2
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Tue Jul 03 12:12:31 2018 +0100
description:
Fix missing header on some libstdc++

details:   https://rivet.hepforge.org/hg/rivet/rev/e766a8ff8fa5
branches:  multiweight
changeset: 6358:e766a8ff8fa5
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Tue Jul 03 12:13:43 2018 +0100
description:
Cannot use assert in a public header

diffs (31 lines):

--- a/include/Rivet/Tools/RivetHepMC.hh	Wed Jun 27 11:26:38 2018 +0100
+++ b/include/Rivet/Tools/RivetHepMC.hh	Tue Jul 03 12:13:43 2018 +0100
@@ -34,7 +34,7 @@
 
 
   inline std::vector<GenParticle const *> particles(const GenEvent* ge) {
-    assert(ge);
+    if ( !ge ) return {};
     std::vector<const GenParticle*> rtn;
     for (GenEvent::particle_const_iterator pi = ge->particles_begin(); pi != ge->particles_end(); ++pi)
       rtn.push_back(*pi);
@@ -42,7 +42,7 @@
   }
 
   inline std::vector<GenParticlePtr> particles(GenEvent* ge) {
-    assert(ge);
+    if ( !ge ) return {};
     std::vector<GenParticle*> rtn;
     for (GenEvent::particle_iterator pi = ge->particles_begin(); pi != ge->particles_end(); ++pi)
       rtn.push_back(*pi);
--- a/include/Rivet/Tools/RivetSTL.hh	Wed Jun 27 11:26:38 2018 +0100
+++ b/include/Rivet/Tools/RivetSTL.hh	Tue Jul 03 12:13:43 2018 +0100
@@ -9,7 +9,7 @@
 #include <map>
 
 #include <memory>
-
+#include <functional>
 
 // #include <utility>
 // #include <tuple>