From 71244e07debc956afc833a65b565bf563a83d8f5 Mon Sep 17 00:00:00 2001
From: Victor Zverovich <viz@meta.com>
Date: Sun, 16 Jun 2024 11:10:38 -0700
Subject: [PATCH] Cleanup includes

---
 include/fmt/std.h | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/include/fmt/std.h b/include/fmt/std.h
index 09f3d322..6114e70c 100644
--- a/include/fmt/std.h
+++ b/include/fmt/std.h
@@ -24,7 +24,7 @@
 #  include <utility>
 #  include <vector>
 
-// Checking FMT_CPLUSPLUS for warning suppression in MSVC.
+// CHeck FMT_CPLUSPLUS to suppress a bogus warning in MSVC.
 #  if FMT_CPLUSPLUS >= 201703L
 #    if FMT_HAS_INCLUDE(<filesystem>)
 #      include <filesystem>
@@ -35,15 +35,13 @@
 #    if FMT_HAS_INCLUDE(<optional>)
 #      include <optional>
 #    endif
+#    if FMT_HAS_INCLUDE(<source_location>)
+#      include <source_location>
+#    endif
 #  endif
-
-#  if FMT_HAS_INCLUDE(<expected>) && FMT_CPLUSPLUS > 202002L
+#  if FMT_CPLUSPLUS > 202002L && FMT_HAS_INCLUDE(<expected>)
 #    include <expected>
 #  endif
-
-#  if FMT_CPLUSPLUS > 201703L && FMT_HAS_INCLUDE(<source_location>)
-#    include <source_location>
-#  endif
 #endif  // FMT_MODULE
 
 #if FMT_HAS_INCLUDE(<version>)