[Rivet-svn] rivet: 5 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/c9f7be8e22ae
branches:  
changeset: 5089:c9f7be8e22ae
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Thu Mar 31 18:23:22 2016 +0100
description:
clone() uses unique_ptr. Fixed destructor of ProjectionApplier.

details:   https://rivet.hepforge.org/hg/rivet/rev/eefc11b81071
branches:  
changeset: 5090:eefc11b81071
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Fri Apr 01 15:50:07 2016 +0100
description:
Removal of superfluous allocations (1/n)

details:   https://rivet.hepforge.org/hg/rivet/rev/de9fb8c53147
branches:  
changeset: 5091:de9fb8c53147
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Fri Apr 01 16:44:07 2016 +0100
description:
Removal of superfluous allocations (2/n)

details:   https://rivet.hepforge.org/hg/rivet/rev/9c3b40a75ef0
branches:  
changeset: 5092:9c3b40a75ef0
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Fri Apr 01 16:48:54 2016 +0100
description:
Removal of superfluous allocations (3/n)

details:   https://rivet.hepforge.org/hg/rivet/rev/3d907b51c863
branches:  
changeset: 5093:3d907b51c863
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Sat Apr 02 21:18:05 2016 +0100
description:
merged

diffs (truncated from 1910 to 50 lines):

--- a/bin/rivet-nopy.cc	Thu Mar 31 12:07:20 2016 +0100
+++ b/bin/rivet-nopy.cc	Sat Apr 02 21:18:05 2016 +0100
@@ -18,15 +18,15 @@
     ah.addAnalysis(argv[i]);
   }
 
-  std::istream* file = new std::fstream(argv[1], std::ios::in);
-  HepMC::IO_GenEvent hepmcio(*file);
+  std::ifstream file(argv[1]);
+  HepMC::IO_GenEvent hepmcio(file);
   HepMC::GenEvent* evt = hepmcio.read_next_event();
   while (evt) {
     ah.analyze(*evt);
     delete evt; evt = 0;
     hepmcio >> evt;
   }
-  delete file; file = 0;
+  file.close();
 
   ah.setCrossSection(1.0);
   ah.finalize();
--- a/configure.ac	Thu Mar 31 12:07:20 2016 +0100
+++ b/configure.ac	Sat Apr 02 21:18:05 2016 +0100
@@ -39,7 +39,7 @@
 ## Compiler setup
 AC_LANG(C++)
 AC_PROG_CXX
-AX_CXX_COMPILE_STDCXX_11([noext], [mandatory])
+AX_CXX_COMPILE_STDCXX([11], [noext], [mandatory])
 
 ## Store and propagate the compiler identity and flags
 RIVETCXX="$CXX"
@@ -305,7 +305,6 @@
 AM_CPPFLAGS="$AM_CPPFLAGS -I\$(HEPMCINCPATH)"
 AM_CPPFLAGS="$AM_CPPFLAGS -I\$(FASTJETINCPATH)"
 AC_CEDAR_CHECKCXXFLAG([-pedantic], [AM_CXXFLAGS="$AM_CXXFLAGS -pedantic"])
-AC_CEDAR_CHECKCXXFLAG([-ansi], [AM_CXXFLAGS="$AM_CXXFLAGS -ansi"])
 AC_CEDAR_CHECKCXXFLAG([-Wall], [AM_CXXFLAGS="$AM_CXXFLAGS -Wall"])
 AC_CEDAR_CHECKCXXFLAG([-Wno-long-long], [AM_CXXFLAGS="$AM_CXXFLAGS -Wno-long-long"])
 AC_CEDAR_CHECKCXXFLAG([-Wno-format], [AM_CXXFLAGS="$AM_CXXFLAGS -Wno-format"])
--- a/include/Rivet/Projection.hh	Thu Mar 31 12:07:20 2016 +0100
+++ b/include/Rivet/Projection.hh	Sat Apr 02 21:18:05 2016 +0100
@@ -42,7 +42,7 @@
     Projection();
 
     /// Clone on the heap.
-    virtual const Projection* clone() const = 0;
+    virtual unique_ptr<Projection> clone() const = 0;
 
     /// The destructor.