Changeset e7e90df in git for classes/SortableObject.h

Timestamp:

Dec 9, 2014, 1:26:26 PM (10 years ago)

Author:

Michele <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

49234af

Parents:

01f457a (diff), f6b6ee7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into TestFastJet310b1

Conflicts:

Makefile
examples/Example1.C
examples/Example2.C
examples/Example3.C

File:

• classes/SortableObject.h (modified) (1 diff)

classes/SortableObject.h

@@ -43 +43 @@
 public:
   virtual ~CompBase() { }
-  virtual Bool_t IsSortable(const TObject *obj) const { return kTRUE; }
+  virtual Bool_t IsSortable(const TObject *) const { return kTRUE; }
   virtual Int_t Compare(const TObject *obj1, const TObject *obj2) const = 0;
 };