[Rivet-svn] r2510 - in trunk: include/Rivet src/Core

[blackhole at projects.hepforge.org]

Author: buckley
Date: Wed Jun 23 11:41:04 2010
New Revision: 2510

Log:
Removing unused dummy argument from ProjectionHandler _clone, since last commit will have forced a full rebuild anyway

Modified:
   trunk/include/Rivet/ProjectionHandler.hh
   trunk/src/Core/ProjectionHandler.cc

Modified: trunk/include/Rivet/ProjectionHandler.hh
==============================================================================
--- trunk/include/Rivet/ProjectionHandler.hh	Wed Jun 23 11:39:45 2010	(r2509)
+++ trunk/include/Rivet/ProjectionHandler.hh	Wed Jun 23 11:41:04 2010	(r2510)
@@ -84,7 +84,7 @@
 
 
   private:
- 
+
     /// @name Construction. */
     //@{
     /// The standard constructor.
@@ -131,8 +131,7 @@
     const Projection* _getEquiv(const Projection& proj) const;
 
     /// Make a clone of proj, copying across child references from the original
-    const Projection* _clone(const ProjectionApplier& parent,
-                             const Projection& proj);
+    const Projection* _clone(const Projection& proj);
 
     /// Internal function to do the registering
     const Projection* _register(const ProjectionApplier& parent,
@@ -141,7 +140,7 @@
 
     /// Get a string dump of the current ProjHandler structure
     string _getStatus() const;
- 
+
     /// Check that this parent projection doesn't already use this name
     bool _checkDuplicate(const ProjectionApplier& parent,
                          const Projection& proj,
@@ -161,7 +160,7 @@
     /// problems and there is no need to do so.
     const Projection& getProjection(const ProjectionApplier& parent,
                                     const string& name) const;
- 
+
     /// Get child projections for the given parent. By default this will just
     /// return the projections directly contained by the @a parent, but the @a
     /// depth argument can be changed to do a deep retrieval, which will recurse

Modified: trunk/src/Core/ProjectionHandler.cc
==============================================================================
--- trunk/src/Core/ProjectionHandler.cc	Wed Jun 23 11:39:45 2010	(r2509)
+++ trunk/src/Core/ProjectionHandler.cc	Wed Jun 23 11:41:04 2010	(r2510)
@@ -71,7 +71,7 @@
     const Projection* p = _getEquiv(proj);
     if (p == 0) { // a null pointer is a non-match
       // If there is no equivalent projection, clone proj and use the clone for registering
-      p = _clone(parent, proj);
+      p = _clone(proj);
     }
 
     // Do the registering
@@ -96,9 +96,7 @@
 
 
   // Clone neatly
-  /// @todo Remove the 'parent' argument?
-  const Projection* ProjectionHandler::_clone(const ProjectionApplier& UNUSED(parent),
-                                              const Projection& proj)
+  const Projection* ProjectionHandler::_clone(const Projection& proj)
   {
     // Clone a new copy of the passed projection on the heap
     getLog() << Log::TRACE << "Cloning projection " << proj.name() << " from " << &proj << endl;