Merge branch 'master' of github.com:mpusz/mp-units

mpusz · mpusz · commit eac1e2178993 · 2025-09-21T11:38:08.000+02:00
diff --git a/.devcontainer/check_all.sh b/.devcontainer/check_all.sh
@@ -57,31 +57,31 @@ echo "⚙️  Testing GCC configurations..."
 conan $1 . -pr gcc12   -c user.mp-units.build:all=True -o '&:cxx_modules=False' -o '&:import_std=False' -o '&:std_format=False' -o '&:contracts=gsl-lite' -s compiler.cppstd=20 -b missing
 conan $1 . -pr gcc13   -c user.mp-units.build:all=True -o '&:cxx_modules=False' -o '&:import_std=False' -o '&:std_format=True'  -o '&:contracts=none'     -s compiler.cppstd=23 -b missing
 conan $1 . -pr gcc14   -c user.mp-units.build:all=True -o '&:cxx_modules=False' -o '&:import_std=False' -o '&:std_format=False' -o '&:contracts=ms-gsl'   -s compiler.cppstd=23 -b missing
-# gcc-15.0.1 has bugs preventing mp-units from compiling
-# conan $1 . -pr gcc15   -c user.mp-units.build:all=True -o '&:cxx_modules=False' -o '&:import_std=False' -o '&:std_format=True'  -o '&:contracts=gsl-lite' -s compiler.cppstd=26 -b missing
+conan $1 . -pr gcc15   -c user.mp-units.build:all=True -o '&:cxx_modules=False' -o '&:import_std=False' -o '&:std_format=True'  -o '&:contracts=gsl-lite' -s compiler.cppstd=26 -b missing
 
 echo "⚙️  Testing Clang configurations..."
 conan $1 . -pr clang16 -c user.mp-units.build:all=True -o '&:cxx_modules=False' -o '&:import_std=False' -o '&:std_format=False' -o '&:contracts=gsl-lite' -s compiler.cppstd=20 -b missing
 conan $1 . -pr clang17 -c user.mp-units.build:all=True -o '&:cxx_modules=True'  -o '&:import_std=False' -o '&:std_format=True'  -o '&:contracts=ms-gsl'   -s compiler.cppstd=26 -b missing
 conan $1 . -pr clang18 -c user.mp-units.build:all=True -o '&:cxx_modules=True'  -o '&:import_std=True'  -o '&:std_format=True'  -o '&:contracts=none'     -s compiler.cppstd=26 -b missing
 # clang-19 will never compile mp-units due to https://github.com/llvm/llvm-project/pull/118288
 conan $1 . -pr clang20 -c user.mp-units.build:all=True -o '&:cxx_modules=True'  -o '&:import_std=True'  -o '&:std_format=True'  -o '&:contracts=none'     -s compiler.cppstd=26 -b missing
+conan $1 . -pr clang21 -c user.mp-units.build:all=True -o '&:cxx_modules=True'  -o '&:import_std=True'  -o '&:std_format=True'  -o '&:contracts=none'     -s compiler.cppstd=26 -b missing
 
 if [[ $run_debug ]]; then
   echo "🐛 Starting debug build configurations..."
   echo "⚙️  Testing GCC debug configurations..."
   conan $1 . -pr gcc12   -c user.mp-units.build:all=True -o '&:cxx_modules=False' -o '&:import_std=False' -o '&:std_format=False' -o '&:contracts=gsl-lite' -s compiler.cppstd=20 -b missing -s build_type=Debug
   conan $1 . -pr gcc13   -c user.mp-units.build:all=True -o '&:cxx_modules=False' -o '&:import_std=False' -o '&:std_format=True'  -o '&:contracts=none'     -s compiler.cppstd=23 -b missing -s build_type=Debug
   conan $1 . -pr gcc14   -c user.mp-units.build:all=True -o '&:cxx_modules=False' -o '&:import_std=False' -o '&:std_format=False' -o '&:contracts=ms-gsl'   -s compiler.cppstd=23 -b missing -s build_type=Debug
