nlsr: removed references to ndn-cxx/common aliases and improved namespacing
Change-Id: I65e4691305b0157f334fc68d96998c119ef8b03b
refs: #3406
diff --git a/src/route/routing-table-calculator.cpp b/src/route/routing-table-calculator.cpp
index 7aa6f48..f4442f5 100644
--- a/src/route/routing-table-calculator.cpp
+++ b/src/route/routing-table-calculator.cpp
@@ -18,23 +18,21 @@
* You should have received a copy of the GNU General Public License along with
* NLSR, e.g., in COPYING.md file. If not, see <http://www.gnu.org/licenses/>.
**/
-
-#include <iostream>
-#include <cmath>
-#include "lsdb.hpp"
#include "routing-table-calculator.hpp"
+#include "lsdb.hpp"
#include "map.hpp"
#include "lsa.hpp"
#include "nexthop.hpp"
#include "nlsr.hpp"
#include "logger.hpp"
+#include <iostream>
#include <boost/math/constants/constants.hpp>
+#include <cmath>
namespace nlsr {
INIT_LOGGER("RoutingTableCalculator");
-using namespace std;
void
RoutingTableCalculator::allocateAdjMatrix()
@@ -120,7 +118,7 @@
RoutingTableCalculator::writeAdjMatrixLog()
{
for (size_t i = 0; i < m_nRouters; i++) {
- string line="";
+ std::string line="";
for (size_t j = 0; j < m_nRouters; j++) {
line += boost::lexical_cast<std::string>(adjMatrix[i][j]);
line += " ";
@@ -252,7 +250,7 @@
int v, u;
int* Q = new int[m_nRouters]; // Each cell represents the router with that mapping no.
int head = 0;
- // Initiate the Parent
+ // Initiate the parent
for (i = 0 ; i < static_cast<int>(m_nRouters); i++) {
m_parent[i] = EMPTY_PARENT;
// Array where the ith element is the distance to the router with mapping no i.