Prevent errors from nano-span's size checking

- Prefer use of range-v3 instead, even if they are noisy.
ThePhD · Aug 24, 2020 · 69b997e · 69b997e
1 parent f0818b7
commit 69b997e
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 20 deletions.
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -29,7 +29,8 @@ function (make_example example_source_name itsy_bitsy_target target_suffix)
 	endif()
 	target_compile_definitions(${example_target} PRIVATE
 		__STDC_WANT_LIB_EXT1__=1
-		ITSY_BITSY_USE_NONSTD_SPAN=1)
+		ITSY_BITSY_USE_RANGEV3_SPAN=1
+		ITSY_BITSY_USE_NONSTD_SPAN=0)
 	target_link_libraries(${example_target}
 		PRIVATE
 		${itsy_bitsy_target}
@@ -38,8 +39,8 @@ function (make_example example_source_name itsy_bitsy_target target_suffix)
 		include
 	)
 	target_include_directories(${example_target} SYSTEM PRIVATE
-		../vendor/span-lite/include/
-	)
+		../vendor/span-lite/include
+		../vendor/range-v3/include)
 	if (ITSY_BITSY_TESTS)
 		add_test(NAME ${example_target} COMMAND ${example_target})
 	endif()

diff --git a/include/itsy/detail/span.hpp b/include/itsy/detail/span.hpp
@@ -24,7 +24,7 @@ namespace ITSY_BITSY_SOURCE_NAMESPACE
 	using ::std::span;
 }
 
-#elif (defined(__has_include) && __has_include(<nonstd/span.hpp>)) || ITSY_BITSY_IS_ON(ITSY_BITSY_USE_NONSTD_SPAN_I_)
+#elif ITSY_BITSY_IS_ON(ITSY_BITSY_USE_NONSTD_SPAN_I_)
 
 #include <nonstd/span.hpp>
 
@@ -33,7 +33,7 @@ namespace ITSY_BITSY_SOURCE_NAMESPACE
 	using ::nonstd::span;
 }
 
-#elif defined(__has_include) && __has_include(<range/v3/view/span.hpp>)
+#elif ITSY_BITSY_IS_ON(ITSY_BITSY_USE_RANGEV3_SPAN_I_)
 
 #include <range/v3/view/span.hpp>
 

diff --git a/include/itsy/version.hpp b/include/itsy/version.hpp
@@ -95,16 +95,6 @@
 	#endif
 #endif
 
-#if defined(ITSY_BITSY_USE_NONSTD_SPAN)
-	#if ITSY_BITSY_USE_NONSTD_SPAN != 0
-		#define ITSY_BITSY_USE_NONSTD_SPAN_I_ ITSY_BITSY_ON
-	#else
-		#define ITSY_BITSY_USE_NONSTD_SPAN_I_ ITSY_BITSY_OFF
-	#endif
-#else
-	#define ITSY_BITSY_USE_NONSTD_SPAN_I_ ITSY_BITSY_DEFAULT_OFF
-#endif
-
 #if defined(ITSY_BITSY_NONPORTABLE_MSVC_INTRINSICS)
 	#if ITSY_BITSY_NONPORTABLE_MSVC_INTRINSICS != 0
 		#define ITSY_BITSY_NONPORTABLE_MSVC_INTRINSICS_I_ ITSY_BITSY_ON
@@ -165,6 +155,34 @@
 	#define ITSY_BITSY_STD_LIB_SPAN_I_ ITSY_BITSY_DEFAULT_OFF
 #endif
 
+#if defined(ITSY_BITSY_USE_RANGEV3_SPAN)
+	#if ITSY_BITSY_USE_RANGEV3_SPAN != 0
+		#define ITSY_BITSY_USE_RANGEV3_SPAN_I_ ITSY_BITSY_ON
+	#else
+		#define ITSY_BITSY_USE_RANGEV3_SPAN_I_ ITSY_BITSY_OFF
+	#endif
+#else
+	#if defined(__has_include) && __has_include(<range/v3/view/span.hpp>)
+		#define ITSY_BITSY_USE_RANGEV3_SPAN_I_ ITSY_BITSY_DEFAULT_ON
+	#else
+		#define ITSY_BITSY_USE_RANGEV3_SPAN_I_ ITSY_BITSY_DEFAULT_OFF
+	#endif
+#endif
+
+#if defined(ITSY_BITSY_USE_NONSTD_SPAN)
+	#if ITSY_BITSY_USE_NONSTD_SPAN != 0
+		#define ITSY_BITSY_USE_NONSTD_SPAN_I_ ITSY_BITSY_ON
+	#else
+		#define ITSY_BITSY_USE_NONSTD_SPAN_I_ ITSY_BITSY_OFF
+	#endif
+#else
+	#if defined(__has_include) && __has_include(<nonstd/span.hpp>)
+		#define ITSY_BITSY_USE_NONSTD_SPAN_I_ ITSY_BITSY_DEFAULT_ON
+	#else
+		#define ITSY_BITSY_USE_NONSTD_SPAN_I_ ITSY_BITSY_DEFAULT_OFF
+	#endif
+#endif
+
 // clang-format on
 
 namespace bitsy

diff --git a/tests/compile_failure/CMakeLists.txt b/tests/compile_failure/CMakeLists.txt
@@ -47,7 +47,8 @@ foreach (test_name ${itsy-bitsy-tests-fail-sources})
 		${CMAKE_DL_LIBS}
 	)
 	target_compile_definitions(${test-target} PRIVATE
-		ITSY_BITSY_USE_NONSTD_SPAN=1)
+		ITSY_BITSY_USE_RANGEV3_SPAN=1
+		ITSY_BITSY_USE_NONSTD_SPAN=0)
 	add_test(NAME ${test-target} COMMAND cmake --build . --target ${test-target}
 		WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 	set_tests_properties(${test-target}

diff --git a/tests/compile_time/CMakeLists.txt b/tests/compile_time/CMakeLists.txt
@@ -22,9 +22,10 @@ target_include_directories(itsy_bitsy.tests.compilation
 	PRIVATE
 	../include
 	../../vendor/span-lite/include
-)
+	../../vendor/range-v3/include)
 target_compile_definitions(itsy_bitsy.tests.compilation PRIVATE
-	ITSY_BITSY_USE_NONSTD_SPAN=1)
+	ITSY_BITSY_USE_RANGEV3_SPAN=1
+	ITSY_BITSY_USE_NONSTD_SPAN=0)
 if (MSVC)
 	target_compile_options(itsy_bitsy.tests.compilation
 		PRIVATE 

diff --git a/tests/run_time/CMakeLists.txt b/tests/run_time/CMakeLists.txt
@@ -31,7 +31,8 @@ function (make_run_time_tests itsy_bitsy_target target_suffix)
 		${CMAKE_DL_LIBS}
 	)
 	target_compile_definitions(${test-target-name} PRIVATE
-		ITSY_BITSY_USE_NONSTD_SPAN=1)
+		ITSY_BITSY_USE_RANGEV3_SPAN=1
+		ITSY_BITSY_USE_NONSTD_SPAN=0)
 	if (MSVC)
 		target_compile_options(${test-target-name} PRIVATE 
 			/std:c++17

diff --git a/vendor/range-v3 b/vendor/range-v3