commit 4b9d30f8e221791ef3953f4a25d031d9388c80eb
author Davide Pesavento <davidepesa@gmail.com> Fri May 01 02:48:34 2020 -0400
committer Davide Pesavento <davidepesa@gmail.com> Fri May 01 02:48:34 2020 -0400
tree e863ec4a22f2821684dbb3aa431c990010f5dbf7
parent f6be8e37f62f98c6b80812c09a79d5df0e9c5118

src: fix -Wrange-loop-construct warning with clang 10

Change-Id: Ife00440ffa456c6ad2119fc656a34681327e0ab3

src/conf-file-processor.cpp

diff --git a/src/conf-file-processor.cpp b/src/conf-file-processor.cpp
index b893bf8..69a7881 100644
--- a/src/conf-file-processor.cpp
+++ b/src/conf-file-processor.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
+/*
  * Copyright (c) 2014-2020,  The University of Memphis,
  *                           Regents of the University of California,
  *                           Arizona Board of Regents.
@@ -24,8 +24,6 @@
 #include "utility/name-helper.hpp"
 #include "update/prefix-update-processor.hpp"
 
-#include <boost/cstdint.hpp>
-
 #include <ndn-cxx/name.hpp>
 #include <ndn-cxx/net/face-uri.hpp>
 
@@ -473,19 +471,19 @@
         std::string uriString = CommandAttriTree.get<std::string>("face-uri");
 
         ndn::FaceUri faceUri;
-        if (! faceUri.parse(uriString)) {
-          std::cerr << "Parsing failed!" << std::endl;
+        if (!faceUri.parse(uriString)) {
+          std::cerr << "face-uri parsing failed" << std::endl;
           return false;
         }
 
         bool failedToCanonize = false;
-        faceUri.canonize([&faceUri] (ndn::FaceUri canonicalUri) {
+        faceUri.canonize([&faceUri] (const auto& canonicalUri) {
                            faceUri = canonicalUri;
                          },
-                         [&faceUri, &failedToCanonize] (const std::string& reason) {
+                         [&faceUri, &failedToCanonize] (const auto& reason) {
                            failedToCanonize = true;
-                           std::cerr << "Could not canonize URI: " << faceUri
-                                     << "because: " << reason << std::endl;
+                           std::cerr << "Could not canonize URI: '" << faceUri
+                                     << "' because: " << reason << std::endl;
                          },
                          m_io,
                          TIME_ALLOWED_FOR_CANONIZATION);
@@ -496,8 +494,7 @@
           return false;
         }
 
-        double linkCost = CommandAttriTree.get<double>("link-cost",
-                                                       Adjacent::DEFAULT_LINK_COST);
+        double linkCost = CommandAttriTree.get<double>("link-cost", Adjacent::DEFAULT_LINK_COST);
         ndn::Name neighborName(name);
         if (!neighborName.empty()) {
           Adjacent adj(name, faceUri, linkCost, Adjacent::STATUS_INACTIVE, 0, 0);