diff --git a/CMakeLists.txt b/CMakeLists.txt index ce0fb4f..4685ae3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,6 @@ set(dependencies espchrono espcpputils espwifistack - expected fmt ) diff --git a/src/asyncmdnssearch.cpp b/src/asyncmdnssearch.cpp index 2349b82..30ae931 100644 --- a/src/asyncmdnssearch.cpp +++ b/src/asyncmdnssearch.cpp @@ -26,19 +26,19 @@ AsyncMdnsSearch &AsyncMdnsSearch::operator=(AsyncMdnsSearch &&other) return *this; } -tl::expected AsyncMdnsSearch::startSearch(const char *name, const char *service, const char *proto, uint16_t type, std::chrono::milliseconds timeout, size_t max_results) +std::expected AsyncMdnsSearch::startSearch(const char *name, const char *service, const char *proto, uint16_t type, std::chrono::milliseconds timeout, size_t max_results) { ESP_LOGD(TAG, "starting search..."); if (searchStarted()) - return tl::make_unexpected("last scan not finished yet"); + return std::unexpected("last scan not finished yet"); if (!max_results) - return tl::make_unexpected("max_results should be greater than 0"); + return std::unexpected("max_results should be greater than 0"); m_mdnsScan = mdns_query_async_new(name, service, proto, type, timeout.count(), max_results, nullptr); if (!searchStarted()) - return tl::make_unexpected("mdns_query_async_new() returned invalid"); + return std::unexpected("mdns_query_async_new() returned invalid"); return {}; } diff --git a/src/asyncmdnssearch.h b/src/asyncmdnssearch.h index 8626ead..5e5a513 100644 --- a/src/asyncmdnssearch.h +++ b/src/asyncmdnssearch.h @@ -4,13 +4,11 @@ #include #include #include +#include // esp-idf includes #include -// 3rdparty lib includes -#include - // local includes #include "asyncmdnsresults.h" @@ -27,7 +25,7 @@ public: bool searchStarted() const { return m_mdnsScan; } - tl::expected startSearch(const char *name, const char *service, const char *proto, uint16_t type, std::chrono::milliseconds timeout, size_t max_results); + std::expected startSearch(const char *name, const char *service, const char *proto, uint16_t type, std::chrono::milliseconds timeout, size_t max_results); std::optional getResults(); void deleteSearch();