commit e709f3d659cfb7a1c3df0f96f004995a1c6fa15f
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Sun Aug 21 17:55:45 2011 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Sun Aug 21 17:55:45 2011 -0700
tree dfaf67fcc88be50a48ec0f82fc89187e499915c9
parent 8b379058aba51cd7d0a39ecd6ee1e101e3a43c25

Make everything compile

helper/ccnb-parser/visitors/ccnb-parser-content-object-visitor.cc

diff --git a/helper/ccnb-parser/visitors/ccnb-parser-content-object-visitor.cc b/helper/ccnb-parser/visitors/ccnb-parser-content-object-visitor.cc
index 64f7d0b..d694f11 100644
--- a/helper/ccnb-parser/visitors/ccnb-parser-content-object-visitor.cc
+++ b/helper/ccnb-parser/visitors/ccnb-parser-content-object-visitor.cc
@@ -26,6 +26,10 @@
 #include "ns3/name-components.h"
 #include "ns3/assert.h"
 
+#include "ns3/ccnx-content-object-header.h"
+
+#include <boost/foreach.hpp>
+
 namespace ns3 {
 namespace CcnbParser {
 
@@ -35,7 +39,7 @@
 {
   // uint32_t n.m_dtag;
   // std::list<Ptr<Block> > n.m_nestedBlocks;
-  static NameComponentsVisitor m_nameComponentsVisitor;
+  static NameComponentsVisitor nameComponentsVisitor;
   
   CcnxContentObjectHeader &contentObject = boost::any_cast<CcnxContentObjectHeader&> (param);
   
@@ -43,7 +47,7 @@
     {
     case CCN_DTAG_ContentObject:
       // process nested blocks
-      BOOST_FOREACH (Ptr<Block> block, n.m_nestedBlocks)
+      BOOST_FOREACH (Ptr<Block> block, n.m_nestedTags)
         {
           block->accept (*this, param);
         }
@@ -53,7 +57,7 @@
         // process name components
         Ptr<Name::Components> name = Create<Name::Components> ();
         
-        BOOST_FOREACH (Ptr<Block> block, n.m_nestedBlocks)
+        BOOST_FOREACH (Ptr<Block> block, n.m_nestedTags)
           {
             block->accept (nameComponentsVisitor, *name);
           }
@@ -66,7 +70,7 @@
       break;
     case CCN_DTAG_Content: // !!! HACK
       // This hack was necessary for memory optimizations (i.e., content is virtual payload)
-      NS_ASSERT_MSG (n.m_nestedBlocks.size() == 0, "Parser should have stopped just after processing <Content> tag");
+      NS_ASSERT_MSG (n.m_nestedTags.size() == 0, "Parser should have stopped just after processing <Content> tag");
       break;
     }
 }