Changeset d69dfe4 in git for external/fastjet/internal

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

Location:

external/fastjet/internal

Files:

• ClusterSequence_N2.icc (modified) (2 diffs)
• IsBase.hh (modified) (2 diffs)
• SearchTree.hh (modified) (8 diffs)

external/fastjet/internal/ClusterSequence_N2.icc

@@ -1 +1 @@
 // -*- C++ -*-
-#ifndef __CLUSTERQUENCE_N2_ICC__
-#define __CLUSTERQUENCE_N2_ICC__
+#ifndef __FASTJET_CLUSTERQUENCE_N2_ICC__
+#define __FASTJET_CLUSTERQUENCE_N2_ICC__
 #include "fastjet/ClusterSequence.hh"
 
@@ -196 +196 @@
 FASTJET_END_NAMESPACE
 
-#endif // __CLUSTERQUENCE_N2_ICC__
-
-
+#endif // __FASTJET_CLUSTERQUENCE_N2_ICC__
+
+

external/fastjet/internal/IsBase.hh

@@ -1 +1 @@
 //STARTHEADER
-// $Id: IsBase.hh 2622 2011-10-05 22:13:23Z soyez $
+// $Id: IsBase.hh 3071 2013-04-01 12:52:46Z cacciari $
 //
 // Copyright (c) 2005-2011, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
@@ -163 +163 @@
 template<class B, class D>
 B* cast_if_derived(D* d){
-  return IsBaseAndDerived<B,D>::value ? (B*)(d) : NULL;
+  return IsBaseAndDerived<B,D>::value ? (B*)(d) : 0;
 }
 

external/fastjet/internal/SearchTree.hh

@@ -1 +1 @@
 //STARTHEADER
-// $Id: SearchTree.hh 2577 2011-09-13 15:11:38Z salam $
+// $Id: SearchTree.hh 3107 2013-05-03 15:47:47Z salam $
 //
 // Copyright (c) 2005-2011, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
@@ -89 +89 @@
   // tracking the depth may have some speed overhead -- so leave it 
   // out for the time being...
-#ifdef TRACK_DEPTH
+#ifdef __FASTJET_SEARCHTREE_TRACK_DEPTH
   /// the max depth the tree has ever reached
   inline unsigned int max_depth() const {return _max_depth;};
@@ -129 +129 @@
 
   
-#ifdef TRACK_DEPTH
+#ifdef __FASTJET_SEARCHTREE_TRACK_DEPTH
   unsigned int _max_depth;
 #endif
@@ -189 +189 @@
 
   // so that it can access out _node object;
-  friend class SearchTree<T>::const_circulator;
+  // note: "class U" needed for clang (v1.1 branches/release_27) compilation
+  template<class U> friend class SearchTree<U>::const_circulator;
   friend class SearchTree<T>;
 
@@ -340 +341 @@
   //_available_nodes.reserve();
 
-#ifdef TRACK_DEPTH
+#ifdef __FASTJET_SEARCHTREE_TRACK_DEPTH
   _max_depth     = 0;
 #endif
@@ -390 +391 @@
                                          ) {
 
-#ifdef TRACK_DEPTH
+#ifdef __FASTJET_SEARCHTREE_TRACK_DEPTH
   // keep track of tree depth for checking things stay reasonable...
   _max_depth = max(depth, _max_depth);
@@ -565 +566 @@
   bool             on_left = true; // (init not needed -- but soothes g++4)
   // work through tree until we reach its end
-#ifdef TRACK_DEPTH
+#ifdef __FASTJET_SEARCHTREE_TRACK_DEPTH
   unsigned int depth = 0;
 #endif
   while(location != NULL) {
-#ifdef TRACK_DEPTH
+#ifdef __FASTJET_SEARCHTREE_TRACK_DEPTH
     depth++;
 #endif
@@ -577 +578 @@
     else {location = location->right;}
   }
-#ifdef TRACK_DEPTH
+#ifdef __FASTJET_SEARCHTREE_TRACK_DEPTH
   _max_depth = max(depth, _max_depth);
 #endif