From 37fd5b7c450f72f8c4e083e723fd657571e9160d Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Mon, 3 Feb 2025 16:19:47 +0000 Subject: [PATCH] Attempt to fix Github CI errors --- include/etl/memory.h | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/include/etl/memory.h b/include/etl/memory.h index ca72656b9..83e9a200c 100644 --- a/include/etl/memory.h +++ b/include/etl/memory.h @@ -54,27 +54,6 @@ SOFTWARE. namespace etl { -#if ETL_USING_STL && ETL_USING_CPP20 - //***************************************************************************** - /// Obtain the address represented by p without forming a reference to the object pointed to by p. - /// Defined when using the STL and C++20 - //***************************************************************************** - template - constexpr auto to_address(const TPtr& p) noexcept - { - return std::to_address(p); - } - - //***************************************************************************** - /// Obtain the address represented by p without forming a reference to the object pointed to by p. - /// Defined when using the STL and C++20 - //***************************************************************************** - template - constexpr T* to_address(T* p) noexcept - { - return std::to_address(p); - } -#else //***************************************************************************** /// Obtain the address represented by p without forming a reference to the object pointed to by p. /// Defined when not using the STL or C++20 @@ -93,9 +72,8 @@ namespace etl template ETL_CONSTEXPR typename Iterator::pointer to_address(const Iterator& itr) { - return itr.operator->(); + return etl::to_address(itr.operator->()); } -#endif #if ETL_USING_STL //*****************************************************************************