src: Replace Tokenizer with the methods of ndn::Name
Purpose of this commit is to replace Tokenizer in all
places except conf-file-processor.*pp with the methods
of ndn::Name. One static method in class NameHelper
is added. Tokenizer will be removed finally when
configuration file parsing commit is complete.
Refs: 1533
Change-Id: I14a67655eb963c5cc5b045c3c9f7d516e405ff19
diff --git a/src/adjacency-list.hpp b/src/adjacency-list.hpp
index a88a6ba..c3c2195 100644
--- a/src/adjacency-list.hpp
+++ b/src/adjacency-list.hpp
@@ -21,31 +21,31 @@
insert(Adjacent& adjacent);
int32_t
- updateAdjacentStatus(const std::string& adjName, int32_t s);
+ updateAdjacentStatus(const ndn::Name& adjName, int32_t s);
int32_t
- updateAdjacentLinkCost(const std::string& adjName, double lc);
+ updateAdjacentLinkCost(const ndn::Name& adjName, double lc);
std::list<Adjacent>&
getAdjList();
bool
- isNeighbor(const std::string& adjName);
+ isNeighbor(const ndn::Name& adjName);
void
- incrementTimedOutInterestCount(const std::string& neighbor);
+ incrementTimedOutInterestCount(const ndn::Name& neighbor);
int32_t
- getTimedOutInterestCount(const std::string& neighbor);
+ getTimedOutInterestCount(const ndn::Name& neighbor);
uint32_t
- getStatusOfNeighbor(const std::string& neighbor);
+ getStatusOfNeighbor(const ndn::Name& neighbor);
void
- setStatusOfNeighbor(const std::string& neighbor, int32_t status);
+ setStatusOfNeighbor(const ndn::Name& neighbor, int32_t status);
void
- setTimedOutInterestCount(const std::string& neighbor, uint32_t count);
+ setTimedOutInterestCount(const ndn::Name& neighbor, uint32_t count);
void
addAdjacents(AdjacencyList& adl);
@@ -57,7 +57,7 @@
getNumOfActiveNeighbor();
Adjacent
- getAdjacent(const std::string& adjName);
+ getAdjacent(const ndn::Name& adjName);
bool
operator==(AdjacencyList& adl);
@@ -82,7 +82,7 @@
private:
std::list<Adjacent>::iterator
- find(std::string adjName);
+ find(const ndn::Name& adjName);
private:
std::list<Adjacent> m_adjList;