From 574f4a9664a1c599d7c1e59f4d94563012e8604e Mon Sep 17 00:00:00 2001 From: Sam Twidale Date: Mon, 9 Jan 2017 18:38:19 +0000 Subject: [PATCH] Add double stringize trick so _MSC_FULL_VER macro gets expanded This fixes CHAISCRIPT_COMPILER_VERSION, so it gets the compiler version number instead of the string "_MSC_FULL_VER". This means, for example, build ids read like msvc-190023918-Debug, not msvc-_MSC_FULL_VER-Debug. --- include/chaiscript/chaiscript_defines.hpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/chaiscript/chaiscript_defines.hpp b/include/chaiscript/chaiscript_defines.hpp index 0a76a82..7e01699 100644 --- a/include/chaiscript/chaiscript_defines.hpp +++ b/include/chaiscript/chaiscript_defines.hpp @@ -9,7 +9,8 @@ #ifdef _MSC_VER #define CHAISCRIPT_STRINGIZE(x) "" #x -#define CHAISCRIPT_COMPILER_VERSION CHAISCRIPT_STRINGIZE(_MSC_FULL_VER) +#define CHAISCRIPT_STRINGIZE_EXPANDED(x) CHAISCRIPT_STRINGIZE(x) +#define CHAISCRIPT_COMPILER_VERSION CHAISCRIPT_STRINGIZE_EXPANDED(_MSC_FULL_VER) #define CHAISCRIPT_MSVC _MSC_VER #define CHAISCRIPT_HAS_DECLSPEC