Revert "Fix unique_ptr availability"

This reverts commit a1a4f99ce8.
This commit is contained in:
Vinnie Falco
2013-08-07 19:25:26 -07:00
parent d8d0b63f88
commit 974ff8f07c

View File

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