From 74669a5a8aca869eafef8eb4601f6f0fd28b5e59 Mon Sep 17 00:00:00 2001 From: bolero-MURAKAMI Date: Tue, 13 Oct 2015 22:18:55 +0900 Subject: [PATCH] update config for visualc --- sprout/config/compiler/visualc.hpp | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/sprout/config/compiler/visualc.hpp b/sprout/config/compiler/visualc.hpp index 0dfe63e4..4f7fc2ee 100644 --- a/sprout/config/compiler/visualc.hpp +++ b/sprout/config/compiler/visualc.hpp @@ -9,19 +9,27 @@ #define SPROUT_CONFIG_COMPILER_VISUALC_HPP #define SPROUT_NO_CXX11_CONSTEXPR -#define SPROUT_NO_CXX11_DEFAULTED_FUNCTIONS -#define SPROUT_NO_CXX11_DELETED_FUNCTIONS +#if _MSC_FULL_VER < 180020827 +# define SPROUT_NO_CXX11_DEFAULTED_FUNCTIONS +# define SPROUT_NO_CXX11_DELETED_FUNCTIONS +# define SPROUT_NO_CXX11_TEMPLATE_ALIASES +# define SPROUT_NO_CXX11_DELEGATING_CONSTRUCTORS +#endif #if _MSC_FULL_VER < 170051025 || !defined(SPROUT_MSVC_ENABLE_2012_NOV_CTP) # define SPROUT_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS #endif -#define SPROUT_NO_CXX11_NOEXCEPT -#define SPROUT_NO_CXX11_TEMPLATE_ALIASES -#define SPROUT_NO_CXX11_USER_DEFINED_LITERALS -#define SPROUT_NO_CXX11_DELEGATING_CONSTRUCTORS -#define SPROUT_NO_CXX11_UNICODE_LITERALS +#if _MSC_FULL_VER < 190023026 +# define SPROUT_NO_CXX11_NOEXCEPT +# define SPROUT_NO_CXX11_USER_DEFINED_LITERALS +# define SPROUT_NO_CXX11_UNICODE_LITERALS +#endif #define SPROUT_NO_CXX11_ATTRIBUTES -#define SPROUT_NO_CXX14_CONSTEXPR -#define SPROUT_NO_CXX14_VARIABLE_TEMPLATES +#if !defined(__cpp_constexpr) || (__cpp_constexpr < 201304) +# define SPROUT_NO_CXX14_CONSTEXPR +#endif +#if !defined(__cpp_variable_templates) || (__cpp_variable_templates < 201304) +# define SPROUT_NO_CXX14_VARIABLE_TEMPLATES +#endif #endif // #ifndef SPROUT_CONFIG_COMPILER_VISUALC_HPP