In common.h, remove Ptr. In interest.h, etc. typedef InterestPtr and ConstInterestPtr, etc.
We will centralize and allow these to be typedef as boost::shared_ptr
or std::shared_ptr.
diff --git a/test/test-boost-header-only.cpp b/test/test-boost-header-only.cpp
index ebc8553..03f3efa 100644
--- a/test/test-boost-header-only.cpp
+++ b/test/test-boost-header-only.cpp
@@ -19,17 +19,17 @@
*
*/
int main(int argc, char** argv) {
- Interest interest;
- interest.setName(Name("/test"));
- interest.setMinSuffixComponents(2);
- interest.setMaxSuffixComponents(2);
- interest.setInterestLifetime(boost::posix_time::seconds(10));
- interest.setScope(Interest::SCOPE_LOCAL_CCND);
- interest.setAnswerOriginKind(Interest::AOK_STALE);
- interest.setChildSelector(Interest::CHILD_RIGHT);
+ InterestPtr interest(new Interest());
+ interest->setName(Name("/test"));
+ interest->setMinSuffixComponents(2);
+ interest->setMaxSuffixComponents(2);
+ interest->setInterestLifetime(boost::posix_time::seconds(10));
+ interest->setScope(Interest::SCOPE_LOCAL_CCND);
+ interest->setAnswerOriginKind(Interest::AOK_STALE);
+ interest->setChildSelector(Interest::CHILD_RIGHT);
// i.setPublisherPublicKeyDigest(?);
ostringstream binary;
- wire::Ccnb::appendInterest(binary, interest);
+ wire::Ccnb::appendInterest(binary, *interest);
cout << binary.str().size();
return 0;