From c0dd0a3041a5fa122f56723df482db17f21a2b14 Mon Sep 17 00:00:00 2001 From: Jason Turner Date: Sat, 2 May 2015 15:27:51 -0600 Subject: [PATCH] Use static const true/false on platforms with magic statics --- include/chaiscript/chaiscript_defines.hpp | 4 ++++ include/chaiscript/dispatchkit/boxed_value.hpp | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/include/chaiscript/chaiscript_defines.hpp b/include/chaiscript/chaiscript_defines.hpp index 38952e5..92f590c 100644 --- a/include/chaiscript/chaiscript_defines.hpp +++ b/include/chaiscript/chaiscript_defines.hpp @@ -15,6 +15,10 @@ #endif #endif +#ifndef CHAISCRIPT_MSVC_12 +#define CHAISCRIPT_HAS_MAGIC_STATICS +#endif + #include #if defined( _LIBCPP_VERSION ) diff --git a/include/chaiscript/dispatchkit/boxed_value.hpp b/include/chaiscript/dispatchkit/boxed_value.hpp index 87d1054..a6d9c5b 100644 --- a/include/chaiscript/dispatchkit/boxed_value.hpp +++ b/include/chaiscript/dispatchkit/boxed_value.hpp @@ -409,6 +409,7 @@ namespace chaiscript return detail::const_var_impl(t); } +#ifdef CHAISCRIPT_HAS_MAGIC_STATICS inline Boxed_Value const_var(bool b) { static auto t = detail::const_var_impl(true); static auto f = detail::const_var_impl(false); @@ -419,7 +420,7 @@ namespace chaiscript return f; } } - +#endif }