From a610379965680a8f9214d5f0db3a8e1bc20d4712 Mon Sep 17 00:00:00 2001
From: Peter Johnson <johnson.peter@gmail.com>
Date: Wed, 26 May 2021 23:14:04 -0700
Subject: [PATCH] [wpiutil] Avoid MSVC warning on span include (#3393)

---
 wpiutil/src/main/native/include/wpi/ArrayRef.h | 2 +-
 wpiutil/src/main/native/include/wpi/span.h     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/wpiutil/src/main/native/include/wpi/ArrayRef.h b/wpiutil/src/main/native/include/wpi/ArrayRef.h
index 3aa8e4179e..754d0d3403 100644
--- a/wpiutil/src/main/native/include/wpi/ArrayRef.h
+++ b/wpiutil/src/main/native/include/wpi/ArrayRef.h
@@ -25,7 +25,7 @@
 #include <optional>
 #include <type_traits>
 #include <vector>
-#if __has_include(<span>)
+#if __cplusplus >= 202002L && __has_include(<span>)
 #include <span>
 #endif
 
diff --git a/wpiutil/src/main/native/include/wpi/span.h b/wpiutil/src/main/native/include/wpi/span.h
index 479b98d9d2..cf71d79f80 100644
--- a/wpiutil/src/main/native/include/wpi/span.h
+++ b/wpiutil/src/main/native/include/wpi/span.h
@@ -17,7 +17,7 @@ http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2019/n4820.pdf
 #include <cstddef>
 #include <cstdint>
 #include <type_traits>
-#if __has_include(<span>)
+#if __cplusplus >= 202002L && __has_include(<span>)
 #include <span>
 #endif