commit 2b4c947fc029efc1fe34715c3bd0b8d44cdcc04e
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Aug 09 15:00:38 2012 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Aug 10 18:15:14 2012 -0700
tree 53b6e0b43ee5671e930bd7f836d2af6db69f0fdd
parent b8d14adbfd8bfdaf98982f06229c9534395cfc3a

Another set of refactoring

model/ndn-net-device-face.h

diff --git a/model/ndn-net-device-face.h b/model/ndn-net-device-face.h
index bc132f7..651a7ae 100644
--- a/model/ndn-net-device-face.h
+++ b/model/ndn-net-device-face.h
@@ -25,8 +25,7 @@
 #include "ns3/net-device.h"
 
 namespace ns3 {
-
-class Address;
+namespace ndn {
   
 /**
  * \ingroup ndn-face
@@ -42,7 +41,7 @@
  *
  * \see NdnAppFace, NdnNetDeviceFace, NdnIpv4Face, NdnUdpFace
  */
-class NdnNetDeviceFace  : public NdnFace
+class NetDeviceFace  : public Face
 {
 public:
   static TypeId
@@ -55,8 +54,8 @@
    * @param netDevice a smart pointer to NetDevice object to which
    * this face will be associate
    */
-  NdnNetDeviceFace (Ptr<Node> node, const Ptr<NetDevice> &netDevice);
-  virtual ~NdnNetDeviceFace();
+  NetDeviceFace (Ptr<Node> node, const Ptr<NetDevice> &netDevice);
+  virtual ~NetDeviceFace();
 
   ////////////////////////////////////////////////////////////////////
   // methods overloaded from NdnFace
@@ -84,8 +83,8 @@
   Ptr<NetDevice> GetNetDevice () const;
 
 private:
-  NdnNetDeviceFace (const NdnNetDeviceFace &); ///< \brief Disabled copy constructor
-  NdnNetDeviceFace& operator= (const NdnNetDeviceFace &); ///< \brief Disabled copy operator
+  NetDeviceFace (const NetDeviceFace &); ///< \brief Disabled copy constructor
+  NetDeviceFace& operator= (const NetDeviceFace &); ///< \brief Disabled copy operator
 
   /// \brief callback from lower layers
   void ReceiveFromNetDevice (Ptr<NetDevice> device,
@@ -99,6 +98,7 @@
   Ptr<NetDevice> m_netDevice; ///< \brief Smart pointer to NetDevice
 };
 
+} // namespace ndn
 } // namespace ns3
 
 #endif //NDN_NET_DEVICE_FACE_H