I hate C++ versioning.

ThePhD · Apr 3, 2020 · 234a561 · 234a561
1 parent 4081576
commit 234a561
Show file tree

Hide file tree

Showing 7 changed files with 101 additions and 99 deletions.
diff --git a/benchmarks/CMakeLists.txt b/benchmarks/CMakeLists.txt
@@ -23,7 +23,7 @@ file(GLOB_RECURSE itsy.bitsy.benchmarks.sources CONFIGURE_DEPENDS source/**)
 add_executable(itsy.bitsy.benchmarks ${itsy.bitsy.benchmarks.sources})
 target_include_directories(itsy.bitsy.benchmarks PRIVATE 
 	include
-	../vendor/range-v3/include
+	../vendor/span-lite/include
 )
 target_link_libraries(itsy.bitsy.benchmarks PRIVATE
 	itsy::bitsy

diff --git a/benchmarks/results/fresh/sources.json b/benchmarks/results/fresh/sources.json
@@ -1,86 +1,86 @@
-{
-	"name": "bit",
-	"scale": {
-		"type": "relative",
-		"to": "base"
-	},
-	"categories": [
-		{
-			"name": "find",
-			"prefix": "find_",
-			"suffix": ""
-		},
-		{
-			"name": "count",
-			"prefix": "count_",
-			"suffix": ""
-		},
-		{
-			"name": "fill",
-			"prefix": "fill_",
-			"suffix": ""
-		},
-		{
-			"name": "copy",
-			"prefix": "copy_",
-			"suffix": ""
-		},
-		{
-			"name": "copy_n",
-			"prefix": "sized_copy_",
-			"suffix": ""
-		},
-		{
-			"name": "swap_ranges",
-			"prefix": "swap_ranges_",
-			"suffix": ""
-		},
-		{
-			"name": "rotate",
-			"prefix": "rotate_",
-			"suffix": ""
-		},
-		{
-			"name": "equal",
-			"prefix": "equal_",
-			"suffix": ""
-		}
-	],
-	"data_labels": [
-		{
-			"ascending": true,
-			"name": "real_time",
-			"format": "clock"
-		},
-		{
-			"ascending": true,
-			"name": "cpu_time",
-			"format": "clock"
-		}
-	],
-	"remove_suffixes": [
-		",",
-		"_"
-	],
-	"remove_prefixes": [
-		",",
-		"_"
-	],
-	"sources": [
-		{
-			"prefix": "libc++",
-			"file": "libc++.itsy.bitsy.benchmarks.json",
-			"required": false
-		},
-		{
-			"prefix": "libstdc++",
-			"file": "libstdc++.itsy.bitsy.benchmarks.json",
-			"required": false
-		},
-		{
-			"prefix": "vc++",
-			"file": "vc++.itsy.bitsy.benchmarks.json",
-			"required": false
-		}
-	]
-}
+{
+	"name": "bit",
+	"scale": {
+		"type": "relative",
+		"to": "base"
+	},
+	"categories": [
+		{
+			"name": "find",
+			"prefix": "find_",
+			"suffix": ""
+		},
+		{
+			"name": "count",
+			"prefix": "count_",
+			"suffix": ""
+		},
+		{
+			"name": "fill",
+			"prefix": "fill_",
+			"suffix": ""
+		},
+		{
+			"name": "copy",
+			"prefix": "copy_",
+			"suffix": ""
+		},
+		{
+			"name": "copy_n",
+			"prefix": "sized_copy_",
+			"suffix": ""
+		},
+		{
+			"name": "swap_ranges",
+			"prefix": "swap_ranges_",
+			"suffix": ""
+		},
+		{
+			"name": "rotate",
+			"prefix": "rotate_",
+			"suffix": ""
+		},
+		{
+			"name": "equal",
+			"prefix": "equal_",
+			"suffix": ""
+		}
+	],
+	"data_labels": [
+		{
+			"ascending": true,
+			"name": "real_time",
+			"format": "clock"
+		},
+		{
+			"ascending": true,
+			"name": "cpu_time",
+			"format": "clock"
+		}
+	],
+	"remove_suffixes": [
+		",",
+		"_"
+	],
+	"remove_prefixes": [
+		",",
+		"_"
+	],
+	"sources": [
+		{
+			"prefix": "libc++",
+			"file": "libc++.itsy.bitsy.benchmarks.json",
+			"required": false
+		},
+		{
+			"prefix": "libstdc++",
+			"file": "libstdc++.itsy.bitsy.benchmarks.json",
+			"required": false
+		},
+		{
+			"prefix": "vc++",
+			"file": "vc++.itsy.bitsy.benchmarks.json",
+			"required": false
+		}
+	]
+}
diff --git a/examples/include/span.hpp b/examples/include/span.hpp
@@ -15,7 +15,7 @@
 
 #include <itsy/bitsy.hpp>
 
-#if (defined(__has_include) && __has_include(<version>)) || (__cplusplus > 201709L)
+#if (defined(__has_include) && __has_include(<version>))
 #include <version>
 #endif
 

diff --git a/include/itsy/detail/bit_operations.hpp b/include/itsy/detail/bit_operations.hpp
@@ -13,10 +13,11 @@
 #ifndef ITSY_BITSY_DETAIL_BIT_OPERATIONS_HPP
 #define ITSY_BITSY_DETAIL_BIT_OPERATIONS_HPP 1
 
+#include <itsy/version.hpp>
+
 #include <itsy/detail/bit_detail.hpp>
 
 #include <climits>
-#include <version>
 #if defined(__cpp_lib_bitops)
 #include <bit>
 #endif // C++20 Bit Operations

diff --git a/include/itsy/detail/span.hpp b/include/itsy/detail/span.hpp
@@ -15,10 +15,6 @@
 
 #include <itsy/version.hpp>
 
-#if (defined(__has_include) && __has_include(<version>)) || (__cplusplus > 201709L)
-#include <version>
-#endif
-
 #if defined(__cpp_lib_span)
 
 #include <span>
@@ -28,22 +24,22 @@ namespace ITSY_BITSY_DETAIL_NAMESPACE
 	using ::std::span;
 }
 
-#elif defined(__has_include) && __has_include(<range/v3/view/span.hpp>)
+#elif (defined(__has_include) && __has_include(<nonstd/span.hpp>)) || (defined(ITSY_BITSY_USE_NONSTD_SPAN) && ITSY_BITSY_USE_NONSTD_SPAN != 0)
 
-#include <range/v3/view/span.hpp>
+#include <nonstd/span.hpp>
 
 namespace ITSY_BITSY_DETAIL_NAMESPACE
 {
-	using ::ranges::span;
+	using ::nonstd::span;
 }
 
-#elif (defined(__has_include) && __has_include(<nonstd/span.hpp>)) || (defined(ITSY_BITSY_USE_NONSTD_SPAN) && ITSY_BITSY_USE_NONSTD_SPAN != 0)
+#elif defined(__has_include) && __has_include(<range/v3/view/span.hpp>)
 
-#include <nonstd/span.hpp>
+#include <range/v3/view/span.hpp>
 
 namespace ITSY_BITSY_DETAIL_NAMESPACE
 {
-	using ::nonstd::span;
+	using ::ranges::span;
 }
 
 #else

diff --git a/include/itsy/version.hpp b/include/itsy/version.hpp
@@ -16,6 +16,10 @@
 #include <cstddef>
 #include <cstdint>
 
+#if (defined(__has_include) && __has_include(<version>))
+#include <version>
+#endif
+
 #define itsy_bitsy_bit_iterator 201908L
 #define itsy_bitsy_bit_view 201908L
 #define itsy_bitsy_dynamic_bit_set 201908L

diff --git a/tests/run_time/CMakeLists.txt b/tests/run_time/CMakeLists.txt
@@ -21,6 +21,7 @@ function (make_run_time_tests itsy_bitsy_target target_suffix)
 	)
 	target_include_directories(${test-target-name} PRIVATE 
 		../include
+		../../vendor/span-lite/include
 		../../vendor/range-v3/include
 		../../vendor/catch2/include
 	)