commit f9f4eb012155e83226c13acbbe35737c1d8698b8
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Dec 16 01:51:14 2011 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Dec 16 02:51:36 2011 -0800
tree 8e0ea8d67d6d1e75976f06c034abcdffff9588e8
parent 9ad10afa986abe0e855d22242be1d1bc62870b00

Resolve compilation issues (more accurate with headers)

model/ccnx-content-object-header.cc

diff --git a/model/ccnx-content-object-header.cc b/model/ccnx-content-object-header.cc
index e871e23..767d512 100644
--- a/model/ccnx-content-object-header.cc
+++ b/model/ccnx-content-object-header.cc
@@ -22,8 +22,8 @@
 #include "ccnx-content-object-header.h"
 
 #include "ns3/log.h"
-#include "ns3/ccnx-encoding-helper.h"
-#include "ns3/ccnx-decoding-helper.h"
+#include "../helper/ccnx-encoding-helper.h"
+#include "../helper/ccnx-decoding-helper.h"
 
 NS_LOG_COMPONENT_DEFINE ("CcnxContentObjectHeader");
 

model/ccnx-interest-header.cc

diff --git a/model/ccnx-interest-header.cc b/model/ccnx-interest-header.cc
index 6539ff8..941fc02 100644
--- a/model/ccnx-interest-header.cc
+++ b/model/ccnx-interest-header.cc
@@ -26,8 +26,8 @@
 #include "ccnx-interest-header.h"
 
 #include "ns3/log.h"
-#include "ns3/ccnx-encoding-helper.h"
-#include "ns3/ccnx-decoding-helper.h"
+#include "../helper/ccnx-encoding-helper.h"
+#include "../helper/ccnx-decoding-helper.h"
 
 NS_LOG_COMPONENT_DEFINE ("CcnxInterestHeader");
 

model/ccnx-net-device-face.cc

diff --git a/model/ccnx-net-device-face.cc b/model/ccnx-net-device-face.cc
index 468d8f1..d42515f 100644
--- a/model/ccnx-net-device-face.cc
+++ b/model/ccnx-net-device-face.cc
@@ -20,8 +20,8 @@
  */
 
 #include "ccnx-net-device-face.h"
+#include "ccnx-l3-protocol.h"
 
-#include "ns3/ccnx-l3-protocol.h"
 #include "ns3/net-device.h"
 #include "ns3/log.h"
 #include "ns3/packet.h"

model/ccnx-pit.cc

diff --git a/model/ccnx-pit.cc b/model/ccnx-pit.cc
index e72c5e5..d9667cf 100644
--- a/model/ccnx-pit.cc
+++ b/model/ccnx-pit.cc
@@ -51,11 +51,13 @@
                    StringValue ("1s"),
                    MakeTimeAccessor (&CcnxPit::GetCleanupTimeout, &CcnxPit::SetCleanupTimeout),
                    MakeTimeChecker ())
+    
     .AddAttribute ("PitEntryPruningTimout",
                    "Timeout for PIT entry to live after being satisfied. To make sure recently satisfied interest will not be satisfied again",
                    StringValue ("100ms"),
                    MakeTimeAccessor (&CcnxPit::m_PitEntryPruningTimout),
                    MakeTimeChecker ())
+    
     .AddAttribute ("PitEntryDefaultLifetime",
                    "Default lifetime of PIT entry (aka default Interest lifetime)",
                    StringValue("4s"),