From a1a4f99ce8e197edf335dd2b52077249280de85f Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Wed, 7 Aug 2013 19:13:57 -0700 Subject: [PATCH] Fix unique_ptr availability --- .../utility/ripple_PlatformMacros.h | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/modules/ripple_basics/utility/ripple_PlatformMacros.h b/modules/ripple_basics/utility/ripple_PlatformMacros.h index 75beb8aa9c..8f287d4182 100644 --- a/modules/ripple_basics/utility/ripple_PlatformMacros.h +++ b/modules/ripple_basics/utility/ripple_PlatformMacros.h @@ -16,18 +16,17 @@ // VFALCO TODO Clean this up -#if (!defined(FORCE_NO_C11X) && (__cplusplus > 201100L)) || defined(FORCE_C11X) - -// VFALCO TODO Get rid of the C11X macro -#define C11X -#define UPTR_T std::unique_ptr -#define MOVE_P(p) std::move(p) - +#ifdef BOOST_NO_AUTO_PTR +# define UPTR_T std::auto_ptr #else +# define UPTR_T std::unique_ptr +#endif -#define UPTR_T std::auto_ptr +#if (!defined(FORCE_NO_C11X) && (__cplusplus > 201100L)) || defined(FORCE_C11X) +//#define C11X +#define MOVE_P(p) std::move(p) +#else #define MOVE_P(p) (p) - #endif // VFALCO TODO Clean this stuff up. Remove as much as possible