From 34abed35b062a63c24f86e9c536203b69fbc2241 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Tue, 2 Dec 2025 17:13:10 +0000
Subject: [PATCH] Synchronised generators with source files

---
 include/etl/fsm.h                             |   2 +-
 .../etl/generators/type_traits_generator.h    | 274 +++++++++++++++++-
 include/etl/type_traits.h                     | 274 +++++++++++++++++-
 test/vs2022/etl.vcxproj                       |  54 ++--
 4 files changed, 573 insertions(+), 31 deletions(-)

diff --git a/include/etl/fsm.h b/include/etl/fsm.h
index 4eaa016a..36130a47 100644
--- a/include/etl/fsm.h
+++ b/include/etl/fsm.h
@@ -221,7 +221,7 @@ namespace etl
     struct check_ids<Id, TState0, TRest...>
       : etl::integral_constant<bool, (TState0::STATE_ID == Id) && private_fsm::check_ids<Id + 1, TRest...>::value> 
     {
-    };
+    };   
 
     //***************************************************************************
     /// RAII detection mechanism to catch reentrant calls to methods that might
diff --git a/include/etl/generators/type_traits_generator.h b/include/etl/generators/type_traits_generator.h
index a03242a9..8d4753e6 100644
--- a/include/etl/generators/type_traits_generator.h
+++ b/include/etl/generators/type_traits_generator.h
@@ -800,6 +800,7 @@ namespace etl
 
   //***************************************************************************
   /// is_convertible
+  ///\ingroup type_traits
 #if ETL_USING_CPP11
   namespace private_type_traits
   {
@@ -828,11 +829,34 @@ namespace etl
                                               decltype(private_type_traits::nonvoid_convertible<TFrom, TTo>(0))::value) ||
                                               (etl::is_void<TFrom>::value && etl::is_void<TTo>::value)> {};
 #endif
+
+  // Is convertible and the conversion is noexcept.
+  template <typename TFrom, typename TTo>
+  struct is_nothrow_convertible
+  {
+  private:
+    // Helper: a function taking TTo to require the conversion.
+    static void sink(TTo) noexcept;
+
+    // Selected only if 'sink(declval<TFrom>())' is a valid expression.
+    template <typename F>
+    static auto test(int) -> etl::bool_constant<noexcept(sink(etl::declval<F>()))>;
+
+    // Fallback if conversion is not viable.
+    template <typename>
+    static etl::false_type test(...);
+
+  public:
+    static ETL_CONSTANT bool value = decltype(test<TFrom>(0))::value;
+  };
 #endif
 
 #if ETL_USING_CPP17
   template <typename TFrom, typename TTo >
   inline constexpr bool is_convertible_v = etl::is_convertible<TFrom, TTo>::value;
+
+  template <typename TFrom, typename TTo >
+  inline constexpr bool is_nothrow_convertible_v = etl::is_nothrow_convertible<TFrom, TTo>::value;
 #endif
 
   //***************************************************************************
@@ -1353,11 +1377,34 @@ typedef integral_constant<bool, true>  true_type;
 #if ETL_USING_CPP11
   template <typename TFrom, typename TTo>
   struct is_convertible : std::is_convertible<TFrom, TTo> {};
+
+  // Is convertible and the conversion is noexcept.
+  template <typename TFrom, typename TTo>
+  struct is_nothrow_convertible
+  {
+  private:
+    // Helper: a function taking TTo to require the conversion.
+    static void sink(TTo) noexcept;
+
+    // Selected only if 'sink(declval<TFrom>())' is a valid expression.
+    template <typename F>
+    static auto test(int) -> etl::bool_constant<noexcept(sink(etl::declval<F>()))>;
+
+    // Fallback if conversion is not viable.
+    template <typename>
+    static etl::false_type test(...);
+
+  public:
+    static ETL_CONSTANT bool value = decltype(test<TFrom>(0))::value;
+  };
 #endif
 
 #if ETL_USING_CPP17
   template <typename TFrom, typename TTo>
   inline constexpr bool is_convertible_v = std::is_convertible_v<TFrom, TTo>;
