[Rivet-svn] rivet: 2 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/25cdf6e64940
branches:  multiweight
changeset: 5589:25cdf6e64940
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Thu Oct 27 11:50:46 2016 +0100
description:
Use DEPRECATED macro instead of version-specific attribute.

details:   https://rivet.hepforge.org/hg/rivet/rev/5ce1439413f1
branches:  multiweight
changeset: 5590:5ce1439413f1
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Thu Oct 27 11:51:11 2016 +0100
description:
Fix book method in tests.

diffs (33 lines):

--- a/configure.ac	Wed Oct 26 23:59:06 2016 +0100
+++ b/configure.ac	Thu Oct 27 11:51:11 2016 +0100
@@ -39,7 +39,7 @@
 ## Compiler setup
 AC_LANG(C++)
 AC_PROG_CXX
-AX_CXX_COMPILE_STDCXX([14], [noext], [mandatory])
+AX_CXX_COMPILE_STDCXX([11], [noext], [mandatory])
 
 ## Store and propagate the compiler identity and flags
 RIVETCXX="$CXX"
--- a/include/Rivet/Event.hh	Wed Oct 26 23:59:06 2016 +0100
+++ b/include/Rivet/Event.hh	Thu Oct 27 11:51:11 2016 +0100
@@ -90,7 +90,7 @@
     std::valarray<double> weights() const;
 
     /// @brief Obsolete weight method. Always returns 1 now.
-    [[deprecated("Event weight does not need to be included anymore. For compatibility, it's always == 1 now.")]]
+    DEPRECATED("Event weight does not need to be included anymore. For compatibility, it's always == 1 now.")
     double weight() const { return 1.0; }
 
     //@}
--- a/test/testNaN.cc	Wed Oct 26 23:59:06 2016 +0100
+++ b/test/testNaN.cc	Thu Oct 27 11:51:11 2016 +0100
@@ -13,7 +13,7 @@
   Test() : Analysis("Test") {}
 
   void init() {
-    _h_test = bookHisto1D("test", 50, 66.0, 116.0);
+    book(_h_test, "test", 50, 66.0, 116.0);
   }
 
   void analyze(const Rivet::Event & e) {