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

external/fastjet/SharedPtr.hh

@@ -3 +3 @@
 
 //FJSTARTHEADER
-// $Id: SharedPtr.hh 3433 2014-07-23 08:17:03Z salam $
+// $Id: SharedPtr.hh 4051 2016-03-03 14:33:38Z soyez $
 //
 // Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
@@ -38 +38 @@
 // for our SharedPtr simply to be derived from the STL TR1 one.
 // #define __FASTJET_USETR1SHAREDPTR
+
+#include "fastjet/internal/deprecated.hh"
 
 #ifdef __FASTJET_USETR1SHAREDPTR
@@ -72 +74 @@
   SharedPtr(const SharedPtr<T> & t) : std::tr1::shared_ptr<T>(t) {}
   // for some reason operator() doesn't get inherited
+  #ifdef FASTJET_HAVE_EXPLICIT_FOR_OPERATORS
+  explicit
+  #endif
   inline operator bool() const {return (this->get()!=NULL);}
   /// return the pointer we're pointing to  
@@ -211 +216 @@
   }
   
-  /// return the pointer we're pointing to  
+  /// return the pointer we're pointing to
+  ///
+  /// Since FastJet 3.2.0, this is depracated since it is no longer
+  /// part of std::shared_ptr<T>. Use SharedPtr<T>::get() instead
+  FASTJET_DEPRECATED_MSG("Use SharedPtr<T>::get() instead")
   T* operator ()() const{
     if (_ptr==NULL) return NULL;
@@ -257 +266 @@
   /// conversion to bool
   /// This will allow you to use the indirection nicely
+  #ifdef FASTJET_HAVE_EXPLICIT_FOR_OPERATORS
+  explicit
+  #endif
   inline operator bool() const{
     return (get()!=NULL);