explicitly protect against double declaration of std::span as not all…

… systems use __cpp_lib_span (e.g. Mac uses __CPP_LIB_SPAN)
wlav · Nov 13, 2023 · 4205d5e · 4205d5e
1 parent 79f4e2a
commit 4205d5e
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/cling/src/core/foundation/inc/ROOT/span.hxx b/cling/src/core/foundation/inc/ROOT/span.hxx
@@ -17,10 +17,11 @@
 #if __cplusplus >= 202002
 # if __has_include(<span>)
 #  include <span>
+#  define CPPYY_SPAN_INCLUDED 1
 # endif
 #endif
 
-#if !defined(__cpp_lib_span)
+#if !defined(CPPYY_SPAN_INCLUDED)
 
 // Necessary to compile in c++11 mode
 #if __cplusplus >= 201402L