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

external/fastjet/internal/ClosestPair2D.hh

@@ -1 +1 @@
 //FJSTARTHEADER
-// $Id: ClosestPair2D.hh 3433 2014-07-23 08:17:03Z salam $
+// $Id: ClosestPair2D.hh 4059 2016-03-03 20:49:48Z soyez $
 //
 // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
@@ -38 +38 @@
 #include "fastjet/internal/SearchTree.hh"
 #include "fastjet/internal/MinHeap.hh"
+#include "fastjet/SharedPtr.hh"
 
 FASTJET_BEGIN_NAMESPACE      // defined in fastjet/internal/base.hh
@@ -134 +135 @@
 
 
-  triplet<std::auto_ptr<Tree> >  _trees;
-  std::auto_ptr<MinHeap> _heap;
+  triplet<SharedPtr<Tree> >  _trees;
+  SharedPtr<MinHeap>     _heap;
   std::vector<Point>     _points;
   std::stack<Point *>    _available_points;