[Rivet-svn] rivet: 2 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/3456c0467a14
branches:  release-2-6-x
changeset: 6290:3456c0467a14
user:      Andy Buckley <andy at insectnation.org>
date:      Wed May 16 15:05:59 2018 +0100
description:
Fix Python version check

details:   https://rivet.hepforge.org/hg/rivet/rev/133b144e8a70
branches:  release-2-6-x
changeset: 6291:133b144e8a70
user:      Andy Buckley <andy at insectnation.org>
date:      Fri May 18 16:14:56 2018 +0100
description:
Make CmpAnaHandle::operator() const, for GCC 8 (thanks to CMS)

diffs (32 lines):

--- a/ChangeLog	Fri May 11 09:33:01 2018 +0100
+++ b/ChangeLog	Fri May 18 16:14:56 2018 +0100
@@ -1,3 +1,7 @@
+2018-05-18  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Make CmpAnaHandle::operator() const, for GCC 8 (thanks to CMS)
+
 2018-05-07  Andy Buckley  <andy.buckley at cern.ch>
 
 	* CMS_2016_I1421646.cc: Add patch from CMS to veto if leading jets
--- a/include/Rivet/AnalysisHandler.hh	Fri May 11 09:33:01 2018 +0100
+++ b/include/Rivet/AnalysisHandler.hh	Fri May 18 16:14:56 2018 +0100
@@ -17,7 +17,7 @@
 
   // Needed to make smart pointers compare equivalent in the STL set
   struct CmpAnaHandle {
-    bool operator() (const AnaHandle& a, const AnaHandle& b) {
+    bool operator() (const AnaHandle& a, const AnaHandle& b) const {
       return a.get() < b.get();
     }
   };
--- a/m4/ax_python_devel.m4	Fri May 11 09:33:01 2018 +0100
+++ b/m4/ax_python_devel.m4	Fri May 18 16:14:56 2018 +0100
@@ -119,7 +119,7 @@
         cat << EOF > ax_python_devel_vpy.py
 class VPy:
     def vtup(self, s):
-        return tuple(map(int, s.strip().split(".")))
+        return tuple(map(int, s.strip().replace("rc", ".").split(".")))
     def __init__(self):
         import platform
         self.vpy = self.vtup(platform.python_version())