commit 4aac5571b86f90ef8a96cf0a001b05e59a94b876
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Aug 09 10:49:55 2012 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Aug 09 15:01:41 2012 -0700
tree e15d652bf5113be28cc273833069eed899163423
parent 1f288e30883993e040e42b7e56930143b057203f

First step of refactoring code (ccnx prefix => ndn prefix)

examples/trie.cc

diff --git a/examples/trie.cc b/examples/trie.cc
index 9c9cc3c..4766229 100644
--- a/examples/trie.cc
+++ b/examples/trie.cc
@@ -59,7 +59,7 @@
   args.Parse (argc, argv);
 
   // typedef trie_with_policy<
-  //   ns3::CcnxNameComponents,
+  //   ns3::NdnNameComponents,
   //   smart_pointer_payload_traits<Integer>,
   //   multi_policy_traits<
   //     mpl::vector2<lru_policy_traits,random_policy_traits>
@@ -74,7 +74,7 @@
   
   // // // // x.getTrie ().PrintStat (std::cout);
   
-  // ns3::CcnxNameComponents n1,n2,n3,n4;
+  // ns3::NdnNameComponents n1,n2,n3,n4;
   // // // // n1("a")("b")("c");
   // // // // n2("a")("b")("d");
   // // // // n3("a")("b")("f");
@@ -98,21 +98,21 @@
 
   Ptr<Node> node = CreateObject<Node> ();
   Names::Add ("TestNode", node);
-  Ptr<CcnxApp> app = CreateObject<CcnxApp> ();
+  Ptr<NdnApp> app = CreateObject<NdnApp> ();
   node->AddApplication (app);
   
-  ObjectFactory factory ("ns3::CcnxFib");
+  ObjectFactory factory ("ns3::NdnFib");
   
-  Ptr<CcnxFib> fib = factory.Create<CcnxFib> ();
+  Ptr<NdnFib> fib = factory.Create<NdnFib> ();
   node->AggregateObject (fib);
-  Ptr<CcnxFace> face = CreateObject<CcnxAppFace> (app);
+  Ptr<NdnFace> face = CreateObject<NdnAppFace> (app);
 
-  fib->Add (lexical_cast<CcnxNameComponents> ("/bla"), face, 1);
-  fib->Add (lexical_cast<CcnxNameComponents> ("/bla/1"), face, 1);
-  fib->Add (lexical_cast<CcnxNameComponents> ("/bla/2"), face, 1);
-  fib->Add (lexical_cast<CcnxNameComponents> ("/bla/3"), face, 1);
-  fib->Add (lexical_cast<CcnxNameComponents> ("/bla/1/1"), face, 1);
-  fib->Add (lexical_cast<CcnxNameComponents> ("/bla/1/2"), face, 1);
+  fib->Add (lexical_cast<NdnNameComponents> ("/bla"), face, 1);
+  fib->Add (lexical_cast<NdnNameComponents> ("/bla/1"), face, 1);
+  fib->Add (lexical_cast<NdnNameComponents> ("/bla/2"), face, 1);
+  fib->Add (lexical_cast<NdnNameComponents> ("/bla/3"), face, 1);
+  fib->Add (lexical_cast<NdnNameComponents> ("/bla/1/1"), face, 1);
+  fib->Add (lexical_cast<NdnNameComponents> ("/bla/1/2"), face, 1);
   
   cout << *fib << endl;
 
@@ -124,7 +124,7 @@
   //     std::cout << *item.payload () << " " << std::endl;
   //   }
 
-  // ns3::CcnxNameComponents n4;
+  // ns3::NdnNameComponents n4;
   // n4("a")("c");
     
   // // std::cout << *x->find (n4).get<0> ();