commit 59090db0ddb47de610a0f31b71da0e44670e107d
author Alexander Afanasyev <aa@cs.fiu.edu> Fri Feb 21 16:37:43 2020 -0500
committer Alexander Afanasyev <aa@cs.fiu.edu> Sun May 31 14:23:15 2020 -0400
tree 3dbb0b85efd4708159bdb7420fc29cd4b834ce0c
parent 58233a4c3aa68a265c423d400fafb9b1720dd92a

Various fixes for NFD/ndn-cxx 0.7.0

Change-Id: I68e5d4d57d81c3f2e46fc59680cd416b06c8190c

bindings/modulegen__gcc_ILP32.py

diff --git a/bindings/modulegen__gcc_ILP32.py b/bindings/modulegen__gcc_ILP32.py
index 791a3bc..6814816 100644
--- a/bindings/modulegen__gcc_ILP32.py
+++ b/bindings/modulegen__gcc_ILP32.py
@@ -202,6 +202,7 @@
     def register_L3Protocol(cls):
         cls.add_method('getL3Protocol', 'ns3::Ptr<ns3::ndn::L3Protocol>', [param('ns3::Ptr<ns3::Object>', 'node')], is_static=True)
         cls.add_method('getForwarder', 'std::shared_ptr<ns3::ndn::nfd::Forwarder>', [])
+        cls.add_method('getFaceTable', retval('const ns3::ndn::nfd::FaceTable&', caller_manages_return=False), [], is_const=True)
     register_L3Protocol(root_module['ns3::ndn::L3Protocol'])
 
     # shared_ptr<Face>
@@ -220,7 +221,6 @@
         cls.add_method('getFib', retval('const ns3::ndn::nfd::Fib&', caller_manages_return=False), [], is_const=True)
         cls.add_method('getPit', retval('const ns3::ndn::nfd::Pit&', caller_manages_return=False), [], is_const=True)
         cls.add_method('getCs', retval('const ns3::ndn::nfd::Cs&', caller_manages_return=False), [], is_const=True)
-        cls.add_method('getFaceTable', retval('const ns3::ndn::nfd::FaceTable&', caller_manages_return=False), [], is_const=True)
     reg_NfdForwarder(root_module['ns3::ndn::nfd::Forwarder'])
 
     #############
@@ -252,7 +252,7 @@
         reg_Entry(root_module['ns3::ndn::nfd::fib::Entry'])
 
         def reg_NextHop(cls):
-            cls.add_constructor([param('const ns3::ndn::Face&', 'face'), param('uint64_t', 'endpointId')])
+            cls.add_constructor([param('const ns3::ndn::Face&', 'face')])
 
             cls.add_function_as_method('getFaceFromFibNextHop', 'std::shared_ptr<ns3::ndn::Face>',
                                        [param('const ns3::ndn::nfd::fib::NextHop&', 'obj')],