Moved central C++ features to universal header file

aquarist-labs · May 11, 2022 · e3e853e · e3e853e
1 parent 4db1414
commit e3e853e
Show file tree

Hide file tree

Showing 47 changed files with 219 additions and 179 deletions.
diff --git a/dev/ast/group_by.h b/dev/ast/group_by.h
@@ -4,7 +4,7 @@
 #include <type_traits>  //  std::true_type, std::false_type
 #include <utility>  //  std::forward, std::move
 
-#include "../cxx_polyfill.h"
+#include "../functional/cxx_polyfill.h"
 
 namespace sqlite_orm {
     namespace internal {

diff --git a/dev/ast/into.h b/dev/ast/into.h
@@ -1,8 +1,6 @@
 #pragma once
 
-#include <type_traits>  //  std::true_type, std::false_type
-
-#include "../cxx_polyfill.h"
+#include "../functional/cxx_polyfill.h"
 
 namespace sqlite_orm {
     namespace internal {

diff --git a/dev/ast/upsert_clause.h b/dev/ast/upsert_clause.h
@@ -4,7 +4,7 @@
 #include <type_traits>  //  std::false_type, std::true_type
 #include <utility>  //  std::forward, std::move
 
-#include "../cxx_polyfill.h"
+#include "../functional/cxx_polyfill.h"
 
 namespace sqlite_orm {
     namespace internal {

diff --git a/dev/ast/where.h b/dev/ast/where.h
@@ -3,8 +3,8 @@
 #include <type_traits>  //  std::false_type, std::true_type
 #include <utility>  //  std::move
 
-#include "../start_macros.h"
-#include "../cxx_polyfill.h"
+#include "../functional/cxx_universal.h"
+#include "../functional/cxx_polyfill.h"
 #include "../serialize_result_type.h"
 
 namespace sqlite_orm {

diff --git a/dev/carray.h b/dev/carray.h
@@ -10,7 +10,7 @@
 #include <type_traits>  //  std::integral_constant
 #include <utility>  //  std::move
 
-#include "start_macros.h"
+#include "functional/cxx_universal.h"
 #include "pointer_value.h"
 
 namespace sqlite_orm {

diff --git a/dev/column.h b/dev/column.h
@@ -5,8 +5,8 @@
 #include <memory>  //  std::unique_ptr
 #include <type_traits>  //  std::true_type, std::false_type, std::is_same, std::enable_if, std::decay
 
-#include "start_macros.h"
-#include "cxx_polyfill.h"
+#include "functional/cxx_universal.h"
+#include "functional/cxx_polyfill.h"
 #include "type_traits.h"
 #include "type_is_nullable.h"
 #include "tuple_helper/tuple_helper.h"

diff --git a/dev/column_result.h b/dev/column_result.h
@@ -4,6 +4,7 @@
 #include <tuple>  //  std::tuple
 #include <functional>  //  std::reference_wrapper
 
+#include "functional/cxx_universal.h"
 #include "type_traits.h"
 #include "member_traits/member_traits.h"
 #include "core_functions.h"
@@ -90,8 +91,8 @@ namespace sqlite_orm {
         };
 
         template<class St>
-        struct column_result_t<St, std::nullptr_t, void> {
-            using type = std::nullptr_t;
+        struct column_result_t<St, nullptr_t, void> {
+            using type = nullptr_t;
         };
 
         template<class St>

diff --git a/dev/conditions.h b/dev/conditions.h
@@ -6,8 +6,8 @@
 #include <tuple>  //  std::tuple, std::tuple_size
 #include <sstream>  //  std::stringstream
 
-#include "start_macros.h"
-#include "cxx_polyfill.h"
+#include "functional/cxx_universal.h"
+#include "functional/cxx_polyfill.h"
 #include "type_traits.h"
 #include "collate_argument.h"
 #include "constraints.h"

diff --git a/dev/constraints.h b/dev/constraints.h
@@ -6,8 +6,8 @@
 #include <tuple>  //  std::tuple, std::make_tuple
 #include <type_traits>  //  std::is_base_of, std::false_type, std::true_type
 
-#include "start_macros.h"
-#include "cxx_polyfill.h"
+#include "functional/cxx_universal.h"
+#include "functional/cxx_polyfill.h"
 #include "collate_argument.h"
 #include "error_code.h"
 #include "table_type.h"

diff --git a/dev/core_functions.h b/dev/core_functions.h
@@ -6,7 +6,7 @@
 #include <memory>  //  std::unique_ptr
 #include <vector>  //  std::vector
 
-#include "cxx_polyfill.h"
+#include "functional/cxx_polyfill.h"
 #include "conditions.h"
 #include "is_base_of_template.h"
 #include "tuple_helper/tuple_filter.h"

diff --git a/dev/expression.h b/dev/expression.h
@@ -1,3 +1,12 @@
+#pragma once
+
+#include <tuple>
+#include <utility>  //  std::move, std::forward
+#ifdef SQLITE_ORM_OPTIONAL_SUPPORTED
+#include <optional>
+#endif
+
+#include "functional/cxx_universal.h"
 #include "operators.h"
 
 namespace sqlite_orm {
@@ -24,7 +33,7 @@ namespace sqlite_orm {
                 return {this->value, std::move(r)};
             }
 
-            assign_t<T, std::nullptr_t> operator=(std::nullptr_t) const {
+            assign_t<T, nullptr_t> operator=(nullptr_t) const {
                 return {this->value, nullptr};
             }
 #ifdef SQLITE_ORM_OPTIONAL_SUPPORTED

diff --git a/dev/field_printer.h b/dev/field_printer.h
@@ -4,7 +4,6 @@
 #include <string>  //  std::string
 #include <sstream>  //  std::stringstream
 #include <vector>  //  std::vector
-#include <cstddef>  //  std::nullptr_t
 #include <memory>  //  std::shared_ptr, std::unique_ptr
 #ifdef SQLITE_ORM_OPTIONAL_SUPPORTED
 #include <optional>  // std::optional
@@ -13,8 +12,8 @@
 #include <codecvt>  //  std::codecvt_utf8_utf16
 #endif  //  SQLITE_ORM_OMITS_CODECVT
 
-#include "start_macros.h"
-#include "cxx_polyfill.h"
+#include "functional/cxx_universal.h"
+#include "functional/cxx_polyfill.h"
 #include "is_std_ptr.h"
 
 namespace sqlite_orm {
@@ -113,8 +112,8 @@ namespace sqlite_orm {
     };
 #endif  //  SQLITE_ORM_OMITS_CODECVT
     template<>
-    struct field_printer<std::nullptr_t, void> {
-        std::string operator()(const std::nullptr_t&) const {
+    struct field_printer<nullptr_t, void> {
+        std::string operator()(const nullptr_t&) const {
             return "null";
         }
     };
@@ -137,7 +136,7 @@ namespace sqlite_orm {
             if(t) {
                 return field_printer<unqualified_type>()(*t);
             } else {
-                return field_printer<std::nullptr_t>{}(nullptr);
+                return field_printer<nullptr_t>{}(nullptr);
             }
         }
     };

diff --git a/dev/function.h b/dev/function.h
@@ -6,10 +6,10 @@
 #include <tuple>  //  std::tuple
 #include <functional>  //  std::function
 #include <algorithm>  //  std::min
-#include <cstddef>
+#include <utility>  //  std::move, std::forward
 
-#include "start_macros.h"
-#include "cxx_polyfill.h"
+#include "functional/cxx_universal.h"
+#include "functional/cxx_polyfill.h"
 
 namespace sqlite_orm {
 
@@ -159,7 +159,7 @@ namespace sqlite_orm {
 
         // Always allow binding nullptr to a pointer argument
         template<size_t I, class PointerArg>
-        constexpr bool is_same_pvt_v<I, PointerArg, std::nullptr_t, polyfill::void_t<typename PointerArg::tag>> = true;
+        constexpr bool is_same_pvt_v<I, PointerArg, nullptr_t, polyfill::void_t<typename PointerArg::tag>> = true;
 
 #if __cplusplus >= 201703L  // using C++17 or higher
         template<size_t I, const char *PointerArg, const char *Binding>

diff --git a/dev/cxx_compiler_quirks.h → dev/functional/cxx_compiler_quirks.h b/dev/cxx_compiler_quirks.h → dev/functional/cxx_compiler_quirks.h
diff --git a/dev/cxx_core_features.h → dev/functional/cxx_core_features.h b/dev/cxx_core_features.h → dev/functional/cxx_core_features.h
diff --git a/dev/cxx_functional_polyfill.h → dev/functional/cxx_functional_polyfill.h b/dev/cxx_functional_polyfill.h → dev/functional/cxx_functional_polyfill.h
diff --git a/dev/cxx_polyfill.h → dev/functional/cxx_polyfill.h b/dev/cxx_polyfill.h → dev/functional/cxx_polyfill.h
@@ -2,7 +2,7 @@
 
 #include <type_traits>
 
-#include "start_macros.h"
+#include "functional/cxx_universal.h"
 
 namespace sqlite_orm {
     namespace internal {

diff --git a/dev/functional/cxx_universal.h b/dev/functional/cxx_universal.h
@@ -0,0 +1,20 @@
+#pragma once
+
+/*
+ *  This header makes central C++ functionality on which sqlite_orm depends universally available:
+ *  - alternative operator representations
+ *  - ::size_t, ::ptrdiff_t, ::nullptr_t
+ *  - C++ core feature macros
+ *  - macros for dealing with compiler quirks
+ */
+
+#include <iso646.h>  //  alternative operator representations
+#include <cstddef>  //  sqlite_orm is using size_t, ptrdiff_t, nullptr_t everywhere, pull it in early
+
+// earlier clang versions didn't make nullptr_t available in the global namespace via stddef.h,
+// though it should have according to C++ documentation (see https://en.cppreference.com/w/cpp/types/nullptr_t#Notes).
+// actually it should be available when including stddef.h
+using std::nullptr_t;
+
+#include "cxx_core_features.h"
+#include "cxx_compiler_quirks.h"
diff --git a/dev/index.h b/dev/index.h
@@ -4,7 +4,7 @@
 #include <string>  //  std::string
 #include <utility>  //  std::forward
 
-#include "start_macros.h"
+#include "functional/cxx_universal.h"
 #include "tuple_helper/tuple_filter.h"
 #include "indexed_column.h"
 

diff --git a/dev/indexed_column.h b/dev/indexed_column.h
@@ -3,7 +3,7 @@
 #include <string>  //  std::string
 #include <utility>  //  std::move
 
-#include "start_macros.h"
+#include "functional/cxx_universal.h"
 #include "ast/where.h"
 
 namespace sqlite_orm {

diff --git a/dev/iterator.h b/dev/iterator.h
@@ -4,10 +4,10 @@
 #include <memory>  //  std::shared_ptr, std::unique_ptr, std::make_shared
 #include <type_traits>  //  std::decay
 #include <utility>  //  std::move
-#include <cstddef>  //  std::ptrdiff_t
 #include <iterator>  //  std::input_iterator_tag
 #include <system_error>  //  std::system_error
 
+#include "functional/cxx_universal.h"
 #include "row_extractor.h"
 #include "statement_finalizer.h"
 #include "error_code.h"
@@ -49,7 +49,7 @@ namespace sqlite_orm {
             }
 
           public:
-            using difference_type = std::ptrdiff_t;
+            using difference_type = ptrdiff_t;
             using pointer = value_type*;
             using reference = value_type&;
             using iterator_category = std::input_iterator_tag;

diff --git a/dev/member_traits/member_traits.h b/dev/member_traits/member_traits.h
@@ -2,8 +2,8 @@
 
 #include <type_traits>  //  std::enable_if, std::is_function, std::true_type, std::false_type
 
-#include "../start_macros.h"
-#include "../cxx_polyfill.h"
+#include "../functional/cxx_universal.h"
+#include "../functional/cxx_polyfill.h"
 
 namespace sqlite_orm {
     namespace internal {

diff --git a/dev/pointer_value.h b/dev/pointer_value.h
@@ -4,7 +4,7 @@
 #include <memory>
 #include <utility>
 
-#include "start_macros.h"
+#include "functional/cxx_universal.h"
 #include "xdestroy_handling.h"
 
 namespace sqlite_orm {

diff --git a/dev/prepared_statement.h b/dev/prepared_statement.h
@@ -6,8 +6,8 @@
 #include <type_traits>  //  std::true_type, std::false_type
 #include <utility>  //  std::pair
 
-#include "start_macros.h"
-#include "cxx_polyfill.h"
+#include "functional/cxx_universal.h"
+#include "functional/cxx_polyfill.h"
 #include "tuple_helper/tuple_filter.h"
 #include "connection_holder.h"
 #include "select_constraints.h"

diff --git a/dev/row_extractor.h b/dev/row_extractor.h
@@ -15,6 +15,7 @@
 #include <iterator>  //  std::back_inserter
 #include <tuple>  //  std::tuple, std::tuple_size, std::tuple_element
 
+#include "functional/cxx_universal.h"
 #include "arithmetic_tag.h"
 #include "pointer_value.h"
 #include "journal_mode.h"
@@ -256,16 +257,16 @@ namespace sqlite_orm {
 #endif  //  SQLITE_ORM_OPTIONAL_SUPPORTED
 
     template<>
-    struct row_extractor<std::nullptr_t> {
-        std::nullptr_t extract(const char* /*row_value*/) const {
+    struct row_extractor<nullptr_t> {
+        nullptr_t extract(const char* /*row_value*/) const {
             return nullptr;
         }
 
-        std::nullptr_t extract(sqlite3_stmt* /*stmt*/, int /*columnIndex*/) const {
+        nullptr_t extract(sqlite3_stmt* /*stmt*/, int /*columnIndex*/) const {
             return nullptr;
         }
 
-        std::nullptr_t extract(sqlite3_value* /*value*/) const {
+        nullptr_t extract(sqlite3_value* /*value*/) const {
             return nullptr;
         }
     };

diff --git a/dev/row_extractor_builder.h b/dev/row_extractor_builder.h
@@ -1,7 +1,6 @@
 #pragma once
 
-#include <cstddef>  //  std::nullptr_t
-
+#include "functional/cxx_universal.h"
 #include "row_extractor.h"
 #include "mapped_row_extractor.h"
 
@@ -10,7 +9,7 @@ namespace sqlite_orm {
     namespace internal {
 
         template<class T>
-        row_extractor<T> make_row_extractor(std::nullptr_t) {
+        row_extractor<T> make_row_extractor(nullptr_t) {
             return {};
         }
 

diff --git a/dev/select_constraints.h b/dev/select_constraints.h
@@ -7,8 +7,8 @@
 #include <optional>  // std::optional
 #endif  // SQLITE_ORM_OPTIONAL_SUPPORTED
 
-#include "start_macros.h"
-#include "cxx_polyfill.h"
+#include "functional/cxx_universal.h"
+#include "functional/cxx_polyfill.h"
 #include "is_base_of_template.h"
 #include "tuple_helper/tuple_filter.h"
 #include "optional_container.h"

diff --git a/dev/serializing_util.h b/dev/serializing_util.h
@@ -11,8 +11,8 @@
 #include <algorithm>  //  std::find
 #endif
 
-#include "start_macros.h"
-#include "cxx_polyfill.h"
+#include "functional/cxx_universal.h"
+#include "functional/cxx_polyfill.h"
 #include "error_code.h"
 #include "serializer_context.h"
 #include "util.h"

diff --git a/dev/start_macros.h b/dev/start_macros.h
@@ -6,9 +6,3 @@ __pragma(push_macro("min"))
 __pragma(push_macro("max"))
 #undef max
 #endif  // defined(_MSC_VER)
-
-#include <iso646.h>  //  alternative operator representations
-#include <stddef.h>  //  sqlite_orm is using size_t, ptrdiff_t everywhere, pull it in early
-
-#include "cxx_core_features.h"
-#include "cxx_compiler_quirks.h"