commit d5c48e0e199accec7fb2e364ad98d3d4662f003f
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Wed Jun 24 11:58:14 2015 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Jun 25 22:51:29 2015 -0700
tree 3ed8504d4e52c64bba83388fcac25f81b9200b13
parent 9d158f033cdda77be4ec15967477aa8808490808

encoding: Improving structure and documentation of block helpers

This commit add several new helpers to simplify operations with
std::string:

- prependStringBlock
- makeStringBlock
- readString

The following functions are deprecated and their replacements:

- nonNegativeIntegerBlock (use makeNonNegativeIntegerBlock)
- prependBooleanBlock (use prependEmptyBlock)
- booleanBlock (use makeEmptyBlock)
- dataBlock (use makeBinaryBlock)
- nestedBlock (use makeNestedBlock)

Change-Id: Ic595ae64fc9c80c2c04e5fde1d8812e8b9debd60
Refs: #2951

src/selectors.cpp

diff --git a/src/selectors.cpp b/src/selectors.cpp
index ae078e3..6e637fa 100644
--- a/src/selectors.cpp
+++ b/src/selectors.cpp
@@ -22,12 +22,12 @@
 #include "selectors.hpp"
 #include "encoding/encoding-buffer.hpp"
 #include "encoding/block-helpers.hpp"
-#include "util/concepts.hpp"
 
 namespace ndn {
 
 BOOST_CONCEPT_ASSERT((boost::EqualityComparable<Selectors>));
 BOOST_CONCEPT_ASSERT((WireEncodable<Selectors>));
+BOOST_CONCEPT_ASSERT((WireEncodableWithEncodingBuffer<Selectors>));
 BOOST_CONCEPT_ASSERT((WireDecodable<Selectors>));
 static_assert(std::is_base_of<tlv::Error, Selectors::Error>::value,
               "Selectors::Error must inherit from tlv::Error");
@@ -58,7 +58,7 @@
 
 template<encoding::Tag TAG>
 size_t
-Selectors::wireEncode(EncodingImpl<TAG>& block) const
+Selectors::wireEncode(EncodingImpl<TAG>& encoder) const
 {
   size_t totalLength = 0;
 
@@ -74,43 +74,43 @@
 
   // MustBeFresh
   if (getMustBeFresh()) {
-    totalLength += prependBooleanBlock(block, tlv::MustBeFresh);
+    totalLength += prependEmptyBlock(encoder, tlv::MustBeFresh);
   }
 
   // ChildSelector
   if (getChildSelector() >= 0) {
-    totalLength += prependNonNegativeIntegerBlock(block, tlv::ChildSelector, getChildSelector());
+    totalLength += prependNonNegativeIntegerBlock(encoder, tlv::ChildSelector, getChildSelector());
   }
 
   // Exclude
   if (!getExclude().empty()) {
-    totalLength += getExclude().wireEncode(block);
+    totalLength += getExclude().wireEncode(encoder);
   }
 
   // PublisherPublicKeyLocator
   if (!getPublisherPublicKeyLocator().empty()) {
-    totalLength += getPublisherPublicKeyLocator().wireEncode(block);
+    totalLength += getPublisherPublicKeyLocator().wireEncode(encoder);
   }
 
   // MaxSuffixComponents
   if (getMaxSuffixComponents() >= 0) {
-    totalLength += prependNonNegativeIntegerBlock(block, tlv::MaxSuffixComponents,
+    totalLength += prependNonNegativeIntegerBlock(encoder, tlv::MaxSuffixComponents,
                                                   getMaxSuffixComponents());
   }
 
   // MinSuffixComponents
   if (getMinSuffixComponents() >= 0) {
-    totalLength += prependNonNegativeIntegerBlock(block, tlv::MinSuffixComponents,
+    totalLength += prependNonNegativeIntegerBlock(encoder, tlv::MinSuffixComponents,
                                                   getMinSuffixComponents());
   }
 
-  totalLength += block.prependVarNumber(totalLength);
-  totalLength += block.prependVarNumber(tlv::Selectors);
+  totalLength += encoder.prependVarNumber(totalLength);
+  totalLength += encoder.prependVarNumber(tlv::Selectors);
   return totalLength;
 }
 
 template size_t
-Selectors::wireEncode<encoding::EncoderTag>(EncodingImpl<encoding::EncoderTag>& estimator) const;
+Selectors::wireEncode<encoding::EncoderTag>(EncodingImpl<encoding::EncoderTag>& encoder) const;
 
 template size_t
 Selectors::wireEncode<encoding::EstimatorTag>(EncodingImpl<encoding::EstimatorTag>& encoder) const;