commit 8fd15e628aba3213cf56d03af46c9258902b404f
author Davide Pesavento <davide.pesavento@lip6.fr> Thu Apr 06 19:58:54 2017 -0400
committer Davide Pesavento <davide.pesavento@lip6.fr> Thu Apr 06 20:39:05 2017 -0400
tree d636563bf20da12fcaddb62ab66e62f37bd10279
parent b283f52c78cfe765692aaed23e44b6c22f696f5f

face: move Channel and subclasses into nfd::face namespace

Change-Id: I163ef20e11b65d19d68585ec075fd3cd224a573b

daemon/face/tcp-channel.cpp

diff --git a/daemon/face/tcp-channel.cpp b/daemon/face/tcp-channel.cpp
index 656b671..5f0f940 100644
--- a/daemon/face/tcp-channel.cpp
+++ b/daemon/face/tcp-channel.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2014-2016,  Regents of the University of California,
+ * Copyright (c) 2014-2017,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -29,6 +29,7 @@
 #include "core/global-io.hpp"
 
 namespace nfd {
+namespace face {
 
 NFD_LOG_INIT("TcpChannel");
 
@@ -108,12 +109,12 @@
   if (it == m_channelFaces.end()) {
     auto persistency = isOnDemand ? ndn::nfd::FACE_PERSISTENCY_ON_DEMAND
                                   : ndn::nfd::FACE_PERSISTENCY_PERSISTENT;
-    auto linkService = make_unique<face::GenericLinkService>();
+    auto linkService = make_unique<GenericLinkService>();
     auto options = linkService->getOptions();
     options.allowLocalFields = wantLocalFieldsEnabled;
     linkService->setOptions(options);
 
-    auto transport = make_unique<face::TcpTransport>(std::move(socket), persistency);
+    auto transport = make_unique<TcpTransport>(std::move(socket), persistency);
 
     face = make_shared<Face>(std::move(linkService), std::move(transport));
 
@@ -220,4 +221,5 @@
     onConnectFailed(504, "Connect to remote endpoint timed out");
 }
 
+} // namespace face
 } // namespace nfd