From b50fe04e0a7c8905aa072c91fd4ff31289c7c96d Mon Sep 17 00:00:00 2001 From: SoftCoder Date: Mon, 18 Jan 2016 14:36:51 -0800 Subject: [PATCH] - try to fix mac build --- .../include/platform/common/common_scoped_ptr.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/source/shared_lib/include/platform/common/common_scoped_ptr.h b/source/shared_lib/include/platform/common/common_scoped_ptr.h index d6cdec803..d47247f5b 100644 --- a/source/shared_lib/include/platform/common/common_scoped_ptr.h +++ b/source/shared_lib/include/platform/common/common_scoped_ptr.h @@ -20,8 +20,13 @@ using namespace std; // C++11 -#if !defined(HAVE_CXX11) && !defined(__GXX_EXPERIMENTAL_CXX0X__) && (__cplusplus < 201103L) - #define unique_ptr auto_ptr +#if !defined(HAVE_CXX11) && !defined(__GXX_EXPERIMENTAL_CXX0X__) && (__cplusplus < 201103L) && (_MSC_VER < 1900) + #ifdef __APPLE__ + template + using unique_ptr = auto_ptr; + #else + #define unique_ptr auto_ptr + #endif #endif #endif