+
+  template <typename TFrom, typename TTo >
+  inline constexpr bool is_nothrow_convertible_v = is_nothrow_convertible<TFrom, TTo>::value;
 #endif
 
   //***************************************************************************
@@ -2124,17 +2171,17 @@ typedef integral_constant<bool, true>  true_type;
   /// is_constructible
   namespace private_type_traits 
   {
-    template <class, class T, class... Args>
+    template <class, class T, class... TArgs>
     struct is_constructible_ : etl::false_type {};
 
-    template <class T, class... Args>
-    struct is_constructible_<void_t<decltype(T(etl::declval<Args>()...))>, T, Args...> : etl::true_type {};
+    template <class T, class... TArgs>
+    struct is_constructible_<void_t<decltype(T(etl::declval<TArgs>()...))>, T, TArgs...> : etl::true_type {};
   }
 
   //*********************************************
   // is_constructible
-  template <class T, class... Args>
-  using is_constructible = private_type_traits::is_constructible_<void_t<>, T, Args...>;
+  template <class T, class... TArgs>
+  using is_constructible = private_type_traits::is_constructible_<void_t<>, T, TArgs...>;
 
   //*********************************************
   // is_copy_constructible
@@ -2504,13 +2551,228 @@ typedef integral_constant<bool, true>  true_type;
       return false;
     }
 #elif ETL_USING_BUILTIN_IS_CONSTANT_EVALUATED == 1
-    // fallback for C++20 on supported compilers
+    // Fallback for C++20 on supported compilers
     return __builtin_is_constant_evaluated();
 #else
     // default if unsupported
     return false;
 #endif
   }
