Changes in external/fastjet/SharedPtr.hh [1d208a2:35cdc46] in git

File:

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

external/fastjet/SharedPtr.hh

@@ -3 +3 @@
 
 //FJSTARTHEADER
-// $Id: SharedPtr.hh 4051 2016-03-03 14:33:38Z soyez $
+// $Id: SharedPtr.hh 3433 2014-07-23 08:17:03Z salam $
 //
 // 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
@@ -74 +72 @@
   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  
@@ -216 +211 @@
   }
   
-  /// 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")
+  /// return the pointer we're pointing to  
   T* operator ()() const{
     if (_ptr==NULL) return NULL;
@@ -266 +257 @@
   /// 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);