From 78eb0d976de7d37854d4f195213fb63d307525ca Mon Sep 17 00:00:00 2001 From: Stephen Shelton Date: Mon, 4 May 2020 09:21:26 -0600 Subject: [PATCH] nonstd::optional -> std::optional --- llarp/config/config.cpp | 4 ++-- llarp/config/definition.hpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/llarp/config/config.cpp b/llarp/config/config.cpp index 987a42574..e8658f06f 100644 --- a/llarp/config/config.cpp +++ b/llarp/config/config.cpp @@ -226,12 +226,12 @@ namespace llarp }; conf.defineOption( - "dns", "upstream", false, true, nonstd::nullopt, [=](std::string arg) { + "dns", "upstream", false, true, std::nullopt, [=](std::string arg) { m_upstreamDNS.push_back(parseAddr(arg)); }); conf.defineOption( - "dns", "bind", false, nonstd::nullopt, [=](std::string arg) { m_bind = parseAddr(arg); }); + "dns", "bind", false, std::nullopt, [=](std::string arg) { m_bind = parseAddr(arg); }); } LinksConfig::LinkInfo diff --git a/llarp/config/definition.hpp b/llarp/config/definition.hpp index 9a919a32c..cb3214cef 100644 --- a/llarp/config/definition.hpp +++ b/llarp/config/definition.hpp @@ -125,7 +125,7 @@ namespace llarp else if (not required and not multiValued) return defaultValue; else - return nonstd::nullopt; + return std::nullopt; } /// Returns the value at the given index.