add commented out macro definitions back in.

CLIUtils · Jan 1, 2025 · e43ff02 · e43ff02
1 parent e0511aa
commit e43ff02
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 14 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -49,12 +49,9 @@ jobs:
         Linux14PC:
           vmImage: "ubuntu-latest"
           cli11.precompile: ON
-        macOS-15_26:
-          vmImage: "macOS-15"
-          cli11.std: 23
         macOS-15_23:
           vmImage: "macOS-15"
-          cli11.std: 26
+          cli11.std: 23
         macOS-14_20:
           vmImage: "macOS-14"
           cli11.std: 20

diff --git a/include/CLI/Macros.hpp b/include/CLI/Macros.hpp
@@ -105,22 +105,22 @@
 #endif
 
 /** <codecvt> availability */
-// #if !defined(CLI11_CPP26) && !defined(CLI11_HAS_CODECVT)
+#if !defined(CLI11_CPP26) && !defined(CLI11_HAS_CODECVT)
 #if defined(__GNUC__) && !defined(__llvm__) && !defined(__INTEL_COMPILER) && __GNUC__ < 5
 #define CLI11_HAS_CODECVT 0
 #else
 #define CLI11_HAS_CODECVT 1
 #include <codecvt>
 #endif
-// #else
-// #if defined(CLI11_HAS_CODECVT)
-// #if CLI11_HAS_CODECVT > 0
-// #include <codecvt>
-// #endif
-// #else
-// #define CLI11_HAS_CODECVT 0
-// #endif
-// #endif
+#else
+#if defined(CLI11_HAS_CODECVT)
+#if CLI11_HAS_CODECVT > 0
+#include <codecvt>
+#endif
+#else
+#define CLI11_HAS_CODECVT 0
+#endif
+#endif
 
 /** disable deprecations */
 #if defined(__GNUC__)  // GCC or clang