Replace all uses of BOOST_THROW_EXCEPTION with NDN_THROW
Refs: #4834
Change-Id: I6c536cd321fba62d397bf8520f51d2dbba73d908
diff --git a/src/validator/certificate-fetcher-ndns-cert.cpp b/src/validator/certificate-fetcher-ndns-cert.cpp
index b1979b5..34c0774 100644
--- a/src/validator/certificate-fetcher-ndns-cert.cpp
+++ b/src/validator/certificate-fetcher-ndns-cert.cpp
@@ -57,22 +57,19 @@
return;
}
- auto query = std::make_shared<IterativeQueryController>(domain,
- label::NS_RR_TYPE,
- certRequest->interest.getInterestLifetime(),
- [=] (const Data& data, const Response& response) {
- nsSuccessCallback(data, certRequest, state, continueValidation);
- },
- [=] (uint32_t errCode, const std::string& errMsg) {
- nsFailCallback(errMsg, certRequest, state, continueValidation);
- },
- m_face,
- nullptr,
- m_nsCache.get());
+ auto query = std::make_shared<IterativeQueryController>(domain, label::NS_RR_TYPE,
+ certRequest->interest.getInterestLifetime(),
+ [=] (const Data& data, const Response&) {
+ nsSuccessCallback(data, certRequest, state, continueValidation);
+ },
+ [=] (uint32_t errCode, const std::string& errMsg) {
+ nsFailCallback(errMsg, certRequest, state, continueValidation);
+ },
+ m_face, nullptr, m_nsCache.get());
query->setStartComponentIndex(m_startComponentIndex);
query->start();
- auto queryTag = make_shared<IterativeQueryTag>(query);
- state->setTag(queryTag);
+
+ state->setTag(std::make_shared<IterativeQueryTag>(query));
}
void
@@ -100,13 +97,13 @@
}
m_face.expressInterest(interest,
- [=] (const Interest& interest, const Data& data) {
+ [=] (const Interest&, const Data& data) {
dataCallback(data, certRequest, state, continueValidation);
},
- [=] (const Interest& interest, const lp::Nack& nack) {
+ [=] (const Interest&, const lp::Nack& nack) {
nackCallback(nack, certRequest, state, continueValidation);
},
- [=] (const Interest& interest) {
+ [=] (const Interest&) {
timeoutCallback(certRequest, state, continueValidation);
});
}
@@ -143,7 +140,7 @@
return key.getPrefix(i);
}
}
- BOOST_THROW_EXCEPTION(std::runtime_error(key.toUri() + " is not a legal NDNS certificate name"));
+ NDN_THROW(std::runtime_error(key.toUri() + " is not a legal NDNS certificate name"));
}
void