commit 62992e43c0a6067fa9b343961c2c34609ab8db65
author Jeff Thompson <jefft0@gmail.com> Mon Oct 07 18:50:51 2013 -0700
committer Jeff Thompson <jefft0@gmail.com> Mon Oct 07 18:50:51 2013 -0700
tree 9c3e1096eda71efe672566c2d49637d6e1696024
parent 32a23338d6eb8e12dbaabe930ca80f1f9cba0f69

Face: Make pendingInterestId and registeredPrefixId uint64_t.

ndn-cpp/face.hpp

diff --git a/ndn-cpp/face.hpp b/ndn-cpp/face.hpp
index 69f662d..8eab12a 100644
--- a/ndn-cpp/face.hpp
+++ b/ndn-cpp/face.hpp
@@ -47,7 +47,7 @@
    * This copies the function object, so you may need to use func_lib::ref() as appropriate.
    * @return The pending interest ID which can be used with removePendingInterest.
    */
-  unsigned int 
+  uint64_t 
   expressInterest(const Interest& interest, const OnData& onData, const OnTimeout& onTimeout = OnTimeout())
   {
     return node_.expressInterest(interest, onData, onTimeout);
@@ -64,7 +64,7 @@
    * This copies the function object, so you may need to use func_lib::ref() as appropriate.
    * @return The pending interest ID which can be used with removePendingInterest.
    */
-  unsigned int 
+  uint64_t 
   expressInterest(const Name& name, const Interest *interestTemplate, const OnData& onData, const OnTimeout& onTimeout = OnTimeout());
 
   /**
@@ -77,7 +77,7 @@
    * This copies the function object, so you may need to use func_lib::ref() as appropriate.
    * @return The pending interest ID which can be used with removePendingInterest.
    */
-  unsigned int 
+  uint64_t 
   expressInterest(const Name& name, const OnData& onData, const OnTimeout& onTimeout = OnTimeout()) 
   {
     return expressInterest(name, 0, onData, onTimeout);
@@ -90,7 +90,7 @@
    * @param pendingInterestId The ID returned from expressInterest.
    */
   void
-  removePendingInterest(unsigned int pendingInterestId)
+  removePendingInterest(uint64_t pendingInterestId)
   {
     node_.removePendingInterest(pendingInterestId);
   }
@@ -107,7 +107,7 @@
    * @param wireFormat A WireFormat object used to encode the input. If omitted, use WireFormat getDefaultWireFormat().
    * @return The registered prefix ID which can be used with removeRegisteredPrefix.
    */
-  unsigned int 
+  uint64_t 
   registerPrefix
     (const Name& prefix, const OnInterest& onInterest, const OnRegisterFailed& onRegisterFailed, const ForwardingFlags& flags = ForwardingFlags(), 
      WireFormat& wireFormat = *WireFormat::getDefaultWireFormat())
@@ -122,7 +122,7 @@
    * @param registeredPrefixId The ID returned from registerPrefix.
    */
   void
-  removeRegisteredPrefix(unsigned int registeredPrefixId)
+  removeRegisteredPrefix(uint64_t registeredPrefixId)
   {
     node_.removeRegisteredPrefix(registeredPrefixId);
   }