Changeset b9ae4c3 in git for external/fastjet/ClosestPair2D.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/ClosestPair2D.cc (modified) (3 diffs)

external/fastjet/ClosestPair2D.cc

@@ -1 +1 @@
 //FJSTARTHEADER
-// $Id: ClosestPair2D.cc 3433 2014-07-23 08:17:03Z salam $
+// $Id: ClosestPair2D.cc 4059 2016-03-03 20:49:48Z soyez $
 //
 // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
@@ -145 +145 @@
 
     // and create the search tree
-    _trees[ishift] = auto_ptr<Tree>(new Tree(shuffles, max_size));
+    _trees[ishift] = SharedPtr<Tree>(new Tree(shuffles, max_size));
 
     // now we look for the closest-pair candidates on this tree
@@ -174 +174 @@
     mindists2[i] = _points[i].neighbour_dist2;}
   
-  _heap = auto_ptr<MinHeap>(new MinHeap(mindists2, max_size));
+  _heap = SharedPtr<MinHeap>(new MinHeap(mindists2, max_size));
 }