commit c1d0e8e34de10d5a5190734bdd7e3c6348852b1e
author Davide Pesavento <davidepesa@gmail.com> Wed Jun 15 14:26:02 2022 -0400
committer Davide Pesavento <davidepesa@gmail.com> Wed Jun 29 15:04:57 2022 -0400
tree 1b288040ceb3468d6a60919788ebfb45c9da12c0
parent 0c87b12458bdba26dc8d7c305ca733e385e3cdf8

build: migrate to C++17

Change-Id: Ic9f09efd20b608bfcb713fd319834b2666cf6242

src/lsa/name-lsa.cpp

diff --git a/src/lsa/name-lsa.cpp b/src/lsa/name-lsa.cpp
index 53281e1..f578a06 100644
--- a/src/lsa/name-lsa.cpp
+++ b/src/lsa/name-lsa.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2014-2021,  The University of Memphis,
+ * Copyright (c) 2014-2022,  The University of Memphis,
  *                           Regents of the University of California,
  *                           Arizona Board of Regents.
  *
@@ -54,7 +54,7 @@
   totalLength += Lsa::wireEncode(block);
 
   totalLength += block.prependVarNumber(totalLength);
-  totalLength += block.prependVarNumber(ndn::tlv::nlsr::NameLsa);
+  totalLength += block.prependVarNumber(nlsr::tlv::NameLsa);
 
   return totalLength;
 }
@@ -84,7 +84,7 @@
 {
   m_wire = wire;
 
-  if (m_wire.type() != ndn::tlv::nlsr::NameLsa) {
+  if (m_wire.type() != nlsr::tlv::NameLsa) {
     NDN_THROW(Error("NameLsa", m_wire.type()));
   }
 
@@ -92,7 +92,7 @@
 
   auto val = m_wire.elements_begin();
 
-  if (val != m_wire.elements_end() && val->type() == ndn::tlv::nlsr::Lsa) {
+  if (val != m_wire.elements_end() && val->type() == nlsr::tlv::Lsa) {
     Lsa::wireDecode(*val);
     ++val;
   }
@@ -164,7 +164,7 @@
     updated = true;
   }
 
-  return std::make_tuple(updated, namesToAdd, namesToRemove);
+  return {updated, namesToAdd, namesToRemove};
 }
 
 std::ostream&