From cc077a5e3b81c90f161fab38e21709b012f1d1f9 Mon Sep 17 00:00:00 2001
From: lukester1975 <lukester1975@users.noreply.github.com>
Date: Sun, 20 Aug 2023 18:21:50 +0100
Subject: [PATCH] Fix `FMT_NO_UNIQUE_ADDRESS` warning with clang-cl. (#3600)

See https://reviews.llvm.org/D110485 for info.
---
 include/fmt/format.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/fmt/format.h b/include/fmt/format.h
index 0b410a23..9b4f7357 100644
--- a/include/fmt/format.h
+++ b/include/fmt/format.h
@@ -83,7 +83,8 @@
 #  if FMT_CPLUSPLUS >= 202002L
 #    if FMT_HAS_CPP_ATTRIBUTE(no_unique_address)
 #      define FMT_NO_UNIQUE_ADDRESS [[no_unique_address]]
-#    elif FMT_MSC_VERSION >= 1929  // VS2019 v16.10 and later
+// VS2019 v16.10 and later except clang-cl (https://reviews.llvm.org/D110485)
+#    elif (FMT_MSC_VERSION >= 1929) && !FMT_CLANG_VERSION
 #      define FMT_NO_UNIQUE_ADDRESS [[msvc::no_unique_address]]
 #    endif
 #  endif