Migrate to C++17 and refactor
Change-Id: I53407266939258990a1c3a9363c3ebe9ea113fd2
diff --git a/src/requester-request.hpp b/src/requester-request.hpp
index 0f8447a..729d106 100644
--- a/src/requester-request.hpp
+++ b/src/requester-request.hpp
@@ -27,8 +27,7 @@
#include <ndn-cxx/security/key-chain.hpp>
-namespace ndncert {
-namespace requester {
+namespace ndncert::requester {
class Request : boost::noncopyable
{
@@ -61,7 +60,7 @@
* @return the CaProfile if decoding is successful
* @throw std::runtime_error if the decoding fails or receiving an error packet.
*/
- static optional<CaProfile>
+ static std::optional<CaProfile>
onCaProfileResponse(const Data& reply);
/**
@@ -76,7 +75,7 @@
* @return the CaProfile if decoding is successful
* @throw std::runtime_error if the decoding fails or receiving an error packet.
*/
- static optional<CaProfile>
+ static std::optional<CaProfile>
onCaProfileResponseAfterRedirection(const Data& reply, const Name& caCertFullName);
/**
@@ -276,7 +275,6 @@
ndn::security::Key m_keyPair;
};
-} // namespace requester
-} // namespace ndncert
+} // namespace ndncert::requester
#endif // NDNCERT_REQUESTER_REQUEST_HPP