[Rivet-svn] r1746 - in trunk: include/Rivet src

[blackhole at projects.hepforge.org]

Author: fsiegert
Date: Wed Aug  5 17:43:08 2009
New Revision: 1746

Log:
Undo the smart pointer changes. They didn't have anything to do with the actual fix of the problem.

Modified:
   trunk/include/Rivet/Analysis.hh
   trunk/src/Analysis.cc

Modified: trunk/include/Rivet/Analysis.hh
==============================================================================
--- trunk/include/Rivet/Analysis.hh	Wed Aug  5 16:34:46 2009	(r1745)
+++ trunk/include/Rivet/Analysis.hh	Wed Aug  5 17:43:08 2009	(r1746)
@@ -59,7 +59,7 @@
     Analysis(const std::string& name);
 
     /// The destructor.
-    virtual ~Analysis();
+    virtual ~Analysis() { }
     //@}
 
   public:
@@ -401,7 +401,7 @@
   protected:
 
     /// Pointer to analysis metadata object
-    AnalysisInfo * _info;
+    shared_ptr<AnalysisInfo> _info;
 
     
   private:

Modified: trunk/src/Analysis.cc
==============================================================================
--- trunk/src/Analysis.cc	Wed Aug  5 16:34:46 2009	(r1745)
+++ trunk/src/Analysis.cc	Wed Aug  5 17:43:08 2009	(r1746)
@@ -17,14 +17,10 @@
       _analysishandler(0),
       _madeHistoDir(false)
   {
-    _info = AnalysisInfo::make(name);
+    _info.reset( AnalysisInfo::make(name) );
     setBeams(ANY, ANY);
   }
-
-  Analysis::~Analysis()
-  {
-    if (_info) delete _info;
-  }
+  
 
   IAnalysisFactory& Analysis::analysisFactory() {
     return handler().analysisFactory();