✍ Fix up documentation for move of macro

documentation/source/api/encodings/literal.rst

@@ -35,7 +35,7 @@ The ``literal`` encoding handles C and C++ string literals (``"🐱"``) used at
 
 If the library cannot figure out the literal encoding, the code will typically error with a ``static_assert``, loudly, that it cannot use the functions on the type when you attempt to do anything with them because it may mangle whatever input or output you are expecting.
 
-If you know the encoding of literals for your project (you provide the command line switch, or similar), then you can define a :ref:`configuration macro named ZTD_TEXT_COMPILE_TIME_ENCODING_NAME <config-ZTD_TEXT_COMPILE_TIME_ENCODING_NAME>` to be a string literal of your type, such as ``"UTF-8"`` or ``"ISO-8859-1"``.
+If you know the encoding of literals for your project (you provide the command line switch, or similar), then you can define a :ref:`configuration macro named ZTD_CXX_COMPILE_TIME_ENCODING_NAME <config-ZTD_CXX_COMPILE_TIME_ENCODING_NAME>` to be a string literal of your type, such as ``"UTF-8"`` or ``"ISO-8859-1"``.
 
 If the library does not recognize the encoding and cannot transcode it properly, it will also loudly warn you that it does not understand the encoding of the literal (in which case, file an issue about it and we will add it to the list of acceptable literal encodings).
 

documentation/source/api/encodings/wide_literal.rst

