[Rivet-svn] r2683 - trunk/include/Rivet

[blackhole at projects.hepforge.org]

Author: fsiegert
Date: Mon Aug 30 13:48:17 2010
New Revision: 2683

Log:
Revert 2622. As written in #421 I need this in every single working copy on every single machine to not have Rivet crash as soon as I use multiple analyses. Andy: Please review this.

Modified:
   trunk/include/Rivet/ProjectionHandler.hh

Modified: trunk/include/Rivet/ProjectionHandler.hh
==============================================================================
--- trunk/include/Rivet/ProjectionHandler.hh	Mon Aug 30 13:46:31 2010	(r2682)
+++ trunk/include/Rivet/ProjectionHandler.hh	Mon Aug 30 13:48:17 2010	(r2683)
@@ -14,14 +14,6 @@
   /// Typedef for Projection (smart) pointer
   typedef shared_ptr<const Projection> ProjHandle;
 
-  // Needed to make smart pointers compare equivalent in the STL set
-  struct ProjHandleLess {
-    bool operator()(const ProjHandle& a, const ProjHandle& b) {
-      return a.get() < b.get();
-    }
-  };
-
-
   // Forward declaration.
   class ProjectionApplier;
 
@@ -54,7 +46,7 @@
     friend class ProjectionApplier;
 
     /// Typedef for a vector of Projection pointers.
-    typedef set<ProjHandle, ProjHandleLess> ProjHandles;
+    typedef set<ProjHandle> ProjHandles;
 
     /// @brief Typedef for the structure used to contain named projections for a
     /// particular containing Analysis or Projection.