[cpp-sp] branch main updated: Remove newer Boost.Optional method for compatibility.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch main
in repository cpp-sp.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=a5c7877342f6e9b364fa0c04193b196740d00222

The following commit(s) were added to refs/heads/main by this push:
     new a5c78773 Remove newer Boost.Optional method for compatibility.
a5c78773 is described below

commit a5c7877342f6e9b364fa0c04193b196740d00222
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Fri Oct 17 09:08:25 2025 -0400

    Remove newer Boost.Optional method for compatibility.
---
 shibsp/handler/impl/AbstractHandler.cpp | 2 +-
 shibsp/platform/iis/ModuleConfig.cpp    | 2 +-
 shibsp/util/BoostPropertySet.cpp        | 5 ++---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/shibsp/handler/impl/AbstractHandler.cpp b/shibsp/handler/impl/AbstractHandler.cpp
index 42fc56be..f8c07510 100644
--- a/shibsp/handler/impl/AbstractHandler.cpp
+++ b/shibsp/handler/impl/AbstractHandler.cpp
@@ -674,7 +674,7 @@ bool AbstractHandler::getBool(
         if (param && *param) {
             string_to_bool_translator tr;
             boost::optional<bool> ret = tr.get_value(param);
-            if (ret.has_value()) {
+            if (ret) {
                 return ret.get();
             }
         }
diff --git a/shibsp/platform/iis/ModuleConfig.cpp b/shibsp/platform/iis/ModuleConfig.cpp
index 8eb87a01..a44950d5 100644
--- a/shibsp/platform/iis/ModuleConfig.cpp
+++ b/shibsp/platform/iis/ModuleConfig.cpp
@@ -159,7 +159,7 @@ void ModuleConfigImpl::doSites(ptree& parent)
         else {
             // This is assumed to be an INI format site section. If not, so be it.
 
-            if (!child.second.get_child_optional(SITE_NAME_PROP_NAME).has_value()) {
+            if (!child.second.get_child_optional(SITE_NAME_PROP_NAME)) {
                 m_log.warn("ignoring Site section (%s) with no '%s' property", child.first.c_str(), SITE_NAME_PROP_NAME);
                 continue;
             }
diff --git a/shibsp/util/BoostPropertySet.cpp b/shibsp/util/BoostPropertySet.cpp
index 75a35397..1d982b8c 100644
--- a/shibsp/util/BoostPropertySet.cpp
+++ b/shibsp/util/BoostPropertySet.cpp
@@ -81,9 +81,8 @@ void BoostPropertySet::load(const ptree& pt, const char* unsetter)
 bool BoostPropertySet::hasProperty(const char* name) const
 {
     if (m_pt) {
-        bool ret = m_pt->get_child_optional(name).has_value();
-        if (ret) {
-            return ret;
+        if (m_pt->get_child_optional(name)) {
+            return true;
         }
     }
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.