security/botan/patches/patch-src_cert_cvc_freestore.h

   1 $NetBSD$
   2
   3 --- src/cert/cvc/freestore.h.orig       2013-04-30 22:56:51.000000000 +0000
   4 +++ src/cert/cvc/freestore.h
   5 @@ -8,7 +8,9 @@
   6
   7  #include <botan/build.h>
   8
   9 -#if defined(BOTAN_USE_STD_TR1)
  10 +#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
  11 +  #include <memory>
  12 +#elif defined(BOTAN_USE_STD_TR1)
  13    #include <tr1/memory>
  14  #elif defined(BOTAN_USE_BOOST_TR1)
  15    #include <boost/tr1/memory.hpp>
  16 @@ -17,6 +19,14 @@
  17  #endif
  18
  19  namespace Botan {
  20 +#ifndef BOTAN_SHARED_PTR
  21 +#define BOTAN_SHARED_PTR
  22 +#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
  23 +      using std::shared_ptr;
  24 +#else
  25 +      using std::tr1::shared_ptr;
  26 +#endif
  27 +#endif
  28
  29  /**
  30  * This class is intended as an function call parameter type and
  31 @@ -30,7 +40,7 @@ template<typename T>
  32  class BOTAN_DLL SharedPtrConverter
  33     {
  34     public:
  35 -      typedef std::tr1::shared_ptr<T> SharedPtr;
  36 +      typedef shared_ptr<T> SharedPtr;
  37
  38        /**
  39        * Construct a null pointer equivalent object.