From e55700b86bfdc3d41161d559f1ccbe99e9892d39 Mon Sep 17 00:00:00 2001 From: Jason Turner Date: Fri, 19 Sep 2014 21:52:18 -0600 Subject: [PATCH] Remove static in bind_first - VS12 warns on it --- include/chaiscript/dispatchkit/bind_first.hpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/include/chaiscript/dispatchkit/bind_first.hpp b/include/chaiscript/dispatchkit/bind_first.hpp index 83ff560..e29ffb0 100644 --- a/include/chaiscript/dispatchkit/bind_first.hpp +++ b/include/chaiscript/dispatchkit/bind_first.hpp @@ -16,9 +16,8 @@ namespace chaiscript struct Placeholder { - static const std::tuple& placeholder() { - static const std::tuple d(std::placeholders::_1,std::placeholders::_2,std::placeholders::_3,std::placeholders::_4,std::placeholders::_5,std::placeholders::_6,std::placeholders::_7,std::placeholders::_8,std::placeholders::_9,std::placeholders::_10); - return d; + CHAISCRIPT_CONSTEXPR static std::tuple placeholder() { + return std::tuple(std::placeholders::_1,std::placeholders::_2,std::placeholders::_3,std::placeholders::_4,std::placeholders::_5,std::placeholders::_6,std::placeholders::_7,std::placeholders::_8,std::placeholders::_9,std::placeholders::_10); }; };