all: InterestHeader and ContentObjectHeader refactoring to Interest and ContentObject
refs #29
diff --git a/disabled/ccnb-parser/visitors/interest-visitor.cc b/disabled/ccnb-parser/visitors/interest-visitor.cc
index e7fe598..4e7b8ca 100644
--- a/disabled/ccnb-parser/visitors/interest-visitor.cc
+++ b/disabled/ccnb-parser/visitors/interest-visitor.cc
@@ -46,7 +46,7 @@
// We don't care about any other fields
void
-InterestVisitor::visit (Dtag &n, boost::any param/*should be InterestHeader* */)
+InterestVisitor::visit (Dtag &n, boost::any param/*should be Interest* */)
{
// uint32_t n.m_dtag;
// std::list<Ptr<Block> > n.m_nestedBlocks;
@@ -56,7 +56,7 @@
static TimestampVisitor timestampVisitor;
static Uint32tBlobVisitor nonceVisitor;
- InterestHeader &interest = *(boost::any_cast<InterestHeader*> (param));
+ Interest &interest = *(boost::any_cast<Interest*> (param));
switch (n.m_dtag)
{
diff --git a/disabled/ccnb-parser/visitors/interest-visitor.h b/disabled/ccnb-parser/visitors/interest-visitor.h
index f78d07f..38a969d 100644
--- a/disabled/ccnb-parser/visitors/interest-visitor.h
+++ b/disabled/ccnb-parser/visitors/interest-visitor.h
@@ -29,11 +29,11 @@
/**
* \ingroup ccnx-ccnb
- * \brief Visitor that fills fields in CcnxInterestHeader
+ * \brief Visitor that fills fields in CcnxInterest
*
* Usage example:
* \code
- * Ptr<CcnxInterestHeader> header = Create<CcnxInterestHeader> ();
+ * Ptr<CcnxInterest> header = Create<CcnxInterest> ();
* Ptr<CcnbParser::Block> root = CcnbParser::Block::ParseBlock (i);
* InterestVisitor visitor;
* root->accept (visitor, *header);
@@ -42,7 +42,7 @@
class InterestVisitor : public VoidDepthFirstVisitor
{
public:
- virtual void visit (Dtag &n, boost::any param/*should be CcnxInterestHeader* */);
+ virtual void visit (Dtag &n, boost::any param/*should be CcnxInterest* */);
};
} // namespace CcnbParser