Skip to content

Commit 7ed817d

Browse files
Chess13234snicolet
authored andcommitted
Minor fixes for misc.cpp
Fixes conflict with tune.h STRINGIFY macro. No functional change
1 parent 6f10137 commit 7ed817d

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

src/misc.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -155,9 +155,9 @@ const string engine_info(bool to_uci) {
155155

156156
const std::string compiler_info() {
157157

158-
#define STRINGIFY2(x) #x
159-
#define STRINGIFY(x) STRINGIFY2(x)
160-
#define VER_STRING(major, minor, patch) STRINGIFY(major) "." STRINGIFY(minor) "." STRINGIFY(patch)
158+
#define stringify2(x) #x
159+
#define stringify(x) stringify2(x)
160+
#define make_version_string(major, minor, patch) stringify(major) "." stringify(minor) "." stringify(patch)
161161

162162
/// Predefined macros hell:
163163
///
@@ -171,20 +171,20 @@ const std::string compiler_info() {
171171

172172
#ifdef __clang__
173173
compiler += "clang++ ";
174-
compiler += VER_STRING(__clang_major__, __clang_minor__, __clang_patchlevel__);
174+
compiler += make_version_string(__clang_major__, __clang_minor__, __clang_patchlevel__);
175175
#elif __INTEL_COMPILER
176176
compiler += "Intel compiler ";
177177
compiler += "(version ";
178-
compiler += STRINGIFY(__INTEL_COMPILER) " update " STRINGIFY(__INTEL_COMPILER_UPDATE);
178+
compiler += stringify(__INTEL_COMPILER) " update " stringify(__INTEL_COMPILER_UPDATE);
179179
compiler += ")";
180180
#elif _MSC_VER
181181
compiler += "MSVC ";
182182
compiler += "(version ";
183-
compiler += STRINGIFY(_MSC_FULL_VER) "." STRINGIFY(_MSC_BUILD);
183+
compiler += stringify(_MSC_FULL_VER) "." stringify(_MSC_BUILD);
184184
compiler += ")";
185185
#elif __GNUC__
186186
compiler += "g++ (GNUC) ";
187-
compiler += VER_STRING(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__);
187+
compiler += make_version_string(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__);
188188
#else
189189
compiler += "Unknown compiler ";
190190
compiler += "(unknown version)";

0 commit comments

Comments
 (0)