commit 66f4c4986885577f29d1012ec4b4c06d49f30f19
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Sun Jan 20 23:32:50 2013 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Sun Jan 20 23:32:50 2013 -0800
tree 2e04dcd34888c245d185406a3351510429685ec5
parent dac8492d701d8b2cbbbedaa06ed5cc42c9ec2049

Checkpoint towards Fetcher with forwarding hint support

ccnx/ccnx-name.cpp

diff --git a/ccnx/ccnx-name.cpp b/ccnx/ccnx-name.cpp
index a59cf8a..4573ed1 100644
--- a/ccnx/ccnx-name.cpp
+++ b/ccnx/ccnx-name.cpp
@@ -155,6 +155,14 @@
 }
 
 Name &
+Name::appendComp(const Name &comp)
+{
+  m_comps.insert (m_comps.end (),
+                  comp.m_comps.begin (), comp.m_comps.end ());
+  return *this;
+}
+
+Name &
 Name::appendComp(const Bytes &comp)
 {
   m_comps.push_back(comp);
@@ -169,16 +177,6 @@
 }
 
 Name &
-Name::appendComp(const Name &name)
-{
-  for (vector<Bytes>::const_iterator i = name.m_comps.begin (); i != name.m_comps.end (); i++)
-    {
-      appendComp (*i);
-    }
-  return *this;
-}
-
-Name &
 Name::appendComp (const void *buf, size_t size)
 {
   Bytes comp (reinterpret_cast<const unsigned char*> (buf), reinterpret_cast<const unsigned char*> (buf) + size);
@@ -190,7 +188,7 @@
 {
   Bytes comp;
   comp.push_back (0);
-  
+
   while (number > 0)
     {
       comp.push_back (static_cast<unsigned char> (number & 0xFF));