From 9c4d8d6f1d3ab40e37055cb8f678b59a1b432bc8 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Fri, 10 Jun 2022 18:53:48 +0100 Subject: [PATCH] Fixed duplicate etl::declval definition. --- include/etl/private/variant_legacy.h | 2 +- include/etl/utility.h | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/include/etl/private/variant_legacy.h b/include/etl/private/variant_legacy.h index f91b0c4b..6e19fb94 100644 --- a/include/etl/private/variant_legacy.h +++ b/include/etl/private/variant_legacy.h @@ -89,7 +89,7 @@ namespace etl { public: variant_incorrect_type_exception(string_type file_name_, numeric_type line_number_) - : variant_exception(ETL_ERROR_TEXT("variant: unsupported type", ETL_VARIANT_FILE_ID"A"), file_name_, line_number_) + : variant_exception(ETL_ERROR_TEXT("variant:unsupported type", ETL_VARIANT_FILE_ID"A"), file_name_, line_number_) { } }; diff --git a/include/etl/utility.h b/include/etl/utility.h index c6abd668..b9ab53c4 100644 --- a/include/etl/utility.h +++ b/include/etl/utility.h @@ -437,14 +437,6 @@ namespace etl inline constexpr in_place_index_t in_place_index{}; #endif - //*************************************************************************** - /// declval - //*************************************************************************** -#if ETL_USING_CPP11 - template - typename etl::add_rvalue_reference::type declval() ETL_NOEXCEPT; -#endif - #if ETL_USING_CPP11 //************************************************************************* /// A function wrapper for free/global functions.