all: Adding typedefs near forward declarations of Interest/ContentObject/Name
refs #29
diff --git a/model/ndn-content-object.h b/model/ndn-content-object.h
index 2022f2f..c26d5c1 100644
--- a/model/ndn-content-object.h
+++ b/model/ndn-content-object.h
@@ -39,13 +39,13 @@
/**
* ContentObject header
- *
+ *
* Only few important fields are actually implemented in the simulation
*
* ContentObject serializes/deserializes header up-to and including <Content> tags
* Necessary closing tags should be added using ContentObjectTail
*
- * Optimized and simplified formatting of Interest packets
+ * Optimized and simplified formatting of Interest packets
*
* ContentObject ::= Signature
* Name
@@ -54,7 +54,7 @@
* This hacks are necessary to optimize memory use (i.e., virtual payload)
*
* "<ContentObject><Signature>..</Signature><Name>...</Name><SignedInfo>...</SignedInfo><Content>"
- *
+ *
*/
class ContentObject : public SimpleRefCount<ContentObject,Header>
{
@@ -98,7 +98,7 @@
*/
Time
GetTimestamp () const;
-
+
/**
* @brief Set freshness of the content object
* @param freshness Freshness, 0s means infinity
@@ -111,23 +111,23 @@
*/
Time
GetFreshness () const;
-
+
//////////////////////////////////////////////////////////////////
-
+
static TypeId GetTypeId (void); ///< @brief Get TypeId
virtual TypeId GetInstanceTypeId (void) const; ///< @brief Get TypeId of the instance
virtual void Print (std::ostream &os) const; ///< @brief Print out information about the Header into the stream
virtual uint32_t GetSerializedSize (void) const; ///< @brief Get size necessary to serialize the Header
virtual void Serialize (Buffer::Iterator start) const; ///< @brief Serialize the Header
virtual uint32_t Deserialize (Buffer::Iterator start); ///< @brief Deserialize the Header
-
+
private:
Ptr<Name> m_name;
Time m_freshness;
Time m_timestamp;
};
-typedef ContentObject ContentObjectHeader;
+typedef ContentObject ContentObjectHeader;
/**
* ContentObjectTail for compatibility with other packet formats
@@ -137,7 +137,7 @@
public:
ContentObjectTail ();
//////////////////////////////////////////////////////////////////
-
+
static TypeId GetTypeId (void); ///< @brief Get TypeId
virtual TypeId GetInstanceTypeId (void) const; ///< @brief Get TypeId of the instance
virtual void Print (std::ostream &os) const; ///< @brief Print out information about Tail into the stream
@@ -149,7 +149,7 @@
/**
* @ingroup ndn-exceptions
- * @brief Class for ContentObject parsing exception
+ * @brief Class for ContentObject parsing exception
*/
class ContentObjectException {};