+
+#if ETL_USING_CPP11
+  //*********************************
+  /// Check if T is a function type
+  //*********************************
+  template<typename T>
+  struct is_function : etl::false_type
+  {
+  };
+
+  // Plain / cv-qualified
+  template<typename Ret, typename... TArgs>
+  struct is_function<Ret(TArgs...)> : etl::true_type {};
+  template<typename Ret, typename... TArgs>
+  struct is_function<Ret(TArgs...) const> : etl::true_type {};
+  template<typename Ret, typename... TArgs>
+  struct is_function<Ret(TArgs...) volatile> : etl::true_type {};
+  template<typename Ret, typename... TArgs>
+  struct is_function<Ret(TArgs...) const volatile> : etl::true_type {};
+
+  // Variadic
+  template<typename Ret, typename... TArgs>
+  struct is_function<Ret(TArgs..., ...)> : etl::true_type {};
+
+  // noexcept variants (if supported by the toolchain)
+#if ETL_HAS_NOEXCEPT_FUNCTION_TYPE
+  template<typename Ret, typename... TArgs>
+  struct is_function<Ret(TArgs...) noexcept> : etl::true_type {};
+  template<typename Ret, typename... TArgs>
+  struct is_function<Ret(TArgs...) const noexcept> : etl::true_type {};
+  template<typename Ret, typename... TArgs>
+  struct is_function<Ret(TArgs...) volatile noexcept> : etl::true_type {};
+  template<typename Ret, typename... TArgs>
+  struct is_function<Ret(TArgs...) const volatile noexcept> : etl::true_type {};
+  template<typename Ret, typename... TArgs>
+  struct is_function<Ret(TArgs..., ...) noexcept> : etl::true_type {};
+#endif
+
+#if ETL_USING_CPP17
+  template <typename T>
+  inline constexpr bool is_function_v = etl::is_function<T>::value;
+#endif
+#endif
+
+#if ETL_USING_CPP11
+  //*********************************
+  /// Check for the presence of operator()
+  //*********************************
+  template <typename T, etl::enable_if_t<etl::is_class<etl::decay_t<T>>::value, int> = 0>
+  struct has_call_operator
+  {
+    template <typename U>
+    static auto test(int) -> decltype(&U::operator(), etl::true_type());
+
+    template <typename>
+    static etl::false_type test(...);
+
+    static const bool value = etl::is_same<decltype(test<T>(0)), etl::true_type>::value;
+  };
+
+#if ETL_USING_CPP17
+  template <typename T>
+  inline constexpr bool has_call_operator_v = etl::has_call_operator<T>::value;
+#endif
+#endif
+
+#if ETL_USING_CPP11
+  //***************************************************************************
+  /// Check that there is only one operator()
+  //***************************************************************************
+  template <typename T, etl::enable_if_t<etl::is_class<etl::decay_t<T>>::value, int> = 0>
+  struct has_unique_call_operator
+  {
+    //*********************************
+    // Test for presence of operator()
+    //*********************************
+    template <typename U>
+    static auto test(int) -> decltype(&U::operator(), etl::true_type());
+
+    //*********************************
+    // Fallback
+    //*********************************
+    template <typename>
+    static auto test(...) -> etl::false_type;
+
+    //*********************************
+    // <b>true</b> if operator() exists and is unique
+    //*********************************
+    static const bool value = decltype(test<etl::decay_t<T>>(0))::value;
+  };
+
+#if ETL_USING_CPP17
+  template <typename T>
+  inline constexpr bool has_unique_call_operator_v = etl::has_unique_call_operator<T>::value;
+#endif
+#endif
+
+  //***************************************************************************
+  /// Is T a member pointer
+  //***************************************************************************
+  namespace private_type_traits
+  {
+    template<typename T>
+    struct is_member_pointer_helper : etl::false_type {};
+
+    template<typename T, typename TObject>
+    struct is_member_pointer_helper<T TObject::*> : etl::true_type {};
+  }
+
+  template<typename T> 
+  struct is_member_pointer : private_type_traits::is_member_pointer_helper<etl::remove_cv_t<T>> {};
+
+#if ETL_USING_CPP17
+  template <typename T>
+  inline constexpr bool is_member_pointer_v = etl::is_member_pointer<T>::value;
+#endif
+
+  //***************************************************************************
+  /// Is T a member function pointer
+  //***************************************************************************
+  template <typename T> struct is_member_function_pointer : etl::false_type {};
+
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A...)> : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A...) const> : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A...) volatile> : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A...) const volatile> : etl::true_type {};
+
+#if ETL_HAS_NOEXCEPT_FUNCTION_TYPE
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A...) noexcept> : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A...) const noexcept> : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A...) volatile noexcept> : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A...) const volatile noexcept> : etl::true_type {};
+#endif
+
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A...) &>                : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A...) const &>          : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A...) volatile &>       : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A...) const volatile &> : etl::true_type {};
+
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A...) &&>               : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A...) const &&>         : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A...) volatile &&>      : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A...) const volatile &&>: etl::true_type {};
+
+#if ETL_HAS_NOEXCEPT_FUNCTION_TYPE
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A...) & noexcept>                : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A...) const & noexcept>          : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A...) volatile & noexcept>       : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A...) const volatile & noexcept> : etl::true_type {};
+
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A...) && noexcept>               : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A...) const && noexcept>         : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A...) volatile && noexcept>      : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A...) const volatile && noexcept>: etl::true_type {};
+#endif
+
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A..., ...)> : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A..., ...) const> : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A..., ...) volatile> : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A..., ...) const volatile> : etl::true_type {};
+
+#if ETL_HAS_NOEXCEPT_FUNCTION_TYPE
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A..., ...) noexcept> : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A..., ...) const noexcept> : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A..., ...) volatile noexcept> : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A..., ...) const volatile noexcept> : etl::true_type {};
+#endif
+
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A..., ...) &>                : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A..., ...) const &>          : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A..., ...) volatile &>       : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A..., ...) const volatile &> : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A..., ...) &&>               : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A..., ...) const &&>         : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A..., ...) volatile &&>      : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A..., ...) const volatile &&>: etl::true_type {};
+
+#if ETL_HAS_NOEXCEPT_FUNCTION_TYPE
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A..., ...) & noexcept>                : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A..., ...) const & noexcept>          : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A..., ...) volatile & noexcept>       : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A..., ...) const volatile & noexcept> : etl::true_type {};
+
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A..., ...) && noexcept>               : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A..., ...) const && noexcept>         : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A..., ...) volatile && noexcept>      : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A..., ...) const volatile && noexcept>: etl::true_type {};
+#endif
+
+#if ETL_USING_CPP17
+  template <typename T>
+  inline constexpr bool is_member_function_pointer_v = etl::is_member_function_pointer<T>::value;
+#endif
+
+  //***************************************************************************
+  /// Is T a member object pointer
+  //***************************************************************************
+  namespace private_type_traits
+  {
+    template <typename T> 
+    struct logical_not_t : etl::integral_constant<bool, !bool(T::value)> {};
+
+    template<typename> 
+    struct is_member_object_pointer_helper : public etl::false_type {};
+
+    template<typename T, typename TObject> 
+    struct is_member_object_pointer_helper<T TObject::*> : public logical_not_t<etl::is_function<T>>::type {};
+  }
+
+  template<typename T> struct is_member_object_pointer : public private_type_traits::is_member_object_pointer_helper<etl::remove_cv_t<T>>::type {};
+
+#if ETL_USING_CPP17
+  template <typename T>
+  inline constexpr bool is_member_object_pointer_v = etl::is_member_object_pointer<T>::value;
+#endif
 }
 
 // Helper macros
