Removed conditional code [skip ci]

Author: ankane

include/pgvector/halfvec.hpp

@@ -8,13 +8,10 @@
 
 #include <cstddef>
 #include <ostream>
+#include <span>
 #include <utility>
 #include <vector>
 
-#if __cplusplus >= 202002L
-#include <span>
-#endif
-
 namespace pgvector {
 /// A half vector.
 class HalfVector {
@@ -42,13 +39,11 @@ class HalfVector {
         value_ = std::vector<float>{value, value + n};
     }
 
-#if __cplusplus >= 202002L
     /// Creates a half vector from a span.
     // TODO add explicit in 0.3.0
     HalfVector(std::span<const float> value) {
         value_ = std::vector<float>(value.begin(), value.end());
     }
-#endif
 
     /// Returns the number of dimensions.
     size_t dimensions() const {

include/pgvector/sparsevec.hpp

@@ -9,14 +9,11 @@
 #include <algorithm>
 #include <cstddef>
 #include <ostream>
+#include <span>
 #include <stdexcept>
 #include <unordered_map>
 #include <vector>
 
-#if __cplusplus >= 202002L
-#include <span>
-#endif
-
 namespace pgvector {
 /// A sparse vector.
 class SparseVector {
@@ -48,7 +45,6 @@ class SparseVector {
         }
     }
 
-#if __cplusplus >= 202002L
     /// Creates a sparse vector from a span.
     // TODO add explicit in 0.3.0
     SparseVector(std::span<const float> value) {
@@ -61,7 +57,6 @@ class SparseVector {
             }
         }
     }
-#endif
 
     /// Creates a sparse vector from a map of non-zero elements.
     SparseVector(const std::unordered_map<int, float>& map, int dimensions) {

include/pgvector/vector.hpp

@@ -8,13 +8,10 @@
 
 #include <cstddef>
 #include <ostream>
+#include <span>
 #include <utility>
 #include <vector>
 
-#if __cplusplus >= 202002L
-#include <span>
-#endif
-
 namespace pgvector {
 /// A vector.
 class Vector {
@@ -42,13 +39,11 @@ class Vector {
         value_ = std::vector<float>{value, value + n};
     }
 
-#if __cplusplus >= 202002L
     /// Creates a vector from a span.
     // TODO add explicit in 0.3.0
     Vector(std::span<const float> value) {
         value_ = std::vector<float>(value.begin(), value.end());
     }
-#endif
 
     /// Returns the number of dimensions.
     size_t dimensions() const {

test/halfvec_test.cpp

@@ -1,28 +1,21 @@
 #include <cassert>
+#include <span>
 
 #include <pgvector/halfvec.hpp>
 
-#if __cplusplus >= 202002L
-#include <span>
-#endif
-
 using pgvector::HalfVector;
 
 static void test_constructor_vector() {
     auto vec = HalfVector({1, 2, 3});
     assert(vec.dimensions() == 3);
 }
 
-#if __cplusplus >= 202002L
 static void test_constructor_span() {
     auto vec = HalfVector(std::span<const float>({1, 2, 3}));
     assert(vec.dimensions() == 3);
 }
-#endif
 
 void test_halfvec() {
     test_constructor_vector();
-#if __cplusplus >= 202002L
     test_constructor_span();
-#endif
 }

test/sparsevec_test.cpp

@@ -1,12 +1,9 @@
 #include <cassert>
+#include <span>
 #include <unordered_map>
 
 #include <pgvector/sparsevec.hpp>
 
-#if __cplusplus >= 202002L
-#include <span>
-#endif
-
 using pgvector::SparseVector;
 
 static void test_constructor_vector() {
@@ -16,12 +13,10 @@ static void test_constructor_vector() {
     assert(vec.values() == (std::vector<float>{1, 2, 3}));
 }
 
-#if __cplusplus >= 202002L
 static void test_constructor_span() {
     auto vec = SparseVector(std::span<const float>({1, 0, 2, 0, 3, 0}));
     assert(vec.dimensions() == 6);
 }
-#endif
 
 static void test_constructor_map() {
     std::unordered_map<int, float> map = {{2, 2}, {4, 3}, {3, 0}, {0, 1}};
@@ -33,8 +28,6 @@ static void test_constructor_map() {
 
 void test_sparsevec() {
     test_constructor_vector();
-#if __cplusplus >= 202002L
     test_constructor_span();
-#endif
     test_constructor_map();
 }

test/vector_test.cpp

@@ -1,28 +1,21 @@
 #include <cassert>
+#include <span>
 
 #include <pgvector/vector.hpp>
 
-#if __cplusplus >= 202002L
-#include <span>
-#endif
-
 using pgvector::Vector;
 
 static void test_constructor_vector() {
     auto vec = Vector({1, 2, 3});
     assert(vec.dimensions() == 3);
 }
 
-#if __cplusplus >= 202002L
 static void test_constructor_span() {
     auto vec = Vector(std::span<const float>({1, 2, 3}));
     assert(vec.dimensions() == 3);
 }
-#endif
 
 void test_vector() {
     test_constructor_vector();
-#if __cplusplus >= 202002L
     test_constructor_span();
-#endif
 }