Changeset b9ae4c3 in git for external/fastjet/ClusterSequence_Delaunay.cc

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/ClusterSequence_Delaunay.cc (modified) (2 diffs)

external/fastjet/ClusterSequence_Delaunay.cc

@@ -1 +1 @@
 //FJSTARTHEADER
-// $Id: ClusterSequence_Delaunay.cc 3918 2015-07-03 14:19:13Z salam $
+// $Id: ClusterSequence_Delaunay.cc 4059 2016-03-03 20:49:48Z soyez $
 //
 // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
@@ -69 +69 @@
 
   // initialise our DNN structure with the set of points
-  auto_ptr<DynamicNearestNeighbours> DNN;
-  bool verbose = false;
+  SharedPtr<DynamicNearestNeighbours> DNN;
+  const bool verbose = false;
 #ifndef DROP_CGAL // strategy = NlnN* are not supported if we drop CGAL...
   bool ignore_nearest_is_mirror = (_Rparam < twopi);