commit cfdc14fe6c996243299d594740d63a74afad101e
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Mar 15 14:38:44 2013 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Mar 15 15:16:22 2013 -0700
tree 4e219e5a6cf585e3b321d853c202dfa19c12c9c2
parent 30ca19c196512100f1ed6cfc5ba12cecf6ae89a2

all: Replacing deprecated NameComponents class with Name

NameComponents is kept for backwards compatibility as typedef to Name

refs #29

test/ndnSIM-trie.cc

diff --git a/test/ndnSIM-trie.cc b/test/ndnSIM-trie.cc
index ed8356e..ee53ad4 100644
--- a/test/ndnSIM-trie.cc
+++ b/test/ndnSIM-trie.cc
@@ -60,7 +60,7 @@
 {
   cerr << "TrieTest is temporarily broken" << endl;
   // typedef trie_with_policy<
-  //   ns3::NdnNameComponents,
+  //   ns3::NdnName,
   //   smart_pointer_payload_traits<Integer>,
   //   multi_policy_traits<
   //     mpl::vector2<lru_policy_traits,random_policy_traits>
@@ -75,7 +75,7 @@
   
   // // // // x.getTrie ().PrintStat (std::cout);
   
-  // ns3::NdnNameComponents n1,n2,n3,n4;
+  // ns3::NdnName n1,n2,n3,n4;
   // // // // n1("a")("b")("c");
   // // // // n2("a")("b")("d");
   // // // // n3("a")("b")("f");
@@ -108,12 +108,12 @@
   // node->AggregateObject (fib);
   // Ptr<ndn::Face> face = CreateObject<ndn::AppFace> (app);
 
-  // fib->Add (lexical_cast<ndn::NameComponents> ("/bla"), face, 1);
-  // fib->Add (lexical_cast<ndn::NameComponents> ("/bla/1"), face, 1);
-  // fib->Add (lexical_cast<ndn::NameComponents> ("/bla/2"), face, 1);
-  // fib->Add (lexical_cast<ndn::NameComponents> ("/bla/3"), face, 1);
-  // fib->Add (lexical_cast<ndn::NameComponents> ("/bla/1/1"), face, 1);
-  // fib->Add (lexical_cast<ndn::NameComponents> ("/bla/1/2"), face, 1);
+  // fib->Add (lexical_cast<ndn::Name> ("/bla"), face, 1);
+  // fib->Add (lexical_cast<ndn::Name> ("/bla/1"), face, 1);
+  // fib->Add (lexical_cast<ndn::Name> ("/bla/2"), face, 1);
+  // fib->Add (lexical_cast<ndn::Name> ("/bla/3"), face, 1);
+  // fib->Add (lexical_cast<ndn::Name> ("/bla/1/1"), face, 1);
+  // fib->Add (lexical_cast<ndn::Name> ("/bla/1/2"), face, 1);
   
   // cout << *fib << endl;
 
@@ -125,7 +125,7 @@
   //     std::cout << *item.payload () << " " << std::endl;
   //   }
 
-  // ns3::NdnNameComponents n4;
+  // ns3::NdnName n4;
   // n4("a")("c");
     
   // // std::cout << *x->find (n4).get<0> ();