commit a3a7a4e3308afde48e9fe80c17b9168f302cfcfd
author Davide Pesavento <davidepesa@gmail.com> Sun May 29 16:06:22 2022 -0400
committer Davide Pesavento <davidepesa@gmail.com> Sat Jun 04 20:26:02 2022 -0400
tree 75ad95a70f9ca2d6fb09896a791f7b4760322af2
parent b7bfcb904a313af606503d7380a69edc47a9b30e

Use more C++17 features

Mainly structured bindings, inline variables, and class template
argument deduction, plus many more smaller things.

Change-Id: I810d17e0adb470426e4e30c898e03b3140ad052f

tools/nfdc/rib-module.cpp

diff --git a/tools/nfdc/rib-module.cpp b/tools/nfdc/rib-module.cpp
index df980c4..5ed8553 100644
--- a/tools/nfdc/rib-module.cpp
+++ b/tools/nfdc/rib-module.cpp
@@ -203,9 +203,7 @@
       return;
     }
 
-    std::optional<FaceUri> canonized;
-    std::string error;
-    std::tie(canonized, error) = canonize(ctx, *faceUri);
+    auto [canonized, error] = canonize(ctx, *faceUri);
     if (!canonized) {
       // Canonization failed
       auto canonizationError = canonizeErrorHelper(*faceUri, error);