From 7158c2689907789aa440f006b9e901177a5b1aca Mon Sep 17 00:00:00 2001 From: cyy Date: Sun, 29 Jun 2025 09:28:37 +0800 Subject: [PATCH] More robust check --- include/flatbuffers/stl_emulation.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/include/flatbuffers/stl_emulation.h b/include/flatbuffers/stl_emulation.h index 67c6768cbf2..fc8e4b1d13f 100644 --- a/include/flatbuffers/stl_emulation.h +++ b/include/flatbuffers/stl_emulation.h @@ -47,7 +47,9 @@ // See: https://en.cppreference.com/w/cpp/utility/feature_test #if defined(__cplusplus) && __cplusplus >= 202002L \ || (defined(_MSVC_LANG) && _MSVC_LANG >= 202002L) - #define FLATBUFFERS_USE_STD_SPAN 1 + #if __has_include() + #define FLATBUFFERS_USE_STD_SPAN 1 + #endif #endif #endif // FLATBUFFERS_USE_STD_SPAN @@ -321,7 +323,7 @@ namespace internal { SpanIterator(pointer ptr) : ptr_(ptr) {} reference operator*() const { return *ptr_; } pointer operator->() { return ptr_; } - SpanIterator& operator++() { ptr_++; return *this; } + SpanIterator& operator++() { ptr_++; return *this; } SpanIterator operator++(int) { auto tmp = *this; ++(*this); return tmp; } friend bool operator== (const SpanIterator& lhs, const SpanIterator& rhs) { return lhs.ptr_ == rhs.ptr_; }