commit 5f61ec2d83004dfa5aef5f7d54e33d7da8fe2c7c
author jeraldabraham <jeraldabraham@email.arizona.edu> Thu Mar 20 10:41:53 2014 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Mar 20 11:46:42 2014 -0700
tree 8f7bb1326ad9acad88eb96ae4e67617101223166
parent a8f2a920cd2c3248e19b914630ceeca65fba923d

build: Update for the new time structs in ndn-cpp-dev

Change-Id: I1dcf4bcc5ae74a37014652b8dc4b9b69fb2c670d
refs: #1373

ndn-traffic-client.cpp

diff --git a/ndn-traffic-client.cpp b/ndn-traffic-client.cpp
index c82b873..403bdaf 100644
--- a/ndn-traffic-client.cpp
+++ b/ndn-traffic-client.cpp
@@ -631,9 +631,9 @@
                 if (trafficPattern_[patternId].scope >= 0)
                   interest.setScope(trafficPattern_[patternId].scope);
                 if (trafficPattern_[patternId].interestLifetime >= 0)
-                  interest.setInterestLifetime(trafficPattern_[patternId].interestLifetime);
+                  interest.setInterestLifetime(time::milliseconds(trafficPattern_[patternId].interestLifetime));
                 else
-                  interest.setInterestLifetime(getDefaultInterestLifetime());
+                  interest.setInterestLifetime(time::milliseconds(getDefaultInterestLifetime()));
                 try {
                   totalInterestSent_++;
                   trafficPattern_[patternId].totalInterestSent++;

ndn-traffic-server.cpp

diff --git a/ndn-traffic-server.cpp b/ndn-traffic-server.cpp
index 0e64a39..5efcb0a 100644
--- a/ndn-traffic-server.cpp
+++ b/ndn-traffic-server.cpp
@@ -342,7 +342,7 @@
     if (trafficPattern_[patternId].contentType >= 0)
       data.setContentType(trafficPattern_[patternId].contentType);
     if (trafficPattern_[patternId].freshnessPeriod >= 0)
-      data.setFreshnessPeriod(trafficPattern_[patternId].freshnessPeriod);
+      data.setFreshnessPeriod(time::milliseconds(trafficPattern_[patternId].freshnessPeriod));
     if (trafficPattern_[patternId].contentBytes >= 0)
       content = getRandomByteString(trafficPattern_[patternId].contentBytes);
     if (trafficPattern_[patternId].content != "")