Changeset b9ae4c3 in git for external/fastjet/internal/base.hh

Timestamp:

Sep 2, 2016, 3:46:14 PM (8 years ago)

Author:

GitHub <noreply@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

fa068d3

Parents:

ec5e04b (diff), 23389ff (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.

git-author:

Pavel Demin <pavel-demin@…> (09/02/16 15:46:14)

git-committer:

GitHub <noreply@…> (09/02/16 15:46:14)

Message:

Merge pull request #32 from delphes/dev_01

Dev 01

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__