Finalize move iterator to detail namespace

Author: Kaaserne

include/Lz/detail/iterator.hpp

@@ -10,8 +10,8 @@ namespace lz {
 
 namespace detail {
 
-template<class T>
-using const_reference = detail::conditional<std::is_lvalue_reference<T>::value, const T&, detail::remove_cvref<T>>;
+template<class Derived, class Reference, class Pointer, class DifferenceType, class Cat, class S = Derived>
+struct iterator;
 
 template<class Derived, class Reference, class Pointer, class DifferenceType, class S>
 struct iterator<Derived, Reference, Pointer, DifferenceType, std::forward_iterator_tag, S> {

include/Lz/detail/iterators/duplicates.hpp

@@ -112,9 +112,9 @@ class duplicates_iterator<Iterable, BinaryPredicate, enable_if<is_ra<iter_t<Iter
 
 template<class Iterable, class BinaryPredicate>
 class duplicates_iterator<Iterable, BinaryPredicate, enable_if<!is_ra<iter_t<Iterable>>::value>>
-    : public lz::iterator<duplicates_iterator<Iterable, BinaryPredicate>, std::pair<ref_t<iter_t<Iterable>>, size_t>,
-                          fake_ptr_proxy<std::pair<ref_t<iter_t<Iterable>>, size_t>>, diff_type<iter_t<Iterable>>,
-                          std::bidirectional_iterator_tag, default_sentinel_t> {
+    : public iterator<duplicates_iterator<Iterable, BinaryPredicate>, std::pair<ref_t<iter_t<Iterable>>, size_t>,
+                      fake_ptr_proxy<std::pair<ref_t<iter_t<Iterable>>, size_t>>, diff_type<iter_t<Iterable>>,
+                      std::bidirectional_iterator_tag, default_sentinel_t> {
 
     using it = iter_t<Iterable>;
     using traits = std::iterator_traits<iter_t<Iterable>>;

include/Lz/detail/traits.hpp

@@ -45,48 +45,58 @@ struct default_sentinel_t {
  */
 LZ_INLINE_VAR constexpr default_sentinel_t default_sentinel{};
 
-template<class Derived, class Reference, class Pointer, class DifferenceType, class IterCat, class S = Derived>
+} // namespace lz
+
+namespace lz {
+namespace detail {
+
+template<class Derived, class Reference, class Pointer, class DifferenceType, class IterCat, class S>
 struct iterator;
 
+}
+} // namespace lz
+
+LZ_MODULE_EXPORT namespace lz{
+
 template<class Derived, class Reference, class Pointer, class DifferenceType, class IterCat, class Sentinel>
 constexpr bool
-operator==(const Sentinel& sent, const iterator<Derived, Reference, Pointer, DifferenceType, IterCat, Sentinel>& it) {
+operator==(const Sentinel& sent, const detail::iterator<Derived, Reference, Pointer, DifferenceType, IterCat, Sentinel>& it) {
     return it == sent;
 }
 
 template<class Derived, class Reference, class Pointer, class DifferenceType, class IterCat, class Sentinel>
-constexpr bool
-operator!=(const Sentinel& sent, const iterator<Derived, Reference, Pointer, DifferenceType, IterCat, Sentinel>& it) {
+constexpr bool operator!=(const Sentinel& sent,
+                          const detail::iterator<Derived, Reference, Pointer, DifferenceType, IterCat, Sentinel>& it) {
     return !(it == sent);
 }
 
 template<class Derived, class Reference, class Pointer, class DifferenceType, class IterCat, class Sentinel>
-LZ_NODISCARD constexpr bool
-operator<(const Sentinel& sent, const iterator<Derived, Reference, Pointer, DifferenceType, IterCat, Sentinel>& it) {
+LZ_NODISCARD constexpr bool operator<(
+    const Sentinel& sent, const detail::iterator<Derived, Reference, Pointer, DifferenceType, IterCat, Sentinel>& it) {
     return sent - it < 0;
 }
 
 template<class Derived, class Reference, class Pointer, class DifferenceType, class IterCat, class Sentinel>
-LZ_NODISCARD constexpr bool
-operator>(const Sentinel& sent, const iterator<Derived, Reference, Pointer, DifferenceType, IterCat, Sentinel>& it) {
+LZ_NODISCARD constexpr bool operator>(
+    const Sentinel& sent, const detail::iterator<Derived, Reference, Pointer, DifferenceType, IterCat, Sentinel>& it) {
     return it < sent;
 }
 
 template<class Derived, class Reference, class Pointer, class DifferenceType, class IterCat, class Sentinel>
-LZ_NODISCARD constexpr bool
-operator<=(const Sentinel& sent, const iterator<Derived, Reference, Pointer, DifferenceType, IterCat, Sentinel>& it) {
+LZ_NODISCARD constexpr bool operator<=(
+    const Sentinel& sent, const detail::iterator<Derived, Reference, Pointer, DifferenceType, IterCat, Sentinel>& it) {
     return !(it < sent);
 }
 
 template<class Derived, class Reference, class Pointer, class DifferenceType, class IterCat, class Sentinel>
-LZ_NODISCARD constexpr bool
-operator>=(const Sentinel& sent, const iterator<Derived, Reference, Pointer, DifferenceType, IterCat, Sentinel>& it) {
+LZ_NODISCARD constexpr bool operator>=(
+    const Sentinel& sent, const detail::iterator<Derived, Reference, Pointer, DifferenceType, IterCat, Sentinel>& it) {
     return !(sent < it);
 }
 
 template<class Derived, class Reference, class Pointer, class DifferenceType, class IterCat, class Sentinel>
-LZ_NODISCARD constexpr typename Derived::difference_type
-operator-(const Sentinel& sent, const iterator<Derived, Reference, Pointer, DifferenceType, IterCat, Sentinel>& it) {
+LZ_NODISCARD constexpr typename Derived::difference_type operator-(
+    const Sentinel& sent, const detail::iterator<Derived, Reference, Pointer, DifferenceType, IterCat, Sentinel>& it) {
     return -(it - sent);
 }