@@ -35,7 +35,7 @@ The ``wide_literal`` encoding handles C and C++ wide string literals (``L"🐶"`
 
 If the library cannot figure out the wide literal encoding, the code will typically error with a ``static_assert``, loudly, that it cannot use the functions on the type when you attempt to do anything with them because it may mangle whatever input or output you are expecting.
 
-If you know the encoding of wide literals for your project (you provide the command line switch, or similar), then you can define a :ref:`configuration macro named ZTD_TEXT_COMPILE_TIME_WIDE_ENCODING_NAME <config-ZTD_TEXT_COMPILE_TIME_WIDE_ENCODING_NAME>` to be a string literal of your type, such as ``"UTF-16"`` or ``"EUC-TW"``.
+If you know the encoding of wide literals for your project (you provide the command line switch, or similar), then you can define a :ref:`configuration macro named ZTD_CXX_COMPILE_TIME_WIDE_ENCODING_NAME <config-ZTD_CXX_COMPILE_TIME_WIDE_ENCODING_NAME>` to be a string literal of your type, such as ``"UTF-16"`` or ``"EUC-TW"``.
 
 If the library does not recognize the encoding and cannot transcode it properly, it will also loudly warn you that it does not understand the encoding of the literal (in which case, file an issue about it and we will add it to the list of acceptable wide literal encodings).
 

documentation/source/config.rst

@@ -88,9 +88,9 @@ There are various configuration macros and CMake/build-time switches that will c
 	- Default: off.
 	- Not turned on by-default under any conditions.
 
-.. _config-ZTD_TEXT_COMPILE_TIME_ENCODING_NAME:
+.. _config-ZTD_CXX_COMPILE_TIME_ENCODING_NAME:
 
-- ``ZTD_TEXT_COMPILE_TIME_ENCODING_NAME``
+- ``ZTD_CXX_COMPILE_TIME_ENCODING_NAME``
 	- Gives the :doc:`ztd::text::literal encoding</api/encodings/literal>` a name that matches what the encoding of string literals (``"👍"``) are.
 	- Overrides any of library's heuristics and shenanigans to determine the string literal encoding.
 	- If this does not match the actual string literal encoding, it can cause |ub|.
@@ -106,9 +106,9 @@ There are various configuration macros and CMake/build-time switches that will c
 	- Not turned on by-default under any conditions.
 	- **Please don't use this unless you have some really, really weird setup that requires messing everything up...**
 
-.. _config-ZTD_TEXT_COMPILE_TIME_WIDE_ENCODING_NAME:
+.. _config-ZTD_CXX_COMPILE_TIME_WIDE_ENCODING_NAME:
 
-- ``ZTD_TEXT_COMPILE_TIME_WIDE_ENCODING_NAME``
+- ``ZTD_CXX_COMPILE_TIME_WIDE_ENCODING_NAME``
 	- Gives the :doc:`ztd::text::wide_literal encoding</api/encodings/wide_literal>` a name that matches what the encoding of wide string literals (``L"👍"``) are.
 	- Overrides any of library's heuristics and shenanigans to determine the wide string literal encoding.
 	- If this does not match the actual wide string literal encoding, it can cause |ub|.

examples/boost.text/CMakeLists.txt

@@ -38,7 +38,7 @@ file(GLOB ztd.text.examples.boost_text.sources source/*.cpp)
 add_executable(ztd.text.examples.boost_text ${ztd.text.examples.boost_text.sources})
 target_compile_definitions(ztd.text.examples.boost_text
 	PRIVATE
-	ZTD_TEXT_COMPILE_TIME_ENCODING_NAME="UTF-8"
+	ZTD_CXX_COMPILE_TIME_ENCODING_NAME="UTF-8"
 )
 target_compile_options(ztd.text.examples.boost_text
 	PRIVATE

include/ztd/text/literal.hpp

@@ -51,7 +51,7 @@ namespace ztd { namespace text {
 	ZTD_TEXT_INLINE_ABI_NAMESPACE_OPEN_I_
 
 	namespace __txt_detail {
-		inline constexpr __encoding_id __literal_id = __to_encoding_id(ZTD_TEXT_COMPILE_TIME_ENCODING_NAME_GET_I_());
+		inline constexpr __encoding_id __literal_id = __to_encoding_id(ZTD_CXX_COMPILE_TIME_ENCODING_NAME_GET_I_());
 		using __literal                             = decltype(__select_encoding<char, __literal_id>());
 	} // namespace __txt_detail
 
@@ -164,7 +164,7 @@ namespace ztd { namespace text {
 		template <typename _Input, typename _Output, typename _ErrorHandler>
 		constexpr auto decode_one(
 			_Input&& __input, _Output&& __output, _ErrorHandler&& __error_handler, decode_state& __state) const {
-#if ZTD_IS_OFF(ZTD_TEXT_COMPILE_TIME_ENCODING_NAME_I_) \
+#if ZTD_IS_OFF(ZTD_CXX_COMPILE_TIME_ENCODING_NAME_I_) \
      && ZTD_IS_OFF(ZTD_TEXT_YES_PLEASE_DESTROY_MY_LITERALS_UTTERLY_I_MEAN_IT_I_)
 			// Cry bitter tears, I guess?
 			static_assert(always_false_v<_Input>,
@@ -188,7 +188,7 @@ namespace ztd { namespace text {
 #endif
 #if ZTD_IS_OFF(ZTD_TEXT_YES_PLEASE_DESTROY_MY_LITERALS_UTTERLY_I_MEAN_IT_I_)
 			static_assert(always_true_v<_Input> && !is_specialization_of_v<__base_t, basic_no_encoding>,
-			"[[ Please read! ]] This text encoding (" ZTD_TEXT_COMPILE_TIME_ENCODING_NAME_DESCRIPTION_I_() "), while recognized, is not "
+			"[[ Please read! ]] This text encoding (" ZTD_CXX_COMPILE_TIME_ENCODING_NAME_DESCRIPTION_I_() "), while recognized, is not "
 			"supported because it hasn't yet been implemented! You can see all the encodings we have "
 			"support for in our documentation (https://ztdtext.rtfd.io/en/latest/encodings.html).\n\n"
 
@@ -224,7 +224,7 @@ namespace ztd { namespace text {
 		template <typename _Input, typename _Output, typename _ErrorHandler>
 		constexpr auto encode_one(
 			_Input&& __input, _Output&& __output, _ErrorHandler&& __error_handler, encode_state& __state) const {
-#if ZTD_IS_OFF(ZTD_TEXT_COMPILE_TIME_ENCODING_NAME_I_) \
+#if ZTD_IS_OFF(ZTD_CXX_COMPILE_TIME_ENCODING_NAME_I_) \
      && ZTD_IS_OFF(ZTD_TEXT_YES_PLEASE_DESTROY_MY_LITERALS_UTTERLY_I_MEAN_IT_I_)
 			// Cry bitter tears, I guess?
 			static_assert(always_false_v<_Input>,
@@ -248,7 +248,7 @@ namespace ztd { namespace text {
 #endif
 #if ZTD_IS_OFF(ZTD_TEXT_YES_PLEASE_DESTROY_MY_LITERALS_UTTERLY_I_MEAN_IT_I_)
 			static_assert(always_true_v<_Input> && !is_specialization_of_v<__base_t, basic_no_encoding>,
-			"[[ Please read! ]] This text encoding (" ZTD_TEXT_COMPILE_TIME_ENCODING_NAME_DESCRIPTION_I_() "), while recognized, is not "
+			"[[ Please read! ]] This text encoding (" ZTD_CXX_COMPILE_TIME_ENCODING_NAME_DESCRIPTION_I_() "), while recognized, is not "
 			"supported because it hasn't yet been implemented! You can see all the encodings we have "
 			"support for in our documentation (https://ztdtext.rtfd.io/en/latest/encodings.html).\n\n"
 

include/ztd/text/version.hpp

@@ -114,74 +114,6 @@
 
 #define ZTD_TEXT_INTERMEDIATE_TRANSCODE_BUFFER_SIZE_I_(...) (ZTD_TEXT_INTERMEDIATE_TRANSCODE_BUFFER_BYTE_SIZE_I_ / sizeof(__VA_ARGS__))
 
-#if defined(ZTD_TEXT_COMPILE_TIME_ENCODING_NAME)
-	#define ZTD_TEXT_COMPILE_TIME_ENCODING_NAME_GET_I_()         ZTD_TEXT_COMPILE_TIME_ENCODING_NAME
-	#define ZTD_TEXT_COMPILE_TIME_ENCODING_NAME_DESCRIPTION_I_() "set by the user with ZTD_TEXT_COMPILE_TIME_ENCODING_NAME as (" ZTD_TOKEN_TO_STRING_I_(ZTD_TEXT_COMPILE_TIME_ENCODING_NAME) ")"
-	#define ZTD_TEXT_COMPILE_TIME_ENCODING_NAME_I_               ZTD_DEFAULT_ON
-#elif ZTD_IS_ON(ZTD_STD_LIBRARY_TEXT_ENCODING_ID_I_)
-	#define ZTD_TEXT_COMPILE_TIME_ENCODING_NAME_GET_I_()         ::std::text_encoding::literal().name()
-	#define ZTD_TEXT_COMPILE_TIME_ENCODING_NAME_DESCRIPTION_I_() "from std::text_encoding::literal().name()"
-	#define ZTD_TEXT_COMPILE_TIME_ENCODING_NAME                  ZTD_DEFAULT_ON
-#elif defined(__MSC_EXECUTION_CHARSET_ID)
-	#define ZTD_TEXT_COMPILE_TIME_ENCODING_NAME_GET_I_()         ::ztd::text::__txt_detail::__msvc_encoding_name_from_id(__MSC_EXECUTION_CHARSET_ID)
-	#define ZTD_TEXT_COMPILE_TIME_ENCODING_NAME_DESCRIPTION_I_() "MSVC CodePage ID: " ZTD_TOKEN_TO_STRING_I_(__MSC_EXECUTION_CHARSET_ID)
-	#define ZTD_TEXT_COMPILE_TIME_ENCODING_NAME_I_               ZTD_DEFAULT_ON
-#elif defined(__GNUC_EXECUTION_CHARSET_NAME)
-	#define ZTD_TEXT_COMPILE_TIME_ENCODING_NAME_GET_I_()         __GNUC_EXECUTION_CHARSET_NAME
-	#define ZTD_TEXT_COMPILE_TIME_ENCODING_NAME_DESCRIPTION_I_() __GNUC_EXECUTION_CHARSET_NAME
-	#define ZTD_TEXT_COMPILE_TIME_ENCODING_NAME_I_               ZTD_DEFAULT_ON
-#elif defined(__clang_literal_encoding__)
-	#define ZTD_TEXT_COMPILE_TIME_ENCODING_NAME_GET_I_()         __clang_literal_encoding__
-	#define ZTD_TEXT_COMPILE_TIME_ENCODING_NAME_DESCRIPTION_I_() __clang_literal_encoding__
-	#define ZTD_TEXT_COMPILE_TIME_ENCODING_NAME_I_               ZTD_DEFAULT_ON
-#elif ZTD_IS_ON(ZTD_COMPILER_CLANG_I_)
-	#define ZTD_TEXT_COMPILE_TIME_ENCODING_NAME_GET_I_()         "UTF-8"
-	#define ZTD_TEXT_COMPILE_TIME_ENCODING_NAME_DESCRIPTION_I_() "UTF-8"
-	#define ZTD_TEXT_COMPILE_TIME_ENCODING_NAME_I_               ZTD_DEFAULT_ON
-#else
-	#define ZTD_TEXT_COMPILE_TIME_ENCODING_NAME_GET_I_()         "UTF-8"
-	#define ZTD_TEXT_COMPILE_TIME_ENCODING_NAME_DESCRIPTION_I_() "UTF-8"
-	#define ZTD_TEXT_COMPILE_TIME_ENCODING_NAME_I_               ZTD_DEFAULT_OFF
-#endif
-
-#if defined(ZTD_TEXT_COMPILE_TIME_WIDE_ENCODING_NAME)
-	#define ZTD_TEXT_COMPILE_TIME_WIDE_ENCODING_NAME_GET_I_()         ZTD_TEXT_COMPILE_TIME_WIDE_ENCODING_NAME
-	#define ZTD_TEXT_COMPILE_TIME_WIDE_ENCODING_NAME_DESCRIPTION_I_() "set by the user with ZTD_TEXT_COMPILE_TIME_ENCODING_NAME as (" ZTD_TOKEN_TO_STRING_I_(ZTD_TEXT_COMPILE_TIME_WIDE_ENCODING_NAME) ")"
-	#define ZTD_TEXT_COMPILE_TIME_WIDE_ENCODING_NAME_I_               ZTD_ON
-#elif ZTD_IS_ON(ZTD_STD_LIBRARY_TEXT_ENCODING_ID_I_)
-	#define ZTD_TEXT_COMPILE_TIME_WIDE_ENCODING_NAME_GET_I_()         ::std::text_encoding::wide_literal().name()
-	#define ZTD_TEXT_COMPILE_TIME_WIDE_ENCODING_NAME_DESCRIPTION_I_() "from ::std::text_encoding::wide_literal().name()"
-	#define ZTD_TEXT_COMPILE_TIME_WIDE_ENCODING_NAME_I_               ZTD_DEFAULT_ON
-#elif defined(__GNUC_WIDE_EXECUTION_CHARSET_NAME)
-	#define ZTD_TEXT_COMPILE_TIME_WIDE_ENCODING_NAME_GET_I_()         __GNUC_WIDE_EXECUTION_CHARSET_NAME
-	#define ZTD_TEXT_COMPILE_TIME_WIDE_ENCODING_NAME_DESCRIPTION_I_() ZTD_TEXT_COMPILE_TIME_WIDE_ENCODING_NAME_GET_I_()
-	#define ZTD_TEXT_COMPILE_TIME_WIDE_ENCODING_NAME_I_               ZTD_DEFAULT_ON
-#elif defined(__clang_wide_literal_encoding__)
-	#define ZTD_TEXT_COMPILE_TIME_WIDE_ENCODING_NAME_GET_I_()         __clang_wide_literal_encoding__
-	#define ZTD_TEXT_COMPILE_TIME_WIDE_ENCODING_NAME_DESCRIPTION_I_() ZTD_TEXT_COMPILE_TIME_WIDE_ENCODING_NAME_GET_I_()
-	#define ZTD_TEXT_COMPILE_TIME_WIDE_ENCODING_NAME_I_               ZTD_DEFAULT_ON
-#elif ZTD_IS_ON(ZTD_PLATFORM_WINDOWS_I_)
-	#define ZTD_TEXT_COMPILE_TIME_WIDE_ENCODING_NAME_GET_I_()         "UTF-16"
-	#define ZTD_TEXT_COMPILE_TIME_WIDE_ENCODING_NAME_DESCRIPTION_I_() "UTF-16"
-	#define ZTD_TEXT_COMPILE_TIME_WIDE_ENCODING_NAME_I_               ZTD_DEFAULT_ON
-#elif (WCHAR_MAX >= 0x001FFFFF) && ZTD_IS_ON(ZTD_WCHAR_T_UTF32_COMPATIBLE_I_)
-	#define ZTD_TEXT_COMPILE_TIME_WIDE_ENCODING_NAME_GET_I_()         "UTF-32"
-	#define ZTD_TEXT_COMPILE_TIME_WIDE_ENCODING_NAME_DESCRIPTION_I_() "UTF-32"
-	#define ZTD_TEXT_COMPILE_TIME_WIDE_ENCODING_NAME_I_               ZTD_DEFAULT_ON
-#elif (WCHAR_MAX >= 0x0000FFFF)
-	#define ZTD_TEXT_COMPILE_TIME_WIDE_ENCODING_NAME_GET_I_()         "UTF-16"
-	#define ZTD_TEXT_COMPILE_TIME_WIDE_ENCODING_NAME_DESCRIPTION_I_() "UTF-16"
-	#define ZTD_TEXT_COMPILE_TIME_WIDE_ENCODING_NAME_I_               ZTD_DEFAULT_ON
-#elif (WCHAR_MAX >= 0x000000FF)
-	#define ZTD_TEXT_COMPILE_TIME_WIDE_ENCODING_NAME_GET_I_()         "UTF-8"
-	#define ZTD_TEXT_COMPILE_TIME_WIDE_ENCODING_NAME_DESCRIPTION_I_() "UTF-8"
-	#define ZTD_TEXT_COMPILE_TIME_WIDE_ENCODING_NAME_I_               ZTD_DEFAULT_ON
-#else
-	#define ZTD_TEXT_COMPILE_TIME_WIDE_ENCODING_NAME_GET_I_()         "UTF-32"
-	#define ZTD_TEXT_COMPILE_TIME_WIDE_ENCODING_NAME_DESCRIPTION_I_() "UTF-32"
-	#define ZTD_TEXT_COMPILE_TIME_WIDE_ENCODING_NAME_I_               ZTD_DEFAULT_OFF
-#endif
-
 #if defined(ZTD_TEXT_YES_PLEASE_DESTROY_MY_LITERALS_UTTERLY_I_MEAN_IT)
 	#if (ZTD_TEXT_YES_PLEASE_DESTROY_MY_LITERALS_UTTERLY_I_MEAN_IT != 0)
 		#define ZTD_TEXT_YES_PLEASE_DESTROY_MY_LITERALS_UTTERLY_I_MEAN_IT_I_ ZTD_ON

include/ztd/text/wide_literal.hpp

@@ -57,7 +57,7 @@ namespace ztd { namespace text {
 
 	namespace __txt_detail {
 		inline constexpr __encoding_id __wide_literal_id
-			= __to_encoding_id(ZTD_TEXT_COMPILE_TIME_WIDE_ENCODING_NAME_GET_I_());
+			= __to_encoding_id(ZTD_CXX_COMPILE_TIME_WIDE_ENCODING_NAME_GET_I_());
 		using __wide_literal = decltype(__select_encoding<wchar_t, __wide_literal_id>());
 	} // namespace __txt_detail
 
@@ -170,7 +170,7 @@ namespace ztd { namespace text {
 		template <typename _Input, typename _Output, typename _ErrorHandler>
 		constexpr auto decode_one(
 			_Input&& __input, _Output&& __output, _ErrorHandler&& __error_handler, decode_state& __state) const {
-#if ZTD_IS_OFF(ZTD_TEXT_COMPILE_TIME_WIDE_ENCODING_NAME_I_) \
+#if ZTD_IS_OFF(ZTD_CXX_COMPILE_TIME_WIDE_ENCODING_NAME_I_) \
      && ZTD_IS_OFF(ZTD_TEXT_YES_PLEASE_DESTROY_MY_WIDE_LITERALS_UTTERLY_I_MEAN_IT_I_)
 			// Cry bitter tears, I guess?
 			static_assert(always_false_v<_Input>,
@@ -198,7 +198,7 @@ namespace ztd { namespace text {
 			static_assert(always_true_v<_Input>
 				&& !is_specialization_of_v<__base_t, basic_no_encoding>,
 			"[[ Please read! ]] This text encoding ("
-			ZTD_TEXT_COMPILE_TIME_WIDE_ENCODING_NAME_DESCRIPTION_I_() "), while recognized, is not "
+			ZTD_CXX_COMPILE_TIME_WIDE_ENCODING_NAME_DESCRIPTION_I_() "), while recognized, is not "
 			"supported because it hasn't yet been implemented! You can see all the encodings we have "
 			"support for in our documentation (https://ztdtext.rtfd.io/en/latest/encodings.html).\n\n"
 
@@ -234,7 +234,7 @@ namespace ztd { namespace text {
 		template <typename _Input, typename _Output, typename _ErrorHandler>
 		constexpr auto encode_one(
 			_Input&& __input, _Output&& __output, _ErrorHandler&& __error_handler, encode_state& __state) const {
-#if ZTD_IS_OFF(ZTD_TEXT_COMPILE_TIME_WIDE_ENCODING_NAME_I_) \
+#if ZTD_IS_OFF(ZTD_CXX_COMPILE_TIME_WIDE_ENCODING_NAME_I_) \
      && ZTD_IS_OFF(ZTD_TEXT_YES_PLEASE_DESTROY_MY_WIDE_LITERALS_UTTERLY_I_MEAN_IT_I_)
 			// Cry bitter tears, I guess?
 			static_assert(always_false_v<_Input>,
@@ -262,7 +262,7 @@ namespace ztd { namespace text {
 			static_assert(always_true_v<_Input>
 				&& !is_specialization_of_v<__base_t, basic_no_encoding>,
 			"[[ Please read! ]] This text encoding ("
-			ZTD_TEXT_COMPILE_TIME_WIDE_ENCODING_NAME_DESCRIPTION_I_() "), while recognized, is not "
+			ZTD_CXX_COMPILE_TIME_WIDE_ENCODING_NAME_DESCRIPTION_I_() "), while recognized, is not "
 			"supported because it hasn't yet been implemented! You can see all the encodings we have "
 			"support for in our documentation (https://ztdtext.rtfd.io/en/latest/encodings.html).\n\n"
 

tests/basic_compile_time/CMakeLists.txt

@@ -37,7 +37,7 @@ file(GLOB ztd.text.tests.basic_compile_time.sources
 add_executable(ztd.text.tests.basic_compile_time ${ztd.text.tests.basic_compile_time.sources})
 target_compile_definitions(ztd.text.tests.basic_compile_time
 	PRIVATE
-	ZTD_TEXT_COMPILE_TIME_ENCODING_NAME="UTF-8"
+	ZTD_CXX_COMPILE_TIME_ENCODING_NAME="UTF-8"
 )
 target_compile_options(ztd.text.tests.basic_compile_time
 	PRIVATE

tests/basic_compile_time/source/main.cpp

@@ -36,11 +36,11 @@ int main() {
 	std::cout << "=== Encoding Names ===" << std::endl;
 	std::cout << "Literal Encoding: "
 	          << ztd::text::__txt_detail::to_name(
-	                  ztd::text::__txt_detail::__to_encoding_id(ZTD_TEXT_COMPILE_TIME_ENCODING_NAME_GET_I_()))
+	                  ztd::text::__txt_detail::__to_encoding_id(ZTD_CXX_COMPILE_TIME_ENCODING_NAME_GET_I_()))
 	          << std::endl;
 	std::cout << "Wide Literal Encoding: "
 	          << ztd::text::__txt_detail::to_name(
-	                  ztd::text::__txt_detail::__to_encoding_id(ZTD_TEXT_COMPILE_TIME_WIDE_ENCODING_NAME_GET_I_()))
+	                  ztd::text::__txt_detail::__to_encoding_id(ZTD_CXX_COMPILE_TIME_WIDE_ENCODING_NAME_GET_I_()))
 	          << std::endl;
 	return 0;
 }

tests/basic_run_time/CMakeLists.txt

@@ -36,7 +36,7 @@ file(GLOB_RECURSE ztd.text.tests.basic_run_time.sources
 add_executable(ztd.text.tests.basic_run_time ${ztd.text.tests.basic_run_time.sources})
 target_compile_definitions(ztd.text.tests.basic_run_time
 	PRIVATE
-	ZTD_TEXT_COMPILE_TIME_ENCODING_NAME="UTF-8"
+	ZTD_CXX_COMPILE_TIME_ENCODING_NAME="UTF-8"
 )
 target_compile_options(ztd.text.tests.basic_run_time
 	PRIVATE

tests/basic_run_time/source/main.cpp

@@ -42,11 +42,11 @@ int main(int argc, char* argv[]) {
 	std::cout << "=== Encoding Names ===" << std::endl;
 	std::cout << "Literal Encoding: "
 	          << ztd::text::__txt_detail::to_name(
-	                  ztd::text::__txt_detail::__to_encoding_id(ZTD_TEXT_COMPILE_TIME_ENCODING_NAME_GET_I_()))
+	                  ztd::text::__txt_detail::__to_encoding_id(ZTD_CXX_COMPILE_TIME_ENCODING_NAME_GET_I_()))
 	          << std::endl;
 	std::cout << "Wide Literal Encoding: "
 	          << ztd::text::__txt_detail::to_name(
-	                  ztd::text::__txt_detail::__to_encoding_id(ZTD_TEXT_COMPILE_TIME_WIDE_ENCODING_NAME_GET_I_()))
+	                  ztd::text::__txt_detail::__to_encoding_id(ZTD_CXX_COMPILE_TIME_WIDE_ENCODING_NAME_GET_I_()))
 	          << std::endl;
 	int result = Catch::Session().run(argc, argv);
 	return result;

tests/shared/include/ztd/text/tests/basic_unicode_strings.hpp

@@ -52,11 +52,11 @@
 namespace ztd { namespace text { namespace tests {
 
 	inline constexpr bool wide_is_utf32 = ztd::text::__txt_detail::__is_encoding_name_equal(
-		ZTD_TEXT_COMPILE_TIME_WIDE_ENCODING_NAME_GET_I_(), "UTF-32");
+		ZTD_CXX_COMPILE_TIME_WIDE_ENCODING_NAME_GET_I_(), "UTF-32");
 	inline constexpr bool wide_is_utf16 = ztd::text::__txt_detail::__is_encoding_name_equal(
-		ZTD_TEXT_COMPILE_TIME_WIDE_ENCODING_NAME_GET_I_(), "UTF-16");
+		ZTD_CXX_COMPILE_TIME_WIDE_ENCODING_NAME_GET_I_(), "UTF-16");
 	inline constexpr bool wide_is_utf8 = ztd::text::__txt_detail::__is_encoding_name_equal(
-		ZTD_TEXT_COMPILE_TIME_WIDE_ENCODING_NAME_GET_I_(), "UTF-8");
+		ZTD_CXX_COMPILE_TIME_WIDE_ENCODING_NAME_GET_I_(), "UTF-8");
 
 	template <typename Container>
 	inline ztd::ranges::span<const std::byte> as_bytes(Container& c) {

tests/tiny_buffer/CMakeLists.txt

@@ -40,7 +40,7 @@ target_compile_definitions(ztd.text.tests.tiny_buffer
 	ZTD_TEXT_INTERMEDIATE_DECODE_BUFFER_BYTE_SIZE=64
 	ZTD_TEXT_INTERMEDIATE_ENCODE_BUFFER_BYTE_SIZE=64
 	ZTD_TEXT_INTERMEDIATE_TRANSCODE_BUFFER_BYTE_SIZE=64
-	ZTD_TEXT_COMPILE_TIME_ENCODING_NAME="UTF-8")
+	ZTD_CXX_COMPILE_TIME_ENCODING_NAME="UTF-8")
 target_compile_options(ztd.text.tests.tiny_buffer
 	PRIVATE
 	${--utf8-literal-encoding}

tests/tiny_buffer/source/main.cpp

@@ -42,11 +42,11 @@ int main(int argc, char* argv[]) {
 	std::cout << "=== Encoding Names ===" << std::endl;
 	std::cout << "Literal Encoding: "
 	          << ztd::text::__txt_detail::to_name(
-	                  ztd::text::__txt_detail::__to_encoding_id(ZTD_TEXT_COMPILE_TIME_ENCODING_NAME_GET_I_()))
+	                  ztd::text::__txt_detail::__to_encoding_id(ZTD_CXX_COMPILE_TIME_ENCODING_NAME_GET_I_()))
 	          << std::endl;
 	std::cout << "Wide Literal Encoding: "
 	          << ztd::text::__txt_detail::to_name(
-	                  ztd::text::__txt_detail::__to_encoding_id(ZTD_TEXT_COMPILE_TIME_WIDE_ENCODING_NAME_GET_I_()))
+	                  ztd::text::__txt_detail::__to_encoding_id(ZTD_CXX_COMPILE_TIME_WIDE_ENCODING_NAME_GET_I_()))
 	          << std::endl;
 	int result = Catch::Session().run(argc, argv);
 	return result;