From f4060bc9eadf6547ea221de4ee2cd3cf5a9d82d7 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Sun, 23 May 2021 16:59:10 +0100 Subject: [PATCH] Working. No move functionality. --- include/etl/private/variant_new.h | 4 ++-- test/test_variant_new.cpp | 11 +++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/include/etl/private/variant_new.h b/include/etl/private/variant_new.h index 45447fc0..97f918df 100644 --- a/include/etl/private/variant_new.h +++ b/include/etl/private/variant_new.h @@ -199,9 +199,9 @@ namespace etl type_id = variant_npos; } - //************************************************************************* + //*************************************************************************** /// Emplace with variadic constructor parameters. - //************************************************************************* + //*************************************************************************** template T& emplace(TArgs&&... args) { diff --git a/test/test_variant_new.cpp b/test/test_variant_new.cpp index 69fcd47a..f0516e55 100644 --- a/test/test_variant_new.cpp +++ b/test/test_variant_new.cpp @@ -382,13 +382,16 @@ namespace } //************************************************************************* + D1 getD1() + { + return D1("1"); + } + TEST(test_move) { - test_variant_emplace variant; - D1 da("1"); - - variant = da; + + test_variant_emplace variant(etl::move(getD1())); D1 db = etl::move(etl::get(variant)); }