diff --git a/include/etl/utility.h b/include/etl/utility.h index 00f54248..0016aacc 100644 --- a/include/etl/utility.h +++ b/include/etl/utility.h @@ -346,16 +346,6 @@ namespace etl { return p.first; } - -#if ETL_CPP11_SUPPORTED - //*************************************************************************** - ///\copydoc operator()(TPair&)const - //*************************************************************************** - type&& operator()(TPair&& p) const - { - return etl::move(p.first); - } -#endif }; //*************************************************************************** @@ -391,16 +381,6 @@ namespace etl { return p.second; } - -#if ETL_CPP11_SUPPORTED - //*************************************************************************** - ///\copydoc operator()(TPair&)const - //*************************************************************************** - type&& operator()(TPair&& p) const - { - return etl::move(p.second); - } -#endif }; #if ETL_NOT_USING_STL || ETL_CPP14_NOT_SUPPORTED diff --git a/test/test_utility.cpp b/test/test_utility.cpp index 57350a2f..1d2cbca0 100644 --- a/test/test_utility.cpp +++ b/test/test_utility.cpp @@ -349,20 +349,6 @@ namespace CHECK_EQUAL(2, selector(sp2)); } - //************************************************************************* - TEST(test_select1st_move) - { - typedef etl::pair EtlPair; - typedef std::pair StdPair; - - auto selector = etl::select1st(); - -#include "etl/private/diagnostic_pessimizing-move_push.h" - CHECK_EQUAL(1, selector(std::move(EtlPair(1, "Hello")))); - CHECK_EQUAL(2, selector(std::move(StdPair(2, "Hello")))); -#include "etl/private/diagnostic_pop.h" - } - //************************************************************************* TEST(test_select1st_example) { @@ -399,23 +385,6 @@ namespace CHECK_EQUAL(std::string("World"), selector(sp2)); } - //************************************************************************* - TEST(test_select2nd_move) - { - typedef etl::pair EtlPair; - typedef std::pair StdPair; - - EtlPair ep1(1, "Hello"); - StdPair sp2(2, "World"); - - auto selector = etl::select2nd(); - -#include "etl/private/diagnostic_pessimizing-move_push.h" - CHECK_EQUAL(std::string("Hello"), selector(std::move(EtlPair(1, "Hello")))); - CHECK_EQUAL(std::string("World"), selector(std::move(StdPair(1, "World")))); -#include "etl/private/diagnostic_pop.h" - } - //************************************************************************* TEST(test_select2nd_example) {