No more including of cxx_universal.h

The `cxx_universal.h` exists to provide symbols that sqlite_orm depends on everywhere. It is easy to forget to include it. And more importantly there are decision macros used that need to be defined before certain files anyway, which is the reason that `cxx_universal.h` gets included by the files used for amalgamation. Hence I decided to not include it anymore.
fnc12 · Jul 20, 2024 · 2927b2b · 2927b2b
1 parent f388350
commit 2927b2b
Show file tree

Hide file tree

Showing 31 changed files with 0 additions and 96 deletions.
diff --git a/dev/column_result.h b/dev/column_result.h
@@ -3,7 +3,6 @@
 #include <type_traits>  //  std::enable_if, std::is_same, std::decay, std::is_arithmetic, std::is_base_of
 #include <functional>  //  std::reference_wrapper
 
-#include "functional/cxx_universal.h"  //  ::nullptr_t
 #include "functional/cxx_type_traits_polyfill.h"
 #include "functional/mpl.h"
 #include "tuple_helper/tuple_traits.h"

diff --git a/dev/constraints.h b/dev/constraints.h
@@ -6,7 +6,6 @@
 #include <string>  //  std::string
 #include <tuple>  //  std::tuple
 
-#include "functional/cxx_universal.h"
 #include "functional/cxx_type_traits_polyfill.h"
 #include "functional/mpl.h"
 #include "tuple_helper/same_or_void.h"

diff --git a/dev/cte_column_names_collector.h b/dev/cte_column_names_collector.h
@@ -7,7 +7,6 @@
 #include <system_error>
 #endif
 
-#include "functional/cxx_universal.h"
 #include "functional/cxx_type_traits_polyfill.h"
 #include "type_traits.h"
 #include "member_traits/member_traits.h"

diff --git a/dev/cte_storage.h b/dev/cte_storage.h
@@ -7,7 +7,6 @@
 #include <vector>
 #endif
 
-#include "functional/cxx_universal.h"  //  ::size_t
 #include "tuple_helper/tuple_fy.h"
 #include "table_type_of.h"
 #include "column_result.h"

diff --git a/dev/expression.h b/dev/expression.h
@@ -5,7 +5,6 @@
 #include <utility>  //  std::move, std::forward, std::declval
 #include "functional/cxx_optional.h"
 
-#include "functional/cxx_universal.h"  //  ::nullptr_t
 #include "functional/cxx_type_traits_polyfill.h"
 #include "tags.h"
 #include "operators.h"

diff --git a/dev/field_printer.h b/dev/field_printer.h
@@ -10,7 +10,6 @@
 #endif
 #include "functional/cxx_optional.h"
 
-#include "functional/cxx_universal.h"  //  ::nullptr_t
 #include "functional/cxx_type_traits_polyfill.h"
 #include "is_std_ptr.h"
 #include "type_traits.h"

diff --git a/dev/function.h b/dev/function.h
@@ -8,7 +8,6 @@
 #include <algorithm>  //  std::min, std::copy_n
 #include <utility>  //  std::move, std::forward
 
-#include "functional/cxx_universal.h"  //  ::size_t, ::nullptr_t
 #include "functional/cxx_type_traits_polyfill.h"
 #include "functional/cstring_literal.h"
 #include "functional/function_traits.h"

diff --git a/dev/functional/cstring_literal.h b/dev/functional/cstring_literal.h
@@ -5,8 +5,6 @@
 #include <algorithm>  //  std::copy_n
 #endif
 