diff --git a/include/etl/type_traits.h b/include/etl/type_traits.h
index 3c9ac66b..44dccad6 100644
--- a/include/etl/type_traits.h
+++ b/include/etl/type_traits.h
@@ -788,6 +788,7 @@ namespace etl
 
   //***************************************************************************
   /// is_convertible
+  ///\ingroup type_traits
 #if ETL_USING_CPP11
   namespace private_type_traits
   {
@@ -816,11 +817,34 @@ namespace etl
                                               decltype(private_type_traits::nonvoid_convertible<TFrom, TTo>(0))::value) ||
                                               (etl::is_void<TFrom>::value && etl::is_void<TTo>::value)> {};
 #endif
+
+  // Is convertible and the conversion is noexcept.
+  template <typename TFrom, typename TTo>
+  struct is_nothrow_convertible
+  {
+  private:
+    // Helper: a function taking TTo to require the conversion.
+    static void sink(TTo) noexcept;
+
+    // Selected only if 'sink(declval<TFrom>())' is a valid expression.
+    template <typename F>
+    static auto test(int) -> etl::bool_constant<noexcept(sink(etl::declval<F>()))>;
+
+    // Fallback if conversion is not viable.
+    template <typename>
+    static etl::false_type test(...);
+
+  public:
+    static ETL_CONSTANT bool value = decltype(test<TFrom>(0))::value;
+  };
 #endif
 
 #if ETL_USING_CPP17
   template <typename TFrom, typename TTo >
   inline constexpr bool is_convertible_v = etl::is_convertible<TFrom, TTo>::value;
+
+  template <typename TFrom, typename TTo >
+  inline constexpr bool is_nothrow_convertible_v = etl::is_nothrow_convertible<TFrom, TTo>::value;
 #endif
 
   //***************************************************************************
@@ -1341,11 +1365,34 @@ typedef integral_constant<bool, true>  true_type;
 #if ETL_USING_CPP11
   template <typename TFrom, typename TTo>
   struct is_convertible : std::is_convertible<TFrom, TTo> {};
