Fix unique_ptr availability

This commit is contained in:
Vinnie Falco
2013-08-07 19:13:57 -07:00
parent 071b404f80
commit a1a4f99ce8

View File

@@ -16,18 +16,17 @@
// VFALCO TODO Clean this up // VFALCO TODO Clean this up
#if (!defined(FORCE_NO_C11X) && (__cplusplus > 201100L)) || defined(FORCE_C11X) #ifdef BOOST_NO_AUTO_PTR
# define UPTR_T std::auto_ptr
// VFALCO TODO Get rid of the C11X macro
#define C11X
#define UPTR_T std::unique_ptr
#define MOVE_P(p) std::move(p)
#else #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) #define MOVE_P(p) (p)
#endif #endif
// VFALCO TODO Clean this stuff up. Remove as much as possible // VFALCO TODO Clean this stuff up. Remove as much as possible