src: Global renaming ContentObject -> Data
diff --git a/model/cs/content-store-impl.h b/model/cs/content-store-impl.h
index 7058009..48786d7 100644
--- a/model/cs/content-store-impl.h
+++ b/model/cs/content-store-impl.h
@@ -48,7 +48,7 @@
typedef Entry base_type;
public:
- EntryImpl (Ptr<ContentStore> cs, Ptr<const ContentObject> data)
+ EntryImpl (Ptr<ContentStore> cs, Ptr<const Data> data)
: Entry (cs, data)
, item_ (0)
{
@@ -94,11 +94,11 @@
// from ContentStore
- virtual inline Ptr<ContentObject>
+ virtual inline Ptr<Data>
Lookup (Ptr<const Interest> interest);
virtual inline bool
- Add (Ptr<const ContentObject> data);
+ Add (Ptr<const Data> data);
// virtual bool
// Remove (Ptr<Interest> header);
@@ -182,7 +182,7 @@
};
template<class Policy>
-Ptr<ContentObject>
+Ptr<Data>
ContentStoreImpl<Policy>::Lookup (Ptr<const Interest> interest)
{
NS_LOG_FUNCTION (this << interest->GetName ());
@@ -202,7 +202,7 @@
{
this->m_cacheHitsTrace (interest, node->payload ()->GetData ());
- Ptr<ContentObject> copy = Create<ContentObject> (*node->payload ()->GetData ());
+ Ptr<Data> copy = Create<Data> (*node->payload ()->GetData ());
ConstCast<Packet> (copy->GetPayload ())->RemoveAllPacketTags ();
return copy;
}
@@ -215,7 +215,7 @@
template<class Policy>
bool
-ContentStoreImpl<Policy>::Add (Ptr<const ContentObject> data)
+ContentStoreImpl<Policy>::Add (Ptr<const Data> data)
{
NS_LOG_FUNCTION (this << data->GetName ());
diff --git a/model/cs/content-store-nocache.cc b/model/cs/content-store-nocache.cc
index c5749e2..b2b8fbf 100644
--- a/model/cs/content-store-nocache.cc
+++ b/model/cs/content-store-nocache.cc
@@ -55,7 +55,7 @@
{
}
-Ptr<ContentObject>
+Ptr<Data>
Nocache::Lookup (Ptr<const Interest> interest)
{
this->m_cacheMissesTrace (interest);
@@ -63,7 +63,7 @@
}
bool
-Nocache::Add (Ptr<const ContentObject> data)
+Nocache::Add (Ptr<const Data> data)
{
return false;
}
diff --git a/model/cs/content-store-nocache.h b/model/cs/content-store-nocache.h
index 98c1850..ca3afe2 100644
--- a/model/cs/content-store-nocache.h
+++ b/model/cs/content-store-nocache.h
@@ -54,11 +54,11 @@
virtual
~Nocache ();
- virtual Ptr<ContentObject>
+ virtual Ptr<Data>
Lookup (Ptr<const Interest> interest);
virtual bool
- Add (Ptr<const ContentObject> data);
+ Add (Ptr<const Data> data);
virtual void
Print (std::ostream &os) const;
diff --git a/model/cs/content-store-with-freshness.h b/model/cs/content-store-with-freshness.h
index d9fa1ba..e53cbba 100644
--- a/model/cs/content-store-with-freshness.h
+++ b/model/cs/content-store-with-freshness.h
@@ -50,7 +50,7 @@
Print (std::ostream &os) const;
virtual inline bool
- Add (Ptr<const ContentObject> data);
+ Add (Ptr<const Data> data);
private:
inline void
@@ -94,7 +94,7 @@
template<class Policy>
inline bool
-ContentStoreWithFreshness< Policy >::Add (Ptr<const ContentObject> data)
+ContentStoreWithFreshness< Policy >::Add (Ptr<const Data> data)
{
bool ok = super::Add (data);
if (!ok) return false;
diff --git a/model/cs/ndn-content-store.cc b/model/cs/ndn-content-store.cc
index f1c25b7..38215dc 100644
--- a/model/cs/ndn-content-store.cc
+++ b/model/cs/ndn-content-store.cc
@@ -60,7 +60,7 @@
//////////////////////////////////////////////////////////////////////
-Entry::Entry (Ptr<ContentStore> cs, Ptr<const ContentObject> data)
+Entry::Entry (Ptr<ContentStore> cs, Ptr<const Data> data)
: m_cs (cs)
, m_data (data)
{
@@ -72,7 +72,7 @@
return m_data->GetName ();
}
-Ptr<const ContentObject>
+Ptr<const Data>
Entry::GetData () const
{
return m_data;
diff --git a/model/cs/ndn-content-store.h b/model/cs/ndn-content-store.h
index 10a7bd3..ae7c059 100644
--- a/model/cs/ndn-content-store.h
+++ b/model/cs/ndn-content-store.h
@@ -34,7 +34,7 @@
namespace ndn {
-class ContentObject;
+class Data;
class Interest;
class Name;
class ContentStore;
@@ -60,13 +60,13 @@
/**
* \brief Construct content store entry
*
- * \param header Parsed ContentObject header
+ * \param header Parsed Data header
* \param packet Original Ndn packet
*
* The constructor will make a copy of the supplied packet and calls
* RemoveHeader and RemoveTail on the copy.
*/
- Entry (Ptr<ContentStore> cs, Ptr<const ContentObject> data);
+ Entry (Ptr<ContentStore> cs, Ptr<const Data> data);
/**
* \brief Get prefix of the stored entry
@@ -76,10 +76,10 @@
GetName () const;
/**
- * \brief Get ContentObject of the stored entry
- * \returns ContentObject of the stored entry
+ * \brief Get Data of the stored entry
+ * \returns Data of the stored entry
*/
- Ptr<const ContentObject>
+ Ptr<const Data>
GetData () const;
/**
@@ -90,7 +90,7 @@
private:
Ptr<ContentStore> m_cs; ///< \brief content store to which entry is added
- Ptr<const ContentObject> m_data; ///< \brief non-modifiable ContentObject
+ Ptr<const Data> m_data; ///< \brief non-modifiable Data
};
} // namespace cs
@@ -128,19 +128,19 @@
* If an entry is found, it is promoted to the top of most recent
* used entries index, \see m_contentStore
*/
- virtual Ptr<ContentObject>
+ virtual Ptr<Data>
Lookup (Ptr<const Interest> interest) = 0;
/**
* \brief Add a new content to the content store.
*
- * \param header Fully parsed ContentObject
+ * \param header Fully parsed Data
* \param packet Fully formed Ndn packet to add to content store
* (will be copied and stripped down of headers)
* @returns true if an existing entry was updated, false otherwise
*/
virtual bool
- Add (Ptr<const ContentObject> data) = 0;
+ Add (Ptr<const Data> data) = 0;
// /*
// * \brief Add a new content to the content store.
@@ -194,7 +194,7 @@
protected:
TracedCallback<Ptr<const Interest>,
- Ptr<const ContentObject> > m_cacheHitsTrace; ///< @brief trace of cache hits
+ Ptr<const Data> > m_cacheHitsTrace; ///< @brief trace of cache hits
TracedCallback<Ptr<const Interest> > m_cacheMissesTrace; ///< @brief trace of cache misses
};