From a6901a17e8e8a917aaf413e333d1ee7739216547 Mon Sep 17 00:00:00 2001
From: Yves Delley <delleyves@gmx.ch>
Date: Sat, 31 Dec 2022 14:07:33 +0100
Subject: [PATCH] double check MSVC fix

---
 src/core-fmt/include/units/bits/fmt_hacks.h | 29 ++++++---------------
 1 file changed, 8 insertions(+), 21 deletions(-)

diff --git a/src/core-fmt/include/units/bits/fmt_hacks.h b/src/core-fmt/include/units/bits/fmt_hacks.h
index 88eba520..5b24c6a7 100644
--- a/src/core-fmt/include/units/bits/fmt_hacks.h
+++ b/src/core-fmt/include/units/bits/fmt_hacks.h
@@ -46,31 +46,18 @@ UNITS_DIAGNOSTIC_POP
 #define UNITS_FMT_TO_ARG_ID(arg) static_cast<int>(arg)
 #define UNITS_FMT_FROM_ARG_ID(arg) static_cast<size_t>(arg)
 
-#if false
-
-// just reuse FMT_THROW - we're anyway only throwing from within string formatting code
-#if FMT_EXCEPTIONS && (FMT_MSC_VERSION || defined(__NVCC__))
-// work around FMT_THROW being defined without a fully qualified namespace
+// This re-uses code from fmt;
+#if FMT_EXCEPTIONS
+#if FMT_MSC_VERSION || defined(__NVCC__)
 #define UNITS_THROW(x) ::fmt::detail::do_throw(x)
 #else
-#define UNITS_THROW(x) FMT_THROW(x)
+#define UNITS_THROW(x) throw x
 #endif
-
 #else
-
-#  if FMT_EXCEPTIONS
-#    if FMT_MSC_VERSION || defined(__NVCC__)
-#      define UNITS_THROW(x) ::fmt::detail::do_throw(x)
-#    else
-#      define UNITS_THROW(x) throw x
-#    endif
-#  else
-#    define UNITS_THROW(x)               \
-      do {                             \
-        FMT_ASSERT(false, (x).what()); \
-      } while (false)
-#  endif
-
+#define UNITS_THROW(x)             \
+  do {                             \
+    FMT_ASSERT(false, (x).what()); \
+  } while (false)
 #endif
 
 #else