commit 909ffef5e7b03ede203e242740bb160b57b55def
author Junxiao Shi <git@mail1.yoursunny.com> Fri Jul 07 22:12:27 2017 +0000
committer Junxiao Shi <git@mail1.yoursunny.com> Fri Jul 07 22:12:27 2017 +0000
tree e8502ce2bea22007b8b16b8f5e0d94e907959df6
parent 899277a653247aed7c7688b4a335b02019e139c3

interest: mark constructor explicit

refs #4164

Change-Id: Ie99c86379c9677fb81e0940eba2bce135942c926

src/interest.hpp

diff --git a/src/interest.hpp b/src/interest.hpp
index e9af4cf..1ec414b 100644
--- a/src/interest.hpp
+++ b/src/interest.hpp
@@ -53,11 +53,11 @@
   };
 
   /** @brief Create a new Interest with the given name and interest lifetime
-   *  @note This constructor allows implicit conversion from Name.
    *  @throw std::invalid_argument InterestLifetime is negative
    *  @warning In certain contexts that use Interest::shared_from_this(), Interest must be created
    *           using `make_shared`. Otherwise, .shared_from_this() will trigger undefined behavior.
    */
+  explicit
   Interest(const Name& name = Name(), time::milliseconds interestLifetime = DEFAULT_INTEREST_LIFETIME);
 
   /** @brief Create from wire encoding

tests/integrated/face.cpp

diff --git a/tests/integrated/face.cpp b/tests/integrated/face.cpp
index 12e7a99..038b499 100644
--- a/tests/integrated/face.cpp
+++ b/tests/integrated/face.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
+/*
  * Copyright (c) 2013-2017 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
@@ -168,7 +168,8 @@
     veryLongName.append("0123456789");
   }
 
-  BOOST_CHECK_THROW(face.expressInterest(veryLongName, nullptr, nullptr, nullptr), Face::Error);
+  BOOST_CHECK_THROW(face.expressInterest(Interest(veryLongName), nullptr, nullptr, nullptr),
+                    Face::Error);
 
   shared_ptr<Data> data = make_shared<Data>(veryLongName);
   data->setContent(reinterpret_cast<const uint8_t*>("01234567890"), 10);
@@ -547,12 +548,12 @@
 BOOST_AUTO_TEST_CASE(ShutdownWhileSendInProgress) // Bug #3136
 {
   Face face;
-  face.expressInterest(Name("/Hello/World/!"), nullptr, nullptr, nullptr);
+  face.expressInterest(Interest("/Hello/World/!"), nullptr, nullptr, nullptr);
   BOOST_REQUIRE_NO_THROW(face.processEvents(time::seconds(1)));
 
-  face.expressInterest(Name("/Bye/World/1"), nullptr, nullptr, nullptr);
-  face.expressInterest(Name("/Bye/World/2"), nullptr, nullptr, nullptr);
-  face.expressInterest(Name("/Bye/World/3"), nullptr, nullptr, nullptr);
+  face.expressInterest(Interest("/Bye/World/1"), nullptr, nullptr, nullptr);
+  face.expressInterest(Interest("/Bye/World/2"), nullptr, nullptr, nullptr);
+  face.expressInterest(Interest("/Bye/World/3"), nullptr, nullptr, nullptr);
   face.shutdown();
 
   BOOST_REQUIRE_NO_THROW(face.processEvents(time::seconds(1)));