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

[blackhole at projects.hepforge.org]

Author: buckley
Date: Thu Jun 10 19:12:51 2010
New Revision: 2481

Log:
A couple of minor changes incurred when trying to figure out the templated lossy FS bad_cast thing... sorry, they will force a complete rebuild :(

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

Modified: trunk/include/Rivet/ProjectionApplier.hh
==============================================================================
--- trunk/include/Rivet/ProjectionApplier.hh	Thu Jun 10 18:34:32 2010	(r2480)
+++ trunk/include/Rivet/ProjectionApplier.hh	Thu Jun 10 19:12:51 2010	(r2481)
@@ -115,7 +115,8 @@
     template <typename PROJ>
     const PROJ& addProjection(const PROJ& proj, const std::string& name) {
       const Projection& reg = _addProjection(proj, name);
-      return dynamic_cast<const PROJ&>(reg);
+      const PROJ& rtn = dynamic_cast<const PROJ&>(reg);
+      return rtn;
     }
 
 

Modified: trunk/src/Core/ProjectionHandler.cc
==============================================================================
--- trunk/src/Core/ProjectionHandler.cc	Thu Jun 10 18:34:32 2010	(r2480)
+++ trunk/src/Core/ProjectionHandler.cc	Thu Jun 10 19:12:51 2010	(r2481)
@@ -104,7 +104,7 @@
     getLog() << Log::TRACE << "Cloning projection " << proj.name() << " from " << &proj << endl;
     const Projection* newproj = proj.clone();
     getLog() << Log::TRACE << "Cloned projection " << proj.name() << " at " << newproj << endl;
- 
+
     // Copy all the child ProjHandles when cloning, since otherwise links to "stack parents"
     // will be generated by their children, without any connection to the cloned parent
     if (&proj != newproj) {
@@ -161,7 +161,7 @@
                << newtype.name() << " vs. " << regtype.name() << endl;
       if (newtype != regtype) continue;
       getLog() << Log::TRACE << "RTTI type matches with " << ph << endl;
-   
+
       // Test for semantic match
       if (pcmp(*ph, proj) != EQUIVALENT) {
         getLog() << Log::TRACE << "Projections at "