[Rivet-svn] rivet: Remove blockDestructor functionality. Not needed now that...

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/9f667454e9d0
branches:  multiweight
changeset: 6114:9f667454e9d0
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Fri Oct 27 11:33:22 2017 +0200
description:
Remove blockDestructor functionality. Not needed now that the wrappers are proper shared pointers.

diffs (truncated from 96 to 50 lines):

--- a/include/Rivet/Tools/RivetYODA.hh	Fri Oct 27 10:50:41 2017 +0200
+++ b/include/Rivet/Tools/RivetYODA.hh	Fri Oct 27 11:33:22 2017 +0200
@@ -46,8 +46,6 @@
             /// rename to setActive(Idx)?
             virtual void setActiveWeightIdx(unsigned int iWeight) = 0;
 
-            virtual void blockDestructor(bool) = 0;
-
             bool operator ==(const AnalysisObjectWrapper& p) { return (this == &p); }
 
         protected:
@@ -369,13 +367,6 @@
         /* to be implemented for each type */
         void pushToPersistent(const vector<valarray<double> >& weight);
 
-        /// Set destructor blocking flag.
-        /// Once booked in an analysis, we need to block the destructor 
-        /// from being called until we're done with finalize.
-        /// This gives a clearer indication to the users that they're booking with
-        /// temporary objects.
-        void blockDestructor(bool b) { _blockDestructor = b; }
-
         /* M of these, one for each weight */
         vector<typename T::Ptr> _persistent;
 
@@ -384,12 +375,6 @@
 
         typename T::Ptr _active;
 
-        /// Destructor blocking flag.
-        /// Once booked in an analysis, we need to block the destructor 
-        /// from being called until we're done with finalize.
-        /// 
-        bool _blockDestructor = false;
-
         // do we need implicit cast?
         // operator typename T::Ptr () {
         //     return _active;
--- a/src/Core/Analysis.cc	Fri Oct 27 10:50:41 2017 +0200
+++ b/src/Core/Analysis.cc	Fri Oct 27 11:33:22 2017 +0200
@@ -823,7 +823,6 @@
   void Analysis::addAnalysisObject(const MultiweightAOPtr & ao) {
     if (handler().stage() == AnalysisHandler::Stage::INIT) {
       _analysisobjects.push_back(ao);
-      ao.get()->blockDestructor(true);
     }
     else {
       errormsg(name());
--- a/src/Core/AnalysisHandler.cc	Fri Oct 27 10:50:41 2017 +0200
+++ b/src/Core/AnalysisHandler.cc	Fri Oct 27 11:33:22 2017 +0200