+
+  // Is convertible and the conversion is noexcept.
+  template <typename TFrom, typename TTo>
+  struct is_nothrow_convertible
+  {
+  private:
+    // Helper: a function taking TTo to require the conversion.
+    static void sink(TTo) noexcept;
+
+    // Selected only if 'sink(declval<TFrom>())' is a valid expression.
+    template <typename F>
+    static auto test(int) -> etl::bool_constant<noexcept(sink(etl::declval<F>()))>;
+
+    // Fallback if conversion is not viable.
+    template <typename>
+    static etl::false_type test(...);
+
+  public:
+    static ETL_CONSTANT bool value = decltype(test<TFrom>(0))::value;
+  };
 #endif
 
 #if ETL_USING_CPP17
   template <typename TFrom, typename TTo>
   inline constexpr bool is_convertible_v = std::is_convertible_v<TFrom, TTo>;
+
+  template <typename TFrom, typename TTo >
+  inline constexpr bool is_nothrow_convertible_v = is_nothrow_convertible<TFrom, TTo>::value;
 #endif
 
   //***************************************************************************
@@ -2117,17 +2164,17 @@ typedef integral_constant<bool, true>  true_type;
   /// is_constructible
   namespace private_type_traits 
   {
-    template <class, class T, class... Args>
+    template <class, class T, class... TArgs>
     struct is_constructible_ : etl::false_type {};
 
-    template <class T, class... Args>
-    struct is_constructible_<void_t<decltype(T(etl::declval<Args>()...))>, T, Args...> : etl::true_type {};
+    template <class T, class... TArgs>
+    struct is_constructible_<void_t<decltype(T(etl::declval<TArgs>()...))>, T, TArgs...> : etl::true_type {};
   }
 
   //*********************************************
   // is_constructible
-  template <class T, class... Args>
-  using is_constructible = private_type_traits::is_constructible_<void_t<>, T, Args...>;
+  template <class T, class... TArgs>
+  using is_constructible = private_type_traits::is_constructible_<void_t<>, T, TArgs...>;
 
   //*********************************************
   // is_copy_constructible
@@ -2497,13 +2544,228 @@ typedef integral_constant<bool, true>  true_type;
       return false;
     }
 #elif ETL_USING_BUILTIN_IS_CONSTANT_EVALUATED == 1
-    // fallback for C++20 on supported compilers
+    // Fallback for C++20 on supported compilers
     return __builtin_is_constant_evaluated();
 #else
     // default if unsupported
     return false;
 #endif
   }
