commit 3b101d06827c46a070081733cd40dbb3636ccf64
author Davide Pesavento <davide.pesavento@lip6.fr> Sat Jul 21 22:44:09 2018 -0400
committer Alex Afanasyev <aa@cs.fiu.edu> Tue Jul 24 15:17:34 2018 -0700
tree 21fe3caa45ffe1204a15383f67a678f996c91351
parent cf0aff8a03bb49bc52f46f462826bf362234473a

Use std::move in more places

Plus various code simplifications

Change-Id: I19805e4a635e4c74afaff68f9d8968475217ec6e

src/util/dummy-client-face.cpp

diff --git a/src/util/dummy-client-face.cpp b/src/util/dummy-client-face.cpp
index 9f9383a..657fc02 100644
--- a/src/util/dummy-client-face.cpp
+++ b/src/util/dummy-client-face.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -95,33 +95,30 @@
 {
 }
 
-DummyClientFace::DummyClientFace(const Options& options/* = DummyClientFace::DEFAULT_OPTIONS*/)
+DummyClientFace::DummyClientFace(const Options& options)
   : Face(make_shared<DummyClientFace::Transport>())
-  , m_internalKeyChain(new KeyChain)
+  , m_internalKeyChain(make_unique<KeyChain>())
   , m_keyChain(*m_internalKeyChain)
 {
   this->construct(options);
 }
 
-DummyClientFace::DummyClientFace(KeyChain& keyChain,
-                                 const Options& options/* = DummyClientFace::DEFAULT_OPTIONS*/)
+DummyClientFace::DummyClientFace(KeyChain& keyChain, const Options& options)
   : Face(make_shared<DummyClientFace::Transport>(), keyChain)
   , m_keyChain(keyChain)
 {
   this->construct(options);
 }
 
-DummyClientFace::DummyClientFace(boost::asio::io_service& ioService,
-                                 const Options& options/* = DummyClientFace::DEFAULT_OPTIONS*/)
+DummyClientFace::DummyClientFace(boost::asio::io_service& ioService, const Options& options)
   : Face(make_shared<DummyClientFace::Transport>(), ioService)
-  , m_internalKeyChain(new KeyChain)
+  , m_internalKeyChain(make_unique<KeyChain>())
   , m_keyChain(*m_internalKeyChain)
 {
   this->construct(options);
 }
 
-DummyClientFace::DummyClientFace(boost::asio::io_service& ioService, KeyChain& keyChain,
-                                 const Options& options/* = DummyClientFace::DEFAULT_OPTIONS*/)
+DummyClientFace::DummyClientFace(boost::asio::io_service& ioService, KeyChain& keyChain, const Options& options)
   : Face(make_shared<DummyClientFace::Transport>(), ioService, keyChain)
   , m_keyChain(keyChain)
 {