From cac01b252aadc7703c632607450992fe8e95e2d2 Mon Sep 17 00:00:00 2001 From: 0xFEEDC0DE64 Date: Mon, 27 Feb 2023 17:26:53 +0100 Subject: [PATCH] Updated to new esp-idf --- CMakeLists.txt | 1 - src/accessorinterface.h | 8 +++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f87a0c3..24aec5f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -105,7 +105,6 @@ set(dependencies cxx-ring-buffer espchrono espcpputils - expected espwifistack fmt TFT_eSPI diff --git a/src/accessorinterface.h b/src/accessorinterface.h index fe51418..15a5688 100644 --- a/src/accessorinterface.h +++ b/src/accessorinterface.h @@ -2,15 +2,13 @@ // system includes #include - -// 3rdparty lib includes -#include +#include namespace espgui { template struct AccessorInterface { - using setter_result_t = tl::expected; + using setter_result_t = std::expected; virtual T getValue() const = 0; virtual setter_result_t setValue(T value) = 0; @@ -24,6 +22,6 @@ struct RefAccessor : public virtual AccessorInterface virtual T& getRef() const = 0; T getValue() const override { return getRef(); }; - tl::expected setValue(T value) override { getRef() = value; return {}; }; + std::expected setValue(T value) override { getRef() = value; return {}; }; }; } // namespace espgui