face: face refactoring completion
* delete old Face
* rename LpFace as Face
* eliminate LpFaceWrapper and use new Face
refs #3172
Change-Id: I08c3a5dfb4cc1b9834b30cccd9ab634535d0608c
diff --git a/daemon/nfd.hpp b/daemon/nfd.hpp
index 57b5e8a..dd97cf4 100644
--- a/daemon/nfd.hpp
+++ b/daemon/nfd.hpp
@@ -34,19 +34,14 @@
#include <ndn-cxx/util/network-monitor.hpp>
namespace ndn {
-
class Face;
-
namespace mgmt {
-
class Dispatcher;
-
-}
-}
+} // namespace mgmt
+} // namespace ndn
namespace nfd {
-class Face;
class Forwarder;
class FibManager;
class FaceManager;
@@ -54,6 +49,10 @@
class ForwarderStatusManager;
class CommandValidator;
+namespace face {
+class Face;
+} // namespace face
+
/**
* \brief Class representing NFD instance
* This class can be used to initialize all components of NFD
@@ -110,7 +109,7 @@
unique_ptr<Forwarder> m_forwarder;
ndn::KeyChain& m_keyChain;
- shared_ptr<Face> m_internalFace;
+ shared_ptr<face::Face> m_internalFace;
shared_ptr<ndn::Face> m_internalClientFace;
unique_ptr<CommandValidator> m_validator;