commit b310a9aec289bc483db0363a67f36a6c7bcb7f0d
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Jul 20 15:29:56 2012 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Jul 20 15:29:56 2012 -0700
tree 96e672aaa7bd19f6f020514e03428285811b3e49
parent e55d1e35168530d76a1f23ee574c2cd219c17855

Renaming methods so it works without errors with boost::bind (for some
reason one version of gcc started to complain)

model/fib/ccnx-fib-impl.cc

diff --git a/model/fib/ccnx-fib-impl.cc b/model/fib/ccnx-fib-impl.cc
index 107f072..90f0cd8 100644
--- a/model/fib/ccnx-fib-impl.cc
+++ b/model/fib/ccnx-fib-impl.cc
@@ -154,7 +154,7 @@
 }
 
 void
-CcnxFibImpl::Remove (super::parent_trie &item, Ptr<CcnxFace> face)
+CcnxFibImpl::RemoveFace (super::parent_trie &item, Ptr<CcnxFace> face)
 {
   if (item.payload () == 0) return;
   NS_LOG_FUNCTION (this);
@@ -170,7 +170,7 @@
 
   std::for_each (super::parent_trie::recursive_iterator (super::getTrie ()),
                  super::parent_trie::recursive_iterator (0), 
-                 ll::bind (static_cast< void (CcnxFib::*) (super::parent_trie &, Ptr<CcnxFace>) > (&CcnxFibImpl::Remove),
+                 ll::bind (&CcnxFibImpl::RemoveFace,
                            this, ll::_1, face));
 
   super::parent_trie::recursive_iterator trieNode (super::getTrie ());

model/fib/ccnx-fib-impl.h

diff --git a/model/fib/ccnx-fib-impl.h b/model/fib/ccnx-fib-impl.h
index d85dcfd..e6da99b 100644
--- a/model/fib/ccnx-fib-impl.h
+++ b/model/fib/ccnx-fib-impl.h
@@ -142,7 +142,7 @@
    * entry will be removed
    */
   void
-  Remove (super::parent_trie &item, Ptr<CcnxFace> face);
+  RemoveFace (super::parent_trie &item, Ptr<CcnxFace> face);
   
 private:
   Ptr<Node> m_node;