commit cf6dc92a4b83a611f8b2cefff09e5138755b7340
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Aug 10 16:55:27 2012 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Aug 10 18:15:21 2012 -0700
tree 61aa63481b23eb84e1c5dd980f759c466173f8bb
parent 2b4c947fc029efc1fe34715c3bd0b8d44cdcc04e

Now everything compiles, but not everything is working yet

model/ndn-face.h

diff --git a/model/ndn-face.h b/model/ndn-face.h
index 0e98905..0a46401 100644
--- a/model/ndn-face.h
+++ b/model/ndn-face.h
@@ -25,9 +25,10 @@
 #include <algorithm>
 
 #include "ns3/ptr.h"
-#include "ns3/ndn.h"
+#include "ns3/object.h"
 #include "ns3/nstime.h"
 #include "ns3/type-id.h"
+#include "ns3/traced-callback.h"
 
 namespace ns3 {
 
@@ -50,7 +51,8 @@
  *
  * \see ndn::LocalFace, ndn::NetDeviceFace, ndn::Ipv4Face, ndn::UdpFace
  */
-class Face  : public Object
+class Face :
+    public Object
 {
 public:
   static TypeId