Fixed all gcc cxx11 related bugsd

Author: Kaaserne

examples/chain.cpp

@@ -1,5 +1,7 @@
 #include <Lz/Lz.hpp>
 
+// TODO lz::as for cxx 11
+
 int main() {
     int arr[]{ 3, 2, 4, 5 };
     int arr2[]{ 3, 2, 5, 5 };

examples/chunk_if.cpp

@@ -1,6 +1,8 @@
 #include <Lz/chunk_if.hpp>
 #include <vector>
 
+// TODO lz::t_chunk_if cxx 11
+
 int main() {
 	std::string s = "hello world; this is a message;";
 	auto chunked = lz::chunk_if(s, [](const char c) { return c == ';'; });

examples/split.cpp

@@ -45,7 +45,7 @@ int main() {
 
     std::cout << "\n\nUsing other container types:\n";
     std::vector<int> to_split2 = { 1, 2, 3, 4, 5, 6, 7, 8, 9 };
-    auto to_split_on = { 5 };
+    std::array<int, 1> to_split_on = { 5 };
     // to_split_on must be by reference!
     const auto splitter3 = lz::split(to_split2, to_split_on);
     // Returns an iterable of iterables
@@ -112,7 +112,7 @@ int main() {
 
     std::cout << "\n\nUsing other container types:\n";
     std::vector<int> to_split2 = { 1, 2, 3, 4, 5, 6, 7, 8, 9 };
-    auto to_split_on = { 5 };
+    std::array<int, 1> to_split_on = { 5 };
     // to_split_on must be by reference!
     const auto splitter3 = lz::split(to_split2, to_split_on);
     // Returns an iterable of iterables

include/Lz/any_iterable.hpp

@@ -54,8 +54,8 @@ class any_iterable : public lazy_view {
      */
     template<LZ_CONCEPT_ITERABLE Iterable>
     any_iterable(Iterable&& iterable) :
-        _begin{ std::make_unique<any_iter_impl<Iterable>>(detail::begin(std::forward<Iterable>(iterable))) },
-        _end{ std::make_unique<any_iter_impl<Iterable>>(detail::end(std::forward<Iterable>(iterable))) } {
+        _begin{ detail::make_unique<any_iter_impl<Iterable>>(detail::begin(std::forward<Iterable>(iterable))) },
+        _end{ detail::make_unique<any_iter_impl<Iterable>>(detail::end(std::forward<Iterable>(iterable))) } {
     }
 
     LZ_NODISCARD it begin() const& {

include/Lz/basic_iterable.hpp

@@ -313,19 +313,19 @@ copy_to_container(Iterable&& iterable, Container& container) {
 
 template<class Container>
 struct container_constructor {
-    template<class Container, LZ_CONCEPT_ITERABLE Iterable, class... Args>
+    template<LZ_CONCEPT_ITERABLE Iterable, class... Args>
     using can_construct = std::is_constructible<Container, iter_t<Iterable>, sentinel_t<Iterable>, Args...>;
 
     template<LZ_CONCEPT_ITERABLE Iterable, class... Args>
-    LZ_NODISCARD constexpr enable_if<can_construct<Container, Iterable, Args...>::value, Container>
+    LZ_NODISCARD constexpr enable_if<can_construct<Iterable, Args...>::value, Container>
     construct(Iterable&& iterable, Args&&... args) const {
         return Container(detail::begin(std::forward<Iterable>(iterable)), detail::end(std::forward<Iterable>(iterable)),
                          std::forward<Args>(args)...);
     }
 
     template<LZ_CONCEPT_ITERABLE Iterable, class... Args>
     LZ_NODISCARD LZ_CONSTEXPR_CXX_20
-    enable_if<!can_construct<Container, Iterable, Args...>::value, Container>
+    enable_if<!can_construct<Iterable, Args...>::value, Container>
     construct(Iterable&& iterable, Args&&... args) const {
         Container container(std::forward<Args>(args)...);
         prealloc_container<Iterable, Container>{}.try_reserve(iterable, container);
@@ -525,9 +525,9 @@ LZ_MODULE_EXPORT_SCOPE_BEGIN
 
 #ifdef LZ_HAS_CXX_11
 
-static const detail::iterable_printer print{};
+constexpr detail::iterable_printer print{};
 
-static const detail::iterable_formatter format{};
+constexpr detail::iterable_formatter format{};
 
 #else
 

include/Lz/c_string.hpp

@@ -23,7 +23,7 @@ LZ_MODULE_EXPORT_SCOPE_BEGIN
  * auto cstr = str | lz::c_string;
  * ```
  */
-static constexpr detail::c_string_adaptor detail::c_string_adaptor::c_string{};
+constexpr detail::c_string_adaptor c_string{};
 
 #else
 

include/Lz/cached_size.hpp

@@ -47,7 +47,7 @@ namespace lz {
  *   - lz::zip
  * Are planning to call begin() or end() multiple times
  */
-static constexpr detail::cached_size_adaptor cache_size{};
+constexpr detail::cached_size_adaptor cache_size{};
 
 #else
 

include/Lz/cartesian_product.hpp

@@ -24,7 +24,7 @@ LZ_MODULE_EXPORT_SCOPE_BEGIN
  * auto product = a | lz::cartesian_product(b); // product = {{1, 3}, {1, 4}, {2, 3}, {2, 4}}
  * ```
  */
-static constexpr detail::cartesian_product_adaptor detail::cartesian_product_adaptor::cartesian_product{};
+ constexpr detail::cartesian_product_adaptor cartesian_product{};
 
 #else
 

include/Lz/chunk_if.hpp

@@ -29,8 +29,9 @@ LZ_MODULE_EXPORT_SCOPE_BEGIN
  * ```
  * @tparam ValueType The value type of the chunked iterable.
  */
+// TODO
 template<class ValueType>
-static constexpr detail::chunk_if_adaptor<ValueType> detail::chunk_if_adaptor<ValueType>::t_chunk_if;
+using t_chunk_if = detail::chunk_if_adaptor<ValueType>;
 
 /**
  * @brief This adaptor is used to make chunks of the iterable, based on a condition returned by the function passed. The iterator
@@ -46,7 +47,7 @@ static constexpr detail::chunk_if_adaptor<ValueType> detail::chunk_if_adaptor<Va
  * auto chunked = vec | lz::chunk_if([](int i) { return i % 2 == 0; }); // chunked = { {1, 2}, {3, 4}, {5} } }
  * ```
  */
-static constexpr detail::chunk_if_adaptor<void> detail::chunk_if_adaptor<void>::chunk_if{};
+constexpr detail::chunk_if_adaptor<void> chunk_if{};
 
 /**
  * @brief This adaptor is used to make chunks of the iterable, based on a condition returned by the function passed. The iterator
@@ -63,7 +64,7 @@ static constexpr detail::chunk_if_adaptor<void> detail::chunk_if_adaptor<void>::
  * // chunked = { string_view{"hello"}, string_view{"world"}, string_view{""}, string_view{""} }
  * ```
  */
-static constexpr detail::chunk_if_adaptor<lz::string_view> detail::chunk_if_adaptor<lz::string_view>::sv_chunk_if{};
+constexpr detail::chunk_if_adaptor<lz::string_view> sv_chunk_if{};
 
 /**
  * @brief This adaptor is used to make chunks of the iterable, based on a condition returned by the function passed. The iterator
@@ -80,7 +81,7 @@ static constexpr detail::chunk_if_adaptor<lz::string_view> detail::chunk_if_adap
  * // chunked = { std::string{"hello"}, std::string{"world"}, std::string{""}, std::string{""} }
  * ```
  */
-static constexpr detail::chunk_if_adaptor<std::string> detail::chunk_if_adaptor<std::string>::s_chunk_if{};
+constexpr detail::chunk_if_adaptor<std::string> s_chunk_if{};
 
 #else
 

include/Lz/chunks.hpp

@@ -39,7 +39,7 @@ LZ_MODULE_EXPORT_SCOPE_BEGIN
  * auto chunked = vec | lz::chunks(3); // chunked = { {1, 2, 3}, {4, 5} }
  * ```
  */
-static constexpr detail::chunks_adaptor detail::chunks_adaptor::chunks;
+constexpr detail::chunks_adaptor chunks;
 
 #else
 

include/Lz/common.hpp

@@ -31,7 +31,7 @@ LZ_MODULE_EXPORT_SCOPE_BEGIN
  * Will not result in an iterable where its end() and begin() functions return the same type. This is because
  * the common view is created first and then the take view is created. The take view will return another sentinel.
  */
-static constexpr detail::common_adaptor detail::common_adaptor::common{};
+constexpr detail::common_adaptor common{};
 
 #else
 

include/Lz/concatenate.hpp

@@ -24,7 +24,7 @@ LZ_MODULE_EXPORT_SCOPE_BEGIN
  * auto concatenated = a | lz::concat(b); // concatenated = {1, 2, 3, 4}
  * ```
  */
-static constexpr detail::concatenate_adaptor detail::concatenate_adaptor::concat{};
+constexpr detail::concatenate_adaptor concat{};
 
 #else
 

include/Lz/detail/adaptors/c_string.hpp

@@ -9,13 +9,7 @@ namespace lz {
 namespace detail {
 struct c_string_adaptor {
     using adaptor = c_string_adaptor;
-
-#ifdef LZ_HAS_CXX_11
-
-    static constexpr adaptor c_string;
-
-#endif
-
+    
     /**
      * @brief This adaptor is used to create a c forward iterable cstring iterable object. Its end() function will return a
      * sentinel, rather than an actual iterator. This iterable does not contain a .size() method. Example:
@@ -29,10 +23,31 @@ struct c_string_adaptor {
      * @param str The string to create a cstring iterable from.
      **/
     template<class C>
-    LZ_NODISCARD constexpr c_string_iterable<decay_t<C>> operator()(C&& str) const noexcept {
-        return { std::forward<C>(str) };
+    LZ_NODISCARD constexpr c_string_iterable<C> operator()(C* str) const noexcept {
+        return { str };
     }
+
+        /**
+     * @brief This adaptor is used to create a c forward iterable cstring iterable object. Its end() function will return a
+     * sentinel, rather than an actual iterator. This iterable does not contain a .size() method. Example:
+     * ```cpp
+     * const char* str = "Hello, World!";
+     * auto cstr = lz::c_string(str);
+     * // or:
+     * const char str[] = "Hello, World!";
+     * auto cstr = str | lz::c_string;
+     * ```
+     * @param str The string to create a cstring iterable from.
+     **/
+    template<class C>
+    LZ_NODISCARD constexpr c_string_iterable<const C> operator()(const C* str) const noexcept {
+        return { str };
+    }
+
 };
+
+template class c_string_iterable<const char>;
+
 } // namespace detail
 } // namespace lz
 

include/Lz/detail/adaptors/cached_size.hpp

@@ -10,12 +10,6 @@ namespace detail {
 struct cached_size_adaptor {
     using adaptor = cached_size_adaptor;
 
-#ifdef LZ_HAS_CXX_11
-
-    static constexpr adaptor cache_size;
-
-#endif
-
     /**
      * @brief Creates an iterable with a size. Gets the size eagerly (using `lz::eager_size`), so if the input iterable is
      * bidirectional or less and is not sized, the entire iterable will be traversed. This can be handy if you want to

include/Lz/detail/adaptors/cartesian_product.hpp

@@ -12,12 +12,6 @@ namespace detail {
 struct cartesian_product_adaptor {
     using adaptor = cartesian_product_adaptor;
 
-#ifdef LZ_HAS_CXX_11
-
-    static constexpr adaptor cartesian_product{};
-
-#endif
-
     /**
      * @brief Performs a cartesian product on the given iterables. This means that it will return all possible combinations
      * of the elements of the given iterables. Contains a .size() function if all of the iterables have a .size() function.

include/Lz/detail/adaptors/chunk_if.hpp

@@ -14,16 +14,6 @@ template<class ValueType>
 struct chunk_if_adaptor {
     using adaptor = chunk_if_adaptor<ValueType>;
 
-#ifdef LZ_HAS_CXX_11
-
-    static constexpr adaptor t_chunk_if{};
-
-    static constexpr chunk_if_adaptor<lz::string_view> sv_chunk_if{};
-
-    static constexpr chunk_if_adaptor<std::string> s_chunk_if{};
-
-#endif
-
     /**
      * @brief This adaptor is used to make chunks of the iterable, based on a condition returned by the function passed. The
      * iterator category is forward, and returns a sentinel. It returns an iterable of some type T of which T must be
@@ -81,12 +71,6 @@ template<>
 struct chunk_if_adaptor<void> {
     using adaptor = chunk_if_adaptor<void>;
 
-#ifdef LZ_HAS_CXX_11
-
-    static constexpr adaptor chunk_if{};
-
-#endif
-
     /**
      * @brief This adaptor is used to make chunks of the iterable, based on a condition returned by the function passed. The
      * iterator category is forward, and returns a sentinel. It returns an iterable of iterables. This iterable does not contain

include/Lz/detail/adaptors/chunks.hpp

@@ -13,12 +13,6 @@ namespace detail {
 struct chunks_adaptor {
     using adaptor = chunks_adaptor;
 
-#ifdef LZ_HAS_CXX_11
-
-    static constexpr adaptor chunks{};
-
-#endif
-
     /**
      * @brief This adaptor is used to make chunks of the iterable, based on chunk size. The iterator
      * category is the same as its input iterable. It returns an iterable of iterables. Its end() function will return a sentinel,

include/Lz/detail/adaptors/common.hpp

@@ -10,13 +10,7 @@ namespace lz {
 namespace detail {
 struct common_adaptor {
     using adaptor = common_adaptor;
-
-#ifdef LZ_HAS_CXX_11
-
-    static constexpr adaptor common{};
-
-#endif
-
+    
     /**
      * Creates a common view from an iterator and a sentinel. The iterable must have a sentinel type (i.e. its begin() function
      * must return a different type than its end() function), otherwise a static assertion will fail.

include/Lz/detail/adaptors/concatenate.hpp

@@ -11,12 +11,6 @@ namespace detail {
 struct concatenate_adaptor {
     using adaptor = concatenate_adaptor;
 
-#ifdef LZ_HAS_CXX_11
-
-    static constexpr adaptor concat{};
-
-#endif
-
     /**
      * @brief Concatenates multiple iterables into one iterable. Contains a .size() function if all iterables have a .size()
      * function. The size is the sum of all the sizes of the iterables. Contains a sentinel if one of the iterables contains a

include/Lz/detail/adaptors/drop.hpp

@@ -12,12 +12,6 @@ namespace detail {
 struct drop_adaptor {
     using adaptor = drop_adaptor;
 
-#ifdef LZ_HAS_CXX_11
-
-    static constexpr adaptor drop{};
-
-#endif
-
     /**
      * @brief This adaptor is used to drop the first n elements of an iterable. The iterator category is the same as the input
      * iterator category. Its end() function will return the same type as its input iterable. If its input iterable has a

include/Lz/detail/adaptors/drop_while.hpp

@@ -12,12 +12,6 @@ namespace detail {
 struct drop_while_adaptor {
     using adaptor = drop_while_adaptor;
 
-#ifdef LZ_HAS_CXX_11
-
-    static constexpr drop_while_adaptor drop_while{};
-
-#endif
-
     /**
      * @brief This adaptor is used to make an iterable where the iterator keeps dropping elements as long as the predicate returns
      * `true`. Once it has returned `false`, it will no longer do such thing. The iterator category is the same as its input

include/Lz/detail/adaptors/enumerate.hpp

@@ -12,12 +12,6 @@ namespace detail {
 struct enumerate_adaptor {
     using adaptor = enumerate_adaptor;
 
-#ifdef LZ_HAS_CXX_11
-
-    static constexpr adaptor enumerate{};
-
-#endif
-
     /**
      * @brief Returns an iterable that enumerates the elements of the input iterable, meaning it returns a std::pair<IntType,
      * ValueType>, where std::pair::first_type is an integer (corresponding to the current index) and std::pair::second_type is

include/Lz/detail/adaptors/except.hpp

@@ -12,12 +12,7 @@ namespace lz {
 namespace detail {
 struct except_adaptor {
     using adaptor = except_adaptor;
-
-#ifdef LZ_HAS_CXX_11
-
-    static constexpr adaptor except{};
-
-#endif
+    
     // clang-format off
 
     /**

include/Lz/detail/adaptors/exclude.hpp

@@ -12,12 +12,6 @@ namespace detail {
 struct exclude_adaptor {
     using adaptor = exclude_adaptor;
 
-#ifdef LZ_HAS_CXX_11
-
-    static constexpr adaptor exclude{};
-
-#endif
-
     /**
      * @brief Excludes elements from a container, using two indexes. The first index is means the start index, the second index
      * means the end index. Contains a .size() method if the input iterable contains a .size() method, its iterator category is

include/Lz/detail/adaptors/exclusive_scan.hpp

@@ -13,12 +13,6 @@ namespace detail {
 struct exclusive_scan_adaptor {
     using adaptor = exclusive_scan_adaptor;
 
-#ifdef LZ_HAS_CXX_11
-
-    static constexpr adaptor exclusive_scan{};
-
-#endif
-
     /**
      * @brief Performs an exclusive scan on a container. The first element will be the init value, the second element will be the
      * first element of the container + the init value, the third element will be the second element + last returned element