3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-29 11:41:36 +08:00
Code Issues Projects Releases Wiki Activity

STRINGIFY: use __VA_ARGS__ to avoid C4003 and double quote hack

Browse Source
This commit is contained in:
Alexander Karatarakis 2017-02-17 21:53:14 -08:00
parent 43eb772d94
commit 128ba92fee
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
toolsrc/src/commands_version.cpp
View File

@ -3,10 +3,10 @@
#include "vcpkg_System.h" #include "vcpkg_System.h"
#include "metrics.h" #include "metrics.h"
#define STRINGIFY(X) #X #define STRINGIFY(...) #__VA_ARGS__
#define MACRO_TO_STRING(X) STRINGIFY(X) #define MACRO_TO_STRING(X) STRINGIFY(X)
#define VCPKG_VERSION_AS_STRING MACRO_TO_STRING(VCPKG_VERSION)"" // Double quotes needed at the end to prevent blank token #define VCPKG_VERSION_AS_STRING MACRO_TO_STRING(VCPKG_VERSION)
namespace vcpkg::Commands::Version namespace vcpkg::Commands::Version
{ {
@ -15,12 +15,7 @@ namespace vcpkg::Commands::Version
static const std::string s_version = static const std::string s_version =
#include "../VERSION.txt" #include "../VERSION.txt"
#pragma warning( push )
#pragma warning( disable : 4003)
// VCPKG_VERSION can be defined but have no value, which yields C4003.
+ std::string(VCPKG_VERSION_AS_STRING) + std::string(VCPKG_VERSION_AS_STRING)
#pragma warning( pop )
#ifndef NDEBUG #ifndef NDEBUG
+ std::string("-debug") + std::string("-debug")
#endif #endif