aboutsummaryrefslogtreecommitdiff
path: root/build2/function.cxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2016-11-21 12:43:26 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2016-11-21 12:43:26 +0200
commit3e1c01bb5f46ddd08e73b599c482fdfc5abf77ab (patch)
tree9d9b3495ae17f2c15e0ab49c1ca27404bc1e7be9 /build2/function.cxx
parent7a528eab1561b0d0d4ec29f98355fe67025ea632 (diff)
Make types array in function machinery constexpr
Diffstat (limited to 'build2/function.cxx')
-rw-r--r--build2/function.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/build2/function.cxx b/build2/function.cxx
index ec70529..2f2db51 100644
--- a/build2/function.cxx
+++ b/build2/function.cxx
@@ -257,7 +257,11 @@ namespace build2
throw failed ();
}
+#if !defined(_MSC_VER) || _MSC_VER > 1900
+ constexpr const optional<const value_type*>* function_args<>::types;
+#else
const optional<const value_type*>* const function_args<>::types = nullptr;
+#endif
void function_family::entry::
insert (string n, function_overload f) const