build: move to C++17

UCLA-IRL · May 10, 2023 · debd6c5 · debd6c5
1 parent 3dc7749
commit debd6c5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,7 +7,7 @@ project(nac-abe
  DESCRIPTION "NDN Name-based access control - attribute based encryption library")
 
 # flags
-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED True)
 if (HAVE_TESTS)
  add_compile_definitions(HAVE_TESTS)

diff --git a/src/trust-config.cpp b/src/trust-config.cpp
@@ -68,15 +68,15 @@ TrustConfig::addOrUpdateCertificate(const security::Certificate& certificate)
  }
 }
 
-optional<security::Certificate>
+std::optional<security::Certificate>
 TrustConfig::findCertificate(const Name& identityName) const
 {
  auto search = m_knownIdentities.find(identityName);
  if (search != m_knownIdentities.end()) {
  return make_optional(search->second);
  }
  else {
- return nullopt;
+ return std::nullopt;
  }
 }
 

diff --git a/src/trust-config.hpp b/src/trust-config.hpp
@@ -37,7 +37,7 @@ class TrustConfig
  void
  addOrUpdateCertificate(const security::Certificate& certificate);
 
- optional<security::Certificate>
+ std::optional<security::Certificate>
  findCertificate(const Name& identityName) const;
 
 private: