Unify stringification macros (#4405)

microsoft · Feb 27, 2024 · 9c63696 · 9c63696
1 parent b31e883
commit 9c63696
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/stl/inc/use_ansi.h b/stl/inc/use_ansi.h
@@ -35,7 +35,7 @@
 #define _LIB_STEM "libcpmt"
 
 #if _ITERATOR_DEBUG_LEVEL != _IDL_DEFAULT
-#define _IDL_AFFIX _STRINGIZE(_ITERATOR_DEBUG_LEVEL)
+#define _IDL_AFFIX _STL_STRINGIZE(_ITERATOR_DEBUG_LEVEL)
 #endif // _ITERATOR_DEBUG_LEVEL != _IDL_DEFAULT
 #endif // ^^^ !defined(_DLL) || defined(_STATIC_CPPLIB) ^^^
 

diff --git a/stl/inc/yvals.h b/stl/inc/yvals.h
@@ -142,7 +142,7 @@ _STL_DISABLE_CLANG_WARNINGS
 #endif // !defined(_ALLOW_MSC_VER_MISMATCH)
 
 #ifndef _ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH
-#pragma detect_mismatch("_ITERATOR_DEBUG_LEVEL", _STRINGIZE(_ITERATOR_DEBUG_LEVEL))
+#pragma detect_mismatch("_ITERATOR_DEBUG_LEVEL", _STL_STRINGIZE(_ITERATOR_DEBUG_LEVEL))
 #endif // !defined(_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH)
 
 #ifndef _ALLOW_RUNTIME_LIBRARY_MISMATCH

diff --git a/stl/inc/yvals_core.h b/stl/inc/yvals_core.h
@@ -19,11 +19,9 @@
 #if _STL_COMPILER_PREPROCESSOR
 
 // This does not use `_EMIT_STL_ERROR`, as it needs to be checked before we include anything else.
-// However, `_EMIT_STL_ERROR` has a dependency on `_CRT_STRINGIZE`, defined in `<vcruntime.h>`.
-// Here, we employ the same technique as `_CRT_STRINGIZE` in order to avoid needing to update the line number.
-#ifndef __cplusplus
 #define _STL_STRINGIZE_(S) #S
 #define _STL_STRINGIZE(S)  _STL_STRINGIZE_(S)
+#ifndef __cplusplus
 #pragma message(__FILE__ "(" _STL_STRINGIZE(__LINE__) "): STL1003: Unexpected compiler, expected C++ compiler.")
 #error Error in C++ Standard Library usage
 #endif // !defined(__cplusplus)
@@ -515,7 +513,7 @@
 #endif
 
 #define _STL_PRAGMA_MESSAGE(MESSAGE) _STL_PRAGMA(message(MESSAGE))
-#define _EMIT_STL_MESSAGE(MESSAGE)   _STL_PRAGMA_MESSAGE(__FILE__ "(" _CRT_STRINGIZE(__LINE__) "): " MESSAGE)
+#define _EMIT_STL_MESSAGE(MESSAGE)   _STL_PRAGMA_MESSAGE(__FILE__ "(" _STL_STRINGIZE(__LINE__) "): " MESSAGE)
 
 #define _EMIT_STL_WARNING(NUMBER, MESSAGE) _EMIT_STL_MESSAGE("warning " #NUMBER ": " MESSAGE)
 #define _EMIT_STL_ERROR(NUMBER, MESSAGE)   static_assert(false, "error " #NUMBER ": " MESSAGE)
@@ -1917,8 +1915,6 @@ compiler option, or define _ALLOW_RTCc_IN_STL to suppress this error.
 #endif // !defined(_ALLOW_RTCc_IN_STL)
 #endif // defined(_RTC_CONVERSION_CHECKS_ENABLED)
 
-#define _STRINGIZEX(x)  #x
-#define _STRINGIZE(x)   _STRINGIZEX(x)
 #define _EMPTY_ARGUMENT // for empty macro argument
 
 // extern "C++" attaches declarations to the global module, see N4964 [module.unit]/7.2.