From 8b46723fe28094c3eed2a604b426b5b108fecdfd Mon Sep 17 00:00:00 2001
From: Mateusz Pusz <mateusz.pusz@gmail.com>
Date: Sat, 26 Oct 2024 19:09:30 +0200
Subject: [PATCH] refactor: `wrapped_type_t` reuses
 `std::indirectly_readable_traits`

---
 src/core/include/mp-units/ext/type_traits.h | 27 +++------------------
 1 file changed, 4 insertions(+), 23 deletions(-)

diff --git a/src/core/include/mp-units/ext/type_traits.h b/src/core/include/mp-units/ext/type_traits.h
index 965444f5..c93952c1 100644
--- a/src/core/include/mp-units/ext/type_traits.h
+++ b/src/core/include/mp-units/ext/type_traits.h
@@ -29,6 +29,7 @@
 #ifdef MP_UNITS_IMPORT_STD
 import std;
 #else
+#include <iterator>
 #include <type_traits>
 #include <utility>
 #endif
@@ -100,30 +101,10 @@ constexpr bool is_derived_from_specialization_of = requires(T* t) { detail::to_b
 template<typename T, template<auto...> typename Type>
 constexpr bool is_derived_from_specialization_of_v = requires(T* t) { detail::to_base_specialization_of_v<Type>(t); };
 
-namespace detail {
-
 template<typename T>
-struct get_value_type {
-  using type = T::value_type;
-};
-
-template<typename T>
-struct get_element_type {
-  using type = std::remove_reference_t<typename T::element_type>;
-};
-
-}  // namespace detail
-
-template<typename T>
-  requires requires { typename T::value_type; } || requires { typename T::element_type; }
-struct wrapped_type {
-  using type =
-    conditional<requires { typename T::value_type; }, detail::get_value_type<T>, detail::get_element_type<T>>::type;
-};
-
-template<typename T>
-  requires requires { typename T::value_type; } || requires { typename T::element_type; }
-using wrapped_type_t = wrapped_type<T>::type;
+  requires(!std::is_pointer_v<T> && !std::is_array_v<T>) &&
+            requires { typename std::indirectly_readable_traits<T>::value_type; }
+using wrapped_type_t = std::indirectly_readable_traits<T>::value_type;
 
 template<typename T>
 struct value_type {