+
+#if ETL_USING_CPP11
+  //*********************************
+  /// Check if T is a function type
+  //*********************************
+  template<typename T>
+  struct is_function : etl::false_type
+  {
+  };
+
+  // Plain / cv-qualified
+  template<typename Ret, typename... TArgs>
+  struct is_function<Ret(TArgs...)> : etl::true_type {};
+  template<typename Ret, typename... TArgs>
+  struct is_function<Ret(TArgs...) const> : etl::true_type {};
+  template<typename Ret, typename... TArgs>
+  struct is_function<Ret(TArgs...) volatile> : etl::true_type {};
+  template<typename Ret, typename... TArgs>
+  struct is_function<Ret(TArgs...) const volatile> : etl::true_type {};
+
+  // Variadic
+  template<typename Ret, typename... TArgs>
+  struct is_function<Ret(TArgs..., ...)> : etl::true_type {};
+
+  // noexcept variants (if supported by the toolchain)
+#if ETL_HAS_NOEXCEPT_FUNCTION_TYPE
+  template<typename Ret, typename... TArgs>
+  struct is_function<Ret(TArgs...) noexcept> : etl::true_type {};
+  template<typename Ret, typename... TArgs>
+  struct is_function<Ret(TArgs...) const noexcept> : etl::true_type {};
+  template<typename Ret, typename... TArgs>
+  struct is_function<Ret(TArgs...) volatile noexcept> : etl::true_type {};
+  template<typename Ret, typename... TArgs>
+  struct is_function<Ret(TArgs...) const volatile noexcept> : etl::true_type {};
+  template<typename Ret, typename... TArgs>
+  struct is_function<Ret(TArgs..., ...) noexcept> : etl::true_type {};
+#endif
+
+#if ETL_USING_CPP17
+  template <typename T>
+  inline constexpr bool is_function_v = etl::is_function<T>::value;
+#endif
+#endif
+
+#if ETL_USING_CPP11
+  //*********************************
+  /// Check for the presence of operator()
+  //*********************************
+  template <typename T, etl::enable_if_t<etl::is_class<etl::decay_t<T>>::value, int> = 0>
+  struct has_call_operator
+  {
+    template <typename U>
+    static auto test(int) -> decltype(&U::operator(), etl::true_type());
+
+    template <typename>
+    static etl::false_type test(...);
+
+    static const bool value = etl::is_same<decltype(test<T>(0)), etl::true_type>::value;
+  };
+
+#if ETL_USING_CPP17
+  template <typename T>
+  inline constexpr bool has_call_operator_v = etl::has_call_operator<T>::value;
+#endif
+#endif
+
+#if ETL_USING_CPP11
+  //***************************************************************************
+  /// Check that there is only one operator()
+  //***************************************************************************
+  template <typename T, etl::enable_if_t<etl::is_class<etl::decay_t<T>>::value, int> = 0>
+  struct has_unique_call_operator
+  {
+    //*********************************
+    // Test for presence of operator()
+    //*********************************
+    template <typename U>
+    static auto test(int) -> decltype(&U::operator(), etl::true_type());
+
+    //*********************************
+    // Fallback
+    //*********************************
+    template <typename>
+    static auto test(...) -> etl::false_type;
+
+    //*********************************
+    // <b>true</b> if operator() exists and is unique
+    //*********************************
+    static const bool value = decltype(test<etl::decay_t<T>>(0))::value;
+  };
+
+#if ETL_USING_CPP17
+  template <typename T>
+  inline constexpr bool has_unique_call_operator_v = etl::has_unique_call_operator<T>::value;
+#endif
+#endif
+
+  //***************************************************************************
+  /// Is T a member pointer
+  //***************************************************************************
+  namespace private_type_traits
+  {
+    template<typename T>
+    struct is_member_pointer_helper : etl::false_type {};
+
+    template<typename T, typename TObject>
+    struct is_member_pointer_helper<T TObject::*> : etl::true_type {};
+  }
+
+  template<typename T> 
+  struct is_member_pointer : private_type_traits::is_member_pointer_helper<etl::remove_cv_t<T>> {};
+
+#if ETL_USING_CPP17
+  template <typename T>
+  inline constexpr bool is_member_pointer_v = etl::is_member_pointer<T>::value;
+#endif
+
+  //***************************************************************************
+  /// Is T a member function pointer
+  //***************************************************************************
+  template <typename T> struct is_member_function_pointer : etl::false_type {};
+
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A...)> : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A...) const> : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A...) volatile> : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A...) const volatile> : etl::true_type {};
+
+#if ETL_HAS_NOEXCEPT_FUNCTION_TYPE
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A...) noexcept> : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A...) const noexcept> : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A...) volatile noexcept> : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A...) const volatile noexcept> : etl::true_type {};
+#endif
+
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A...) &>                : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A...) const &>          : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A...) volatile &>       : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A...) const volatile &> : etl::true_type {};
+
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A...) &&>               : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A...) const &&>         : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A...) volatile &&>      : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A...) const volatile &&>: etl::true_type {};
+
+#if ETL_HAS_NOEXCEPT_FUNCTION_TYPE
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A...) & noexcept>                : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A...) const & noexcept>          : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A...) volatile & noexcept>       : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A...) const volatile & noexcept> : etl::true_type {};
+
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A...) && noexcept>               : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A...) const && noexcept>         : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A...) volatile && noexcept>      : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A...) const volatile && noexcept>: etl::true_type {};
+#endif
+
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A..., ...)> : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A..., ...) const> : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A..., ...) volatile> : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A..., ...) const volatile> : etl::true_type {};
+
+#if ETL_HAS_NOEXCEPT_FUNCTION_TYPE
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A..., ...) noexcept> : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A..., ...) const noexcept> : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A..., ...) volatile noexcept> : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A..., ...) const volatile noexcept> : etl::true_type {};
+#endif
+
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A..., ...) &>                : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A..., ...) const &>          : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A..., ...) volatile &>       : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A..., ...) const volatile &> : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A..., ...) &&>               : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A..., ...) const &&>         : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A..., ...) volatile &&>      : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A..., ...) const volatile &&>: etl::true_type {};
+
+#if ETL_HAS_NOEXCEPT_FUNCTION_TYPE
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A..., ...) & noexcept>                : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A..., ...) const & noexcept>          : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A..., ...) volatile & noexcept>       : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A..., ...) const volatile & noexcept> : etl::true_type {};
+
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A..., ...) && noexcept>               : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A..., ...) const && noexcept>         : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A..., ...) volatile && noexcept>      : etl::true_type {};
+  template <typename R, typename C, typename... A> struct is_member_function_pointer<R(C::*)(A..., ...) const volatile && noexcept>: etl::true_type {};
+#endif
+
+#if ETL_USING_CPP17
+  template <typename T>
+  inline constexpr bool is_member_function_pointer_v = etl::is_member_function_pointer<T>::value;
+#endif
+
+  //***************************************************************************
+  /// Is T a member object pointer
+  //***************************************************************************
+  namespace private_type_traits
+  {
+    template <typename T> 
+    struct logical_not_t : etl::integral_constant<bool, !bool(T::value)> {};
+
+    template<typename> 
+    struct is_member_object_pointer_helper : public etl::false_type {};
+
+    template<typename T, typename TObject> 
+    struct is_member_object_pointer_helper<T TObject::*> : public logical_not_t<etl::is_function<T>>::type {};
+  }
+
+  template<typename T> struct is_member_object_pointer : public private_type_traits::is_member_object_pointer_helper<etl::remove_cv_t<T>>::type {};
+
+#if ETL_USING_CPP17
+  template <typename T>
+  inline constexpr bool is_member_object_pointer_v = etl::is_member_object_pointer<T>::value;
+#endif
 }
 
 // Helper macros