-#include "cxx_universal.h"  //  ::size_t
-
 #ifdef SQLITE_ORM_WITH_CPP20_ALIASES
 namespace sqlite_orm::internal {
     /*

diff --git a/dev/functional/cxx_tuple_polyfill.h b/dev/functional/cxx_tuple_polyfill.h
@@ -5,7 +5,6 @@
 #include <utility>  //  std::forward, std::index_sequence, std::make_index_sequence
 #endif
 
-#include "../functional/cxx_universal.h"  //  ::size_t
 #include "../functional/cxx_functional_polyfill.h"  //  std::invoke
 
 namespace sqlite_orm {

diff --git a/dev/functional/cxx_type_traits_polyfill.h b/dev/functional/cxx_type_traits_polyfill.h
@@ -1,7 +1,6 @@
 #pragma once
 #include <type_traits>
 
-#include "cxx_universal.h"
 #include "mpl/conditional.h"
 
 namespace sqlite_orm {

diff --git a/dev/functional/index_sequence_util.h b/dev/functional/index_sequence_util.h
@@ -2,8 +2,6 @@
 
 #include <utility>  //  std::index_sequence
 
-#include "../functional/cxx_universal.h"  //  ::size_t
-
 namespace sqlite_orm {
     namespace internal {
 #if defined(SQLITE_ORM_PACK_INDEXING_SUPPORTED)

diff --git a/dev/functional/mpl.h b/dev/functional/mpl.h
@@ -35,7 +35,6 @@
 #include <array>
 #endif
 
-#include "cxx_universal.h"  //  ::size_t
 #include "cxx_type_traits_polyfill.h"
 #include "mpl/conditional.h"
 

diff --git a/dev/get_prepared_statement.h b/dev/get_prepared_statement.h
@@ -3,7 +3,6 @@
 #include <type_traits>  //  std::is_same, std::remove_reference, std::remove_cvref
 #include <tuple>  //  std::get
 
-#include "functional/cxx_universal.h"  //  ::size_t
 #include "functional/cxx_type_traits_polyfill.h"
 #include "functional/static_magic.h"
 #include "type_traits.h"

diff --git a/dev/implementations/table_definitions.h b/dev/implementations/table_definitions.h
@@ -8,7 +8,6 @@
 #include <utility>  //  std::move
 #include <algorithm>  //  std::find_if, std::ranges::find
 
-#include "../functional/cxx_universal.h"  //  ::size_t
 #include "../type_printer.h"
 #include "../schema/column.h"
 #include "../schema/table.h"

diff --git a/dev/mapped_iterator.h b/dev/mapped_iterator.h
@@ -7,7 +7,6 @@
 #include <system_error>  //  std::system_error
 #include <functional>  //  std::bind
 
-#include "functional/cxx_universal.h"  //  ::ptrdiff_t
 #include "statement_finalizer.h"
 #include "error_code.h"
 #include "object_from_column_builder.h"

diff --git a/dev/result_set_iterator.h b/dev/result_set_iterator.h
@@ -5,7 +5,6 @@
 #include <iterator>  //  std::input_iterator_tag, std::default_sentinel_t
 #include <functional>  //  std::reference_wrapper
 
-#include "functional/cxx_universal.h"  //  ::ptrdiff_t
 #include "statement_finalizer.h"
 #include "row_extractor.h"
 #include "column_result_proxy.h"

diff --git a/dev/row_extractor.h b/dev/row_extractor.h
@@ -18,7 +18,6 @@
 #include <concepts>
 #endif
 
-#include "functional/cxx_universal.h"  // ::nullptr_t, ::size_t
 #include "functional/cxx_functional_polyfill.h"
 #include "functional/static_magic.h"
 #include "tuple_helper/tuple_transformer.h"

diff --git a/dev/schema/table.h b/dev/schema/table.h
@@ -6,7 +6,6 @@
 #include <tuple>  //  std::tuple_element
 #include <utility>  //  std::forward, std::move
 
-#include "../functional/cxx_universal.h"  //  ::size_t
 #include "../functional/cxx_type_traits_polyfill.h"
 #include "../functional/cxx_functional_polyfill.h"
 #include "../functional/static_magic.h"

diff --git a/dev/select_constraints.h b/dev/select_constraints.h
@@ -9,7 +9,6 @@
 #include <tuple>  //  std::tuple, std::get, std::tuple_size
 #include "functional/cxx_optional.h"
 
-#include "functional/cxx_universal.h"  //  ::size_t
 #include "functional/cxx_type_traits_polyfill.h"
 #include "is_base_of_template.h"
 #include "tuple_helper/tuple_traits.h"

diff --git a/dev/serializing_util.h b/dev/serializing_util.h
@@ -7,7 +7,6 @@
 #include <ostream>
 #include <utility>  //  std::exchange, std::tuple_size, std::make_index_sequence
 
-#include "functional/cxx_universal.h"  //  ::size_t
 #include "functional/cxx_type_traits_polyfill.h"
 #include "functional/cxx_functional_polyfill.h"
 #include "tuple_helper/tuple_iteration.h"

diff --git a/dev/statement_binder.h b/dev/statement_binder.h
@@ -15,7 +15,6 @@
 #include <codecvt>  //  std::codecvt_utf8_utf16
 #endif
 
-#include "functional/cxx_universal.h"
 #include "functional/cxx_type_traits_polyfill.h"
 #include "functional/cxx_functional_polyfill.h"
 #include "is_std_ptr.h"

diff --git a/dev/statement_serializer.h b/dev/statement_serializer.h
@@ -14,7 +14,6 @@
 #include "functional/cxx_string_view.h"
 #include "functional/cxx_optional.h"
 
-#include "functional/cxx_universal.h"  // ::nullptr_t, ::size_t
 #include "functional/cxx_functional_polyfill.h"
 #include "functional/mpl.h"
 #include "tuple_helper/tuple_filter.h"

diff --git a/dev/storage.h b/dev/storage.h
@@ -15,7 +15,6 @@
 #include <algorithm>  //  std::for_each, std::ranges::for_each
 #include "functional/cxx_optional.h"
 
-#include "functional/cxx_universal.h"
 #include "functional/cxx_functional_polyfill.h"
 #include "functional/static_magic.h"
 #include "functional/mpl.h"

diff --git a/dev/storage_base.h b/dev/storage_base.h
@@ -15,7 +15,6 @@
 #include <type_traits>  //  std::is_same
 #include <algorithm>  //  std::find_if, std::ranges::find
 
-#include "functional/cxx_universal.h"  //  ::size_t
 #include "functional/cxx_tuple_polyfill.h"  //  std::apply
 #include "tuple_helper/tuple_iteration.h"
 #include "pragma.h"

diff --git a/dev/storage_impl.h b/dev/storage_impl.h
@@ -2,7 +2,6 @@
 
 #include <string>  //  std::string
 
-#include "functional/cxx_universal.h"  //  ::size_t
 #include "functional/static_magic.h"
 #include "functional/index_sequence_util.h"
 #include "tuple_helper/tuple_traits.h"

diff --git a/dev/storage_lookup.h b/dev/storage_lookup.h
@@ -4,7 +4,6 @@
 #include <tuple>
 #include <utility>  //  std::index_sequence, std::make_index_sequence
 
-#include "functional/cxx_universal.h"  //  ::size_t
 #include "functional/cxx_type_traits_polyfill.h"
 #include "type_traits.h"
 

diff --git a/dev/tuple_helper/tuple_filter.h b/dev/tuple_helper/tuple_filter.h
@@ -3,7 +3,6 @@
 #include <type_traits>  //  std::integral_constant, std::index_sequence, std::conditional, std::declval
 #include <tuple>  //  std::tuple, std::tuple_cat, std::tuple_element
 
-#include "../functional/cxx_universal.h"  //  ::size_t
 #include "../functional/mpl/conditional.h"
 #include "../functional/index_sequence_util.h"
 

diff --git a/dev/tuple_helper/tuple_iteration.h b/dev/tuple_helper/tuple_iteration.h
@@ -4,8 +4,6 @@
 #include <type_traits>  //  std::index_sequence, std::make_index_sequence
 #include <utility>  //  std::forward, std::move
 
-#include "../functional/cxx_universal.h"  //  ::size_t
-
 namespace sqlite_orm {
     namespace internal {
 #if defined(SQLITE_ORM_FOLD_EXPRESSIONS_SUPPORTED) && defined(SQLITE_ORM_IF_CONSTEXPR_SUPPORTED)

diff --git a/dev/tuple_helper/tuple_transformer.h b/dev/tuple_helper/tuple_transformer.h
@@ -3,7 +3,6 @@
 #include <type_traits>  //  std::remove_reference, std::common_type, std::index_sequence, std::make_index_sequence, std::forward, std::move, std::integral_constant, std::declval
 #include <tuple>  //  std::tuple_size, std::get
 
-#include "../functional/cxx_universal.h"  //  ::size_t
 #include "../functional/cxx_type_traits_polyfill.h"
 #include "../functional/cxx_functional_polyfill.h"
 #include "../functional/mpl.h"

diff --git a/dev/values_to_tuple.h b/dev/values_to_tuple.h
@@ -4,7 +4,6 @@
 #include <type_traits>  //  std::enable_if, std::is_same, std::index_sequence, std::make_index_sequence
 #include <tuple>  //  std::tuple, std::tuple_size, std::tuple_element
 
-#include "functional/cxx_universal.h"  //  ::size_t
 #include "functional/cxx_functional_polyfill.h"
 #include "type_traits.h"
 #include "row_extractor.h"