Changeset d69dfe4 in git for external/fastjet/PseudoJetStructureBase.cc

Timestamp:

Nov 20, 2013, 9:52:59 PM (11 years ago)

Author:

pavel <pavel@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

fc39685

Parents:

88a9b72

Message:

upgrade fastjet to 3.0.6

File:

• external/fastjet/PseudoJetStructureBase.cc (modified) (5 diffs)

external/fastjet/PseudoJetStructureBase.cc

@@ -32 +32 @@
 #include "fastjet/PseudoJet.hh"
 #include "fastjet/ClusterSequence.hh"
+#ifndef __FJCORE__
 #include "fastjet/ClusterSequenceAreaBase.hh"
+#endif  // __FJCORE__
 
 using namespace std;
@@ -74 +76 @@
 }
 
+#ifndef __FJCORE__
 // if the jet has valid area information then return a pointer to
 // the associated ClusterSequenceAreaBase object; otherwise throw an error
@@ -81 +84 @@
   throw Error("This PseudoJet structure is not associated with a valid cluster sequence with area");
 }
+#endif
 
 
@@ -193 +197 @@
 // parent ClusterSequence (See ClusterSequenceAreaBase for details)
 //------------------------------------------------------------------
+#ifndef __FJCORE__
 
 // return the jet (scalar) area.
@@ -222 +227 @@
   throw Error("This PseudoJet structure has no implementation for is_pure_ghost");
 }
+#endif  // __FJCORE__
 
 FASTJET_END_NAMESPACE