commit 0a7da61b458da4639533ceb1e85f48b086a6bc80
author Vince Lehman <vslehman@memphis.edu> Wed Oct 29 14:39:29 2014 -0500
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Oct 30 10:43:53 2014 -0700
tree b14e2a3020934cdf3200700a9476b35f9f159ea6
parent 7c8882ffac6dd1a4ae516212c0bde838d60b9280

Always build in C++11 mode

refs: #1930

Change-Id: Iedad4a814e5c7e6a5486f2f7e16c45c356131792

src/route/face-map.cpp

diff --git a/src/route/face-map.cpp b/src/route/face-map.cpp
index 7251fc5..398ed4f 100644
--- a/src/route/face-map.cpp
+++ b/src/route/face-map.cpp
@@ -23,6 +23,8 @@
 #include <iostream>
 #include <list>
 #include <utility>
+
+#include "common.hpp"
 #include "logger.hpp"
 #include "face-map.hpp"
 

src/route/face-map.hpp

diff --git a/src/route/face-map.hpp b/src/route/face-map.hpp
index 4bc2b68..ccd801b 100644
--- a/src/route/face-map.hpp
+++ b/src/route/face-map.hpp
@@ -24,6 +24,7 @@
 #define NLSR_FACE_MAP_HPP
 
 #include <ndn-cxx/common.hpp>
+#include <algorithm>
 
 namespace nlsr {
 

src/route/fib.cpp

diff --git a/src/route/fib.cpp b/src/route/fib.cpp
index 16ed8a8..efc8a45 100644
--- a/src/route/fib.cpp
+++ b/src/route/fib.cpp
@@ -25,6 +25,7 @@
 #include <ndn-cxx/common.hpp>
 
 #include "adjacency-list.hpp"
+#include "common.hpp"
 #include "conf-parameter.hpp"
 #include "nexthop-list.hpp"
 #include "face-map.hpp"
@@ -345,6 +346,11 @@
   }
 }
 
+typedef void(Fib::*RegisterPrefixCallback)(const ndn::nfd::ControlParameters&,
+                                           const ndn::nfd::ControlParameters&, uint8_t,
+                                           const CommandSucceedCallback&,
+                                           const CommandFailCallback&);
+
 void
 Fib::registerPrefix(const ndn::Name& namePrefix,
                     const std::string& faceUri,
@@ -364,9 +370,8 @@
     .setExpirationPeriod(timeout)
     .setOrigin(128);
   createFace(faceUri,
-             ndn::bind(&Fib::registerPrefixInNfd, this,_1,
-                       parameters,
-                       times, onSuccess, onFailure),
+             ndn::bind(static_cast<RegisterPrefixCallback>(&Fib::registerPrefixInNfd),
+                       this, _1, parameters, times, onSuccess, onFailure),
              onFailure);
 }
 

src/route/name-prefix-table-entry.cpp

diff --git a/src/route/name-prefix-table-entry.cpp b/src/route/name-prefix-table-entry.cpp
index 1d20319..383a00c 100644
--- a/src/route/name-prefix-table-entry.cpp
+++ b/src/route/name-prefix-table-entry.cpp
@@ -22,6 +22,8 @@
  **/
 #include <list>
 #include <utility>
+
+#include "common.hpp"
 #include "name-prefix-table-entry.hpp"
 #include "routing-table-entry.hpp"
 #include "nexthop.hpp"

src/route/nexthop-list.cpp

diff --git a/src/route/nexthop-list.cpp b/src/route/nexthop-list.cpp
index 9ef6fd3..7002ad8 100644
--- a/src/route/nexthop-list.cpp
+++ b/src/route/nexthop-list.cpp
@@ -21,6 +21,8 @@
  *
  **/
 #include <iostream>
+
+#include "common.hpp"
 #include "nexthop-list.hpp"
 #include "nexthop.hpp"
 #include "logger.hpp"