Changeset d69dfe4 in git for external/fastjet/SharedPtr.hh

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

File:

• external/fastjet/SharedPtr.hh (modified) (4 diffs)

external/fastjet/SharedPtr.hh

@@ -3 +3 @@
 
 //STARTHEADER
-// $Id: SharedPtr.hh 2680 2011-11-12 17:12:05Z soyez $
+// $Id: SharedPtr.hh 3129 2013-06-05 08:48:36Z salam $
 //
 // Copyright (c) 2005-2011, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
@@ -35 +35 @@
 // for testing purposes, the following define makes it possible
 // for our SharedPtr simply to be derived from the STL TR1 one.
-// #define USETR1SHAREDPTR
-
-#ifdef USETR1SHAREDPTR
+// #define __FASTJET_USETR1SHAREDPTR
+
+#ifdef __FASTJET_USETR1SHAREDPTR
 #include <tr1/memory>
-#endif // USETR1SHAREDPTR
+#endif // __FASTJET_USETR1SHAREDPTR
 
 FASTJET_BEGIN_NAMESPACE      // defined in fastjet/internal/base.hh
 
-#ifdef USETR1SHAREDPTR
+#ifdef __FASTJET_USETR1SHAREDPTR
 
 /// @ingroup advanced_usage
@@ -78 +78 @@
 
 
-#else // USETR1SHAREDPTR
+#else // __FASTJET_USETR1SHAREDPTR
 
 /**
@@ -390 +390 @@
 }
 
-#endif // USETR1SHAREDPTR
+#endif // __FASTJET_USETR1SHAREDPTR
 
 FASTJET_END_NAMESPACE      // defined in fastjet/internal/base.hh