commit 6eba36f7a37ee548cb98d7b627f66d27969e1eb6
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Wed Aug 07 17:42:54 2013 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Wed Aug 07 17:42:54 2013 -0700
tree f7f63ffadf6c31f05e3a541105f48a2bfa123c29
parent 4699242353245b7964e61a0853845cb6da920a65

src: One more set of renaming: ndn-content-object.h|cc is renamed to ndn-data.h|cc

model/fw/green-yellow-red.cc

diff --git a/model/fw/green-yellow-red.cc b/model/fw/green-yellow-red.cc
index cb7fd89..a2d4e3c 100644
--- a/model/fw/green-yellow-red.cc
+++ b/model/fw/green-yellow-red.cc
@@ -24,7 +24,7 @@
 #include "ns3/ndn-pit.h"
 #include "ns3/ndn-pit-entry.h"
 #include "ns3/ndn-interest.h"
-#include "ns3/ndn-content-object.h"
+#include "ns3/ndn-data.h"
 #include "ns3/ndn-pit.h"
 #include "ns3/ndn-fib.h"
 #include "ns3/ndn-content-store.h"

model/fw/nacks.cc

diff --git a/model/fw/nacks.cc b/model/fw/nacks.cc
index e57d66e..b035514 100644
--- a/model/fw/nacks.cc
+++ b/model/fw/nacks.cc
@@ -23,7 +23,7 @@
 #include "ns3/ndn-pit.h"
 #include "ns3/ndn-pit-entry.h"
 #include "ns3/ndn-interest.h"
-#include "ns3/ndn-content-object.h"
+#include "ns3/ndn-data.h"
 #include "ns3/ndn-pit.h"
 #include "ns3/ndn-fib.h"
 #include "ns3/ndn-content-store.h"

model/fw/ndn-forwarding-strategy.cc

diff --git a/model/fw/ndn-forwarding-strategy.cc b/model/fw/ndn-forwarding-strategy.cc
index f439fd4..392d208 100644
--- a/model/fw/ndn-forwarding-strategy.cc
+++ b/model/fw/ndn-forwarding-strategy.cc
@@ -24,7 +24,7 @@
 #include "ns3/ndn-pit.h"
 #include "ns3/ndn-pit-entry.h"
 #include "ns3/ndn-interest.h"
-#include "ns3/ndn-content-object.h"
+#include "ns3/ndn-data.h"
 #include "ns3/ndn-pit.h"
 #include "ns3/ndn-fib.h"
 #include "ns3/ndn-content-store.h"

model/fw/per-fib-limits.cc

diff --git a/model/fw/per-fib-limits.cc b/model/fw/per-fib-limits.cc
index f2fed86..87e99fc 100644
--- a/model/fw/per-fib-limits.cc
+++ b/model/fw/per-fib-limits.cc
@@ -23,7 +23,7 @@
 
 #include "ns3/ndn-l3-protocol.h"
 #include "ns3/ndn-interest.h"
-#include "ns3/ndn-content-object.h"
+#include "ns3/ndn-data.h"
 
 #include "best-route.h"
 #include "flooding.h"

model/fw/per-out-face-limits.cc

diff --git a/model/fw/per-out-face-limits.cc b/model/fw/per-out-face-limits.cc
index 41ca598..d07f79b 100644
--- a/model/fw/per-out-face-limits.cc
+++ b/model/fw/per-out-face-limits.cc
@@ -22,7 +22,7 @@
 
 #include "ns3/ndn-l3-protocol.h"
 #include "ns3/ndn-interest.h"
-#include "ns3/ndn-content-object.h"
+#include "ns3/ndn-data.h"
 
 #include "best-route.h"
 #include "flooding.h"