Changeset 969eb19 in git for external/fastjet/plugins/SISCone/split_merge.h

Timestamp:

May 29, 2019, 3:05:12 PM (5 years ago)

Author:

Pavel Demin <pavel-demin@…>

Branches:

ImprovedOutputFile, Timing, master

Children:

861ad5a

Parents:

adeddd8

Message:

fix auto_ptr in SISCone/split_merge.h

File:

• external/fastjet/plugins/SISCone/split_merge.h (modified) (1 diff)

external/fastjet/plugins/SISCone/split_merge.h

@@ -446 +446 @@
   // jet information
   /// list of jet candidates
-#ifdef SISCONE_USES_UNIQUE_PTR_AS_AUTO_PTR
+#if __cplusplus < 201103L
+  std::auto_ptr<std::multiset<Cjet,Csplit_merge_ptcomparison> > candidates;
+#else
   std::unique_ptr<std::multiset<Cjet,Csplit_merge_ptcomparison> > candidates;
-#else
-  std::auto_ptr<std::multiset<Cjet,Csplit_merge_ptcomparison> > candidates;
 #endif