commit 997669a248342eaed11f0826039b5a8aa60480ec
author Zhiyi Zhang <zhiyi@cs.ucla.edu> Wed Oct 28 21:15:40 2020 -0700
committer Zhiyi Zhang <zhiyi@cs.ucla.edu> Wed Oct 28 21:15:40 2020 -0700
tree 52eac8b2fc17d4ca3903c41455d2569a19c26494
parent 8693410ce39dec160778231ed6952e462c346220

use ndn::optional instead of boost::optional

Change-Id: If4db620ac410ddf5d8a082b26bdc8fef0b4c1b46

src/configuration.cpp

diff --git a/src/configuration.cpp b/src/configuration.cpp
index aab0df5..78c7e61 100644
--- a/src/configuration.cpp
+++ b/src/configuration.cpp
@@ -53,7 +53,11 @@
   // CA max validity period
   m_maxValidityPeriod = time::seconds(configJson.get(CONFIG_MAX_VALIDITY_PERIOD, 86400));
   // CA max suffix length
-  m_maxSuffixLength = configJson.get_optional<size_t>(CONFIG_MAX_SUFFIX_LENGTH);
+  m_maxSuffixLength = nullopt;
+  auto maxSuffixLength = configJson.get_optional<size_t>(CONFIG_MAX_SUFFIX_LENGTH);
+  if (maxSuffixLength.has_value()) {
+    m_maxSuffixLength = *maxSuffixLength;
+  }
   // probe parameter keys
   m_probeParameterKeys.clear();
   auto probeParametersJson = configJson.get_child_optional(CONFIG_PROBE_PARAMETERS);
@@ -99,7 +103,9 @@
   caItem.put(CONFIG_CA_PREFIX, m_caPrefix.toUri());
   caItem.put(CONFIG_CA_INFO, m_caInfo);
   caItem.put(CONFIG_MAX_VALIDITY_PERIOD, m_maxValidityPeriod.count());
-  caItem.put(CONFIG_MAX_SUFFIX_LENGTH, m_maxSuffixLength);
+  if (m_maxSuffixLength) {
+    caItem.put(CONFIG_MAX_SUFFIX_LENGTH, *m_maxSuffixLength);
+  }
   if (!m_probeParameterKeys.empty()) {
     JsonSection probeParametersJson;
     for (const auto& key : m_probeParameterKeys) {
@@ -144,7 +150,7 @@
     NDN_THROW(std::runtime_error("At least one challenge should be specified."));
   }
   // parse redirection section if appears
-  m_redirection = boost::none;
+  m_redirection = nullopt;
   auto redirectionItems = configJson.get_child_optional(CONFIG_REDIRECTION);
   if (redirectionItems) {
     for (const auto& item : *redirectionItems) {