src: Renaming class to spell out them (Adl, Nhl, Npl, Npt, Npte)
Refs: #1534
Change-Id: If4a205e8ad2419505cc796027a5c863471ef5439
diff --git a/src/route/map.hpp b/src/route/map.hpp
index bdacd4d..cc08771 100644
--- a/src/route/map.hpp
+++ b/src/route/map.hpp
@@ -3,52 +3,16 @@
#include <iostream>
#include <list>
+#include <boost/cstdint.hpp>
-#include <ndn-cxx/face.hpp>
+#include <ndn-cxx/common.hpp>
+
+#include "map-entry.hpp"
namespace nlsr {
class Nlsr;
-class MapEntry
-{
-public:
- MapEntry()
- : m_router()
- , m_mappingNumber(-1)
- {
- }
-
- ~MapEntry()
- {
- }
-
- MapEntry(std::string rtr, int mn)
- {
- m_router = rtr;
- m_mappingNumber = mn;
- }
-
- std::string
- getRouter() const
- {
- return m_router;
- }
-
- int
- getMappingNumber() const
- {
- return m_mappingNumber;
- }
-
-private:
- std::string m_router;
- int m_mappingNumber;
-};
-
-std::ostream&
-operator<<(std::ostream& os, MapEntry& mpe);
-
class Map
{
public:
@@ -59,15 +23,15 @@
void
- addElement(std::string& rtrName);
+ addEntry(const std::string& rtrName);
void
createFromAdjLsdb(Nlsr& pnlsr);
std::string
- getRouterNameByMappingNo(int mn);
+ getRouterNameByMappingNo(int32_t mn);
- int
+ int32_t
getMappingNoByRouterName(std::string& rName);
void
@@ -88,9 +52,9 @@
private:
bool
- addElement(MapEntry& mpe);
+ addEntry(MapEntry& mpe);
- int m_mappingIndex;
+ int32_t m_mappingIndex;
std::list<MapEntry> m_table;
};