Changes in external/fastjet/CompositeJetStructure.hh [1d208a2:273e668] in git

File:

• external/fastjet/CompositeJetStructure.hh (modified) (7 diffs)

external/fastjet/CompositeJetStructure.hh

@@ -1 +1 @@
 //FJSTARTHEADER
-// $Id: CompositeJetStructure.hh 4047 2016-03-03 13:21:49Z soyez $
+// $Id: CompositeJetStructure.hh 3652 2014-09-03 13:31:13Z salam $
 //
 // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
@@ -64 +64 @@
 
   /// description
-  virtual std::string description() const FASTJET_OVERRIDE;
+  virtual std::string description() const;
 
   // things reimplemented from the base structure
@@ -70 +70 @@
   /// true unless the jet has no pieces (see also the description of
   /// constituents() below)
-  virtual bool has_constituents() const FASTJET_OVERRIDE;
+  virtual bool has_constituents() const;
 
   /// return the constituents (i.e. the union of the constituents of each piece)
@@ -78 +78 @@
   /// Note that as a consequence, a composite jet with no pieces will
   /// have an empty vector as constituents
-  virtual std::vector<PseudoJet> constituents(const PseudoJet &jet) const FASTJET_OVERRIDE;
+  virtual std::vector<PseudoJet> constituents(const PseudoJet &jet) const;
 
   //-------------------------------------------------------------------
@@ -84 +84 @@
   //-------------------------------------------------------------------
   /// true if it has pieces (always the case)
-  virtual bool has_pieces(const PseudoJet & /*jet*/) const FASTJET_OVERRIDE {return true;}
+  virtual bool has_pieces(const PseudoJet & /*jet*/) const {return true;}
 
   /// returns the pieces
-  virtual std::vector<PseudoJet> pieces(const PseudoJet &jet) const FASTJET_OVERRIDE;
+  virtual std::vector<PseudoJet> pieces(const PseudoJet &jet) const;
 
   // area-related material
@@ -93 +93 @@
 
   /// check if it has a well-defined area
-  virtual bool has_area() const FASTJET_OVERRIDE;
+  virtual bool has_area() const;
 
   /// return the jet (scalar) area.
-  virtual double area(const PseudoJet &reference) const FASTJET_OVERRIDE;
+  virtual double area(const PseudoJet &reference) const;
 
   /// return the error (uncertainty) associated with the determination
@@ -102 +102 @@
   ///
   /// Be conservative: return the sum of the errors
-  virtual double area_error(const PseudoJet &reference) const FASTJET_OVERRIDE;
+  virtual double area_error(const PseudoJet &reference) const;
 
   /// return the jet 4-vector area.
-  virtual PseudoJet area_4vector(const PseudoJet &reference) const FASTJET_OVERRIDE;
+  virtual PseudoJet area_4vector(const PseudoJet &reference) const;
 
   /// true if this jet is made exclusively of ghosts.
   ///
   /// In this case, it will be true if all pieces are pure ghost
-  virtual bool is_pure_ghost(const PseudoJet &reference) const FASTJET_OVERRIDE;
+  virtual bool is_pure_ghost(const PseudoJet &reference) const;
 
   //unused: // allows one to modify the area information