Use more C++17 features
Mainly structured bindings, inline variables, and class template
argument deduction, plus many more smaller things.
Change-Id: I810d17e0adb470426e4e30c898e03b3140ad052f
diff --git a/tools/nfdc/command-parser.cpp b/tools/nfdc/command-parser.cpp
index 0d59de2..69bc26a 100644
--- a/tools/nfdc/command-parser.cpp
+++ b/tools/nfdc/command-parser.cpp
@@ -94,7 +94,7 @@
}
std::vector<const CommandDefinition*>
-CommandParser::listCommands(const std::string& noun, ParseMode mode) const
+CommandParser::listCommands(std::string_view noun, ParseMode mode) const
{
std::vector<const CommandDefinition*> results;
for (auto i : m_commandOrder) {
@@ -126,7 +126,7 @@
NDN_LOG_TRACE("found command noun=" << def.getNoun() << " verb=" << def.getVerb());
size_t nConsumed = std::min<size_t>(2, tokens.size());
- return std::make_tuple(def.getNoun(), def.getVerb(), def.parse(tokens, nConsumed), i->second->execute);
+ return {def.getNoun(), def.getVerb(), def.parse(tokens, nConsumed), i->second->execute};
}
} // namespace nfdc