diff --git a/test/vs2022/etl.vcxproj b/test/vs2022/etl.vcxproj
index d2b13bec..095d407d 100644
--- a/test/vs2022/etl.vcxproj
+++ b/test/vs2022/etl.vcxproj
@@ -1003,87 +1003,104 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20|Win32'">
     <LinkIncremental>true</LinkIncremental>
     <PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
-    <IntDir>$(Configuration)\</IntDir>
+    <IntDir>Build\$(Configuration)\</IntDir>
+    <OutDir>$(SolutionDir)Build\$(Configuration)\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Clang C++20|Win32'">
     <LinkIncremental>true</LinkIncremental>
     <PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
-    <IntDir>$(Configuration)\</IntDir>
+    <IntDir>Build\$(Configuration)\</IntDir>
+    <OutDir>$(SolutionDir)Build\$(Configuration)\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Clang C++20 - Optimised -O2|Win32'">
     <LinkIncremental>true</LinkIncremental>
     <PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
-    <IntDir>$(Configuration)\</IntDir>
+    <IntDir>Build\$(Configuration)\</IntDir>
+    <OutDir>$(SolutionDir)Build\$(Configuration)\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++23|Win32'">
     <LinkIncremental>true</LinkIncremental>
     <PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
-    <IntDir>$(Configuration)\</IntDir>
+    <IntDir>Build\$(Configuration)\</IntDir>
+    <OutDir>$(SolutionDir)Build\$(Configuration)\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++23 - No STL|Win32'">
     <LinkIncremental>true</LinkIncremental>
     <PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
-    <IntDir>$(Configuration)\</IntDir>
+    <IntDir>Build\$(Configuration)\</IntDir>
+    <OutDir>$(SolutionDir)Build\$(Configuration)\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - Force C++03|Win32'">
     <LinkIncremental>true</LinkIncremental>
     <PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
