commit e2e0d75515108060bb6662c34a70fa3f9e3bbbdc
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Jan 03 13:30:30 2014 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Jan 09 15:13:56 2014 -0800
tree 289cb4afc23458da98a3c6b0faf8fed7e623de2c
parent 96d914ffd9f7c88de5bff8af8a710172e6d1faae

face+transport: Cleanup and preparation for implementation of fully async Face operations

Change-Id: I7816b6a9c99a0cf4825459b9652372d6585a5191

src/face.cpp

diff --git a/src/face.cpp b/src/face.cpp
index f5ce755..9faabe9 100644
--- a/src/face.cpp
+++ b/src/face.cpp
@@ -13,17 +13,20 @@
   
 uint64_t 
 Face::expressInterest
-  (const Name& name, const Interest *interestTemplate, const OnData& onData, const OnTimeout& onTimeout,
-   WireFormat& wireFormat)
+  (const Name& name, const Interest *interestTemplate, const OnData& onData, const OnTimeout& onTimeout)
 {
   if (interestTemplate)
     return node_.expressInterest(Interest
-      (name, interestTemplate->getMinSuffixComponents(), interestTemplate->getMaxSuffixComponents(),
-       interestTemplate->getPublisherPublicKeyDigest(), interestTemplate->getExclude(),
-       interestTemplate->getChildSelector(), interestTemplate->getAnswerOriginKind(),
-       interestTemplate->getScope(), interestTemplate->getInterestLifetimeMilliseconds()), onData, onTimeout, wireFormat);
+      (name,
+       interestTemplate->getMinSuffixComponents(), interestTemplate->getMaxSuffixComponents(),
+       interestTemplate->getExclude(),
+       interestTemplate->getChildSelector(),
+       interestTemplate->getMustBeFresh(),
+       interestTemplate->getScope(),
+       interestTemplate->getInterestLifetime()),
+      onData, onTimeout);
   else
-    return node_.expressInterest(Interest(name, 4000.0), onData, onTimeout, wireFormat);  
+    return node_.expressInterest(Interest(name, 4000.0), onData, onTimeout);  
 }
 
 void