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/face/ethernet-factory.hpp b/daemon/face/ethernet-factory.hpp
index c0a951d..add176e 100644
--- a/daemon/face/ethernet-factory.hpp
+++ b/daemon/face/ethernet-factory.hpp
@@ -31,10 +31,6 @@
namespace nfd {
-namespace face {
-class LpFaceWrapper;
-} // namespace face
-
class EthernetFactory : public ProtocolFactory
{
public:
@@ -52,7 +48,7 @@
};
typedef std::map<std::pair<std::string, ethernet::Address>,
- shared_ptr<face::LpFaceWrapper>> MulticastFaceMap;
+ shared_ptr<Face>> MulticastFaceMap;
/**
* \brief Create an EthernetFace to communicate with the given multicast group
@@ -69,7 +65,7 @@
*
* \throws EthernetFactory::Error or EthernetTransport::Error
*/
- shared_ptr<face::LpFaceWrapper>
+ shared_ptr<Face>
createMulticastFace(const NetworkInterfaceInfo& interface,
const ethernet::Address& address);
@@ -96,7 +92,7 @@
* \returns shared pointer to the existing EthernetFace object
* or nullptr when such face does not exist
*/
- shared_ptr<face::LpFaceWrapper>
+ shared_ptr<Face>
findMulticastFace(const std::string& interfaceName,
const ethernet::Address& address) const;