OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-18 11:19:10 +00:00
Code Releases Activity

Require C++14 for std::make_unique

Browse Source
This commit is contained in:
Michael Hansen
2015-01-09 21:39:02 -08:00
parent d872432e34
commit 8bbb560966
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Sources/Plasma/CoreLib/HeadSpin.h
View File

@ -120,10 +120,10 @@ typedef int32_t hsError;
#define hsFailed(r) ((hsError)(r)<hsOK) #define hsFailed(r) ((hsError)(r)<hsOK)
#define hsSucceeded(r) ((hsError)(r)>=hsOK) #define hsSucceeded(r) ((hsError)(r)>=hsOK)
#if defined(HAVE_CXX14_DEPRECATED_ATTR) #if defined(HAVE_GCC_DEPRECATED_ATTR)
# define hsDeprecated(message) [[deprecated(message)]]
#elif defined(HAVE_GCC_DEPRECATED_ATTR)
# define hsDeprecated(message) __attribute__((deprecated(message))) # define hsDeprecated(message) __attribute__((deprecated(message)))
#elif defined(HAVE_CXX14_DEPRECATED_ATTR)
# define hsDeprecated(message) [[deprecated(message)]]
#elif defined(_MSC_VER) #elif defined(_MSC_VER)
# define hsDeprecated(message) __declspec(deprecated(message)) # define hsDeprecated(message) __declspec(deprecated(message))
#else #else

2
cmake/CompilerChecks.cmake
View File

@ -5,7 +5,7 @@ endif()
# Require C++11 # Require C++11
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGXX) if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGXX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1y")
if(APPLE) if(APPLE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
endif() endif()