-  # gcc-15.0.1 has bugs preventing mp-units from compiling
-  # conan $1 . -pr gcc15   -c user.mp-units.build:all=True -o '&:cxx_modules=False' -o '&:import_std=False' -o '&:std_format=True'  -o '&:contracts=gsl-lite' -s compiler.cppstd=26 -b missing -s build_type=Debug
+  conan $1 . -pr gcc15   -c user.mp-units.build:all=True -o '&:cxx_modules=False' -o '&:import_std=False' -o '&:std_format=True'  -o '&:contracts=gsl-lite' -s compiler.cppstd=26 -b missing -s build_type=Debug
 
   echo "⚙️  Testing Clang debug configurations..."
   conan $1 . -pr clang16 -c user.mp-units.build:all=True -o '&:cxx_modules=False' -o '&:import_std=False' -o '&:std_format=False' -o '&:contracts=gsl-lite' -s compiler.cppstd=20 -b missing -s build_type=Debug
   conan $1 . -pr clang17 -c user.mp-units.build:all=True -o '&:cxx_modules=True'  -o '&:import_std=False' -o '&:std_format=True'  -o '&:contracts=ms-gsl'   -s compiler.cppstd=26 -b missing -s build_type=Debug
   conan $1 . -pr clang18 -c user.mp-units.build:all=True -o '&:cxx_modules=True'  -o '&:import_std=True'  -o '&:std_format=True'  -o '&:contracts=none'     -s compiler.cppstd=26 -b missing -s build_type=Debug
   # clang-19 will never compile mp-units due to https://github.com/llvm/llvm-project/pull/118288
   conan $1 . -pr clang20 -c user.mp-units.build:all=True -o '&:cxx_modules=True'  -o '&:import_std=True'  -o '&:std_format=True'  -o '&:contracts=none'     -s compiler.cppstd=26 -b missing -s build_type=Debug
+  conan $1 . -pr clang21 -c user.mp-units.build:all=True -o '&:cxx_modules=True'  -o '&:import_std=True'  -o '&:std_format=True'  -o '&:contracts=none'     -s compiler.cppstd=26 -b missing -s build_type=Debug
   echo "✅ Debug builds completed!"
 fi
 
diff --git a/src/core/include/mp-units/bits/fmt.h b/src/core/include/mp-units/bits/fmt.h
@@ -293,18 +293,24 @@ struct dynamic_spec_id_handler {
   {
     const int id = MP_UNITS_FMT_FROM_ARG_ID(ctx.next_arg_id());
     ref = fmt_arg_ref<Char>(id);
-#if MP_UNITS_USE_FMTLIB || __cpp_lib_format >= 202305L
+#if MP_UNITS_USE_FMTLIB
     ctx.check_dynamic_spec(id);
+#elif __cpp_lib_format >= 202305L
+    ctx.check_dynamic_spec_integral(MP_UNITS_FMT_TO_ARG_ID(id));
 #endif
   }
+
   constexpr void on_index(int id)
   {
     ref = fmt_arg_ref<Char>(id);
     ctx.check_arg_id(MP_UNITS_FMT_TO_ARG_ID(id));
-#if MP_UNITS_USE_FMTLIB || __cpp_lib_format >= 202305L
+#if MP_UNITS_USE_FMTLIB
     ctx.check_dynamic_spec(id);
+#elif __cpp_lib_format >= 202305L
+    ctx.check_dynamic_spec_integral(MP_UNITS_FMT_TO_ARG_ID(id));
 #endif
   }
+
 #if MP_UNITS_USE_FMTLIB
   constexpr void on_name([[maybe_unused]] std::basic_string_view<Char> id)
   {

Original file line number	Diff line number	Diff line change
`@@ -293,18 +293,24 @@ struct dynamic_spec_id_handler {`
`293`	`293`	`{`
`294`	`294`	`const int id = MP_UNITS_FMT_FROM_ARG_ID(ctx.next_arg_id());`
`295`	`295`	`ref = fmt_arg_ref<Char>(id);`
`296`		`-#if MP_UNITS_USE_FMTLIB \|\| __cpp_lib_format >= 202305L`
	`296`	`+#if MP_UNITS_USE_FMTLIB`
`297`	`297`	`ctx.check_dynamic_spec(id);`
	`298`	`+#elif __cpp_lib_format >= 202305L`
	`299`	`+ ctx.check_dynamic_spec_integral(MP_UNITS_FMT_TO_ARG_ID(id));`
`298`	`300`	`#endif`
`299`	`301`	`}`
	`302`	`+`
`300`	`303`	`constexpr void on_index(int id)`
`301`	`304`	`{`
`302`	`305`	`ref = fmt_arg_ref<Char>(id);`
`303`	`306`	`ctx.check_arg_id(MP_UNITS_FMT_TO_ARG_ID(id));`
`304`		`-#if MP_UNITS_USE_FMTLIB \|\| __cpp_lib_format >= 202305L`
	`307`	`+#if MP_UNITS_USE_FMTLIB`
`305`	`308`	`ctx.check_dynamic_spec(id);`
	`309`	`+#elif __cpp_lib_format >= 202305L`
	`310`	`+ ctx.check_dynamic_spec_integral(MP_UNITS_FMT_TO_ARG_ID(id));`
`306`	`311`	`#endif`
`307`	`312`	`}`
	`313`	`+`
`308`	`314`	`#if MP_UNITS_USE_FMTLIB`
`309`	`315`	`constexpr void on_name([[maybe_unused]] std::basic_string_view<Char> id)`
`310`	`316`	`{`