Changeset 1d208a2 in git for external/fastjet/internal/base.hh

Timestamp:

Aug 30, 2016, 12:36:00 AM (8 years ago)

Author:

Pavel Demin <pavel.demin@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

6be4bc0

Parents:

d091310

Message:

update FastJet library to 3.2.1 and Nsubjettiness library to 2.2.4

File:

• external/fastjet/internal/base.hh (modified) (3 diffs)

external/fastjet/internal/base.hh

@@ -1 +1 @@
 
 //FJSTARTHEADER
-// $Id: base.hh 3433 2014-07-23 08:17:03Z salam $
+// $Id: base.hh 4047 2016-03-03 13:21:49Z soyez $
 //
 // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
@@ -33 +33 @@
 #define __FASTJET_FASTJET_BASE_HH__
 
+#include "fastjet/config.h"
+
 /// \namespace fastjet
 /// the FastJet namespace
@@ -43 +45 @@
 #define FASTJET_END_NAMESPACE   }
 
+// define a macro to mark virtual function in derived classes as
+// overriding the base-class definition
+#ifdef FASTJET_HAVE_OVERRIDE
+#define FASTJET_OVERRIDE  override
+#else
+#define FASTJET_OVERRIDE  
+#endif
+
 #endif // __FASTJET_FASTJET_BASE_HH__