-    <IntDir>$(Configuration)\</IntDir>
+    <IntDir>Build\$(Configuration)\</IntDir>
+    <OutDir>$(SolutionDir)Build\$(Configuration)\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - Force C++03 - No virtual messages|Win32'">
     <LinkIncremental>true</LinkIncremental>
     <PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
-    <IntDir>$(Configuration)\</IntDir>
+    <IntDir>Build\$(Configuration)\</IntDir>
+    <OutDir>$(SolutionDir)Build\$(Configuration)\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No virtual messages|Win32'">
     <LinkIncremental>true</LinkIncremental>
     <PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
-    <IntDir>$(Configuration)\</IntDir>
+    <IntDir>Build\$(Configuration)\</IntDir>
+    <OutDir>$(SolutionDir)Build\$(Configuration)\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No virtual imessage|Win32'">
     <LinkIncremental>true</LinkIncremental>
     <PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
-    <IntDir>$(Configuration)\</IntDir>
+    <IntDir>Build\$(Configuration)\</IntDir>
+    <OutDir>$(SolutionDir)Build\$(Configuration)\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++ 20 - No Tests|Win32'">
     <LinkIncremental>true</LinkIncremental>
     <PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
-    <IntDir>$(Configuration)\</IntDir>
+    <IntDir>Build\$(Configuration)\</IntDir>
+    <OutDir>$(SolutionDir)Build\$(Configuration)\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - Optimised O2|Win32'">
     <LinkIncremental>true</LinkIncremental>
     <PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
-    <IntDir>$(Configuration)\</IntDir>
+    <IntDir>Build\$(Configuration)\</IntDir>
+    <OutDir>$(SolutionDir)Build\$(Configuration)\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14|Win32'">
     <LinkIncremental>true</LinkIncremental>
     <PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
-    <IntDir>$(Configuration)\</IntDir>
+    <IntDir>Build\$(Configuration)\</IntDir>
+    <OutDir>$(SolutionDir)Build\$(Configuration)\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17|Win32'">
     <LinkIncremental>true</LinkIncremental>
     <PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
-    <IntDir>$(Configuration)\</IntDir>
+    <IntDir>Build\$(Configuration)\</IntDir>
+    <OutDir>$(SolutionDir)Build\$(Configuration)\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++17 - No STL|Win32'">
     <LinkIncremental>true</LinkIncremental>
     <PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
-    <IntDir>$(Configuration)\</IntDir>
+    <IntDir>Build\$(Configuration)\</IntDir>
+    <OutDir>$(SolutionDir)Build\$(Configuration)\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++20 - No STL|Win32'">
     <LinkIncremental>true</LinkIncremental>
     <PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
-    <IntDir>$(Configuration)\</IntDir>
+    <IntDir>Build\$(Configuration)\</IntDir>
+    <OutDir>$(SolutionDir)Build\$(Configuration)\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2|Win32'">
     <LinkIncremental>true</LinkIncremental>
     <PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
-    <IntDir>$(Configuration)\</IntDir>
+    <IntDir>Build\$(Configuration)\</IntDir>
+    <OutDir>$(SolutionDir)Build\$(Configuration)\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MSVC C++20 - No STL - Optimised -O2 - Sanitiser|Win32'">
     <LinkIncremental>true</LinkIncremental>
     <PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
-    <IntDir>$(Configuration)\</IntDir>
+    <IntDir>Build\$(Configuration)\</IntDir>
+    <OutDir>$(SolutionDir)Build\$(Configuration)\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MSVC - Force C++03|Win32'">
     <LinkIncremental>false</LinkIncremental>
@@ -1129,7 +1146,8 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MSVC C++14 - No STL|Win32'">
     <LinkIncremental>true</LinkIncremental>
     <PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
-    <IntDir>$(Configuration)\</IntDir>
+    <IntDir>Build\$(Configuration)\</IntDir>
+    <OutDir>$(SolutionDir)Build\$(Configuration)\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MSVC - No STL -O2|Win32'">
     <LinkIncremental>false</LinkIncremental>