[cpp-sp] branch main updated: Various fixes for C++11 and older.

[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=fe438c184717b5e7f80f3522f1632e181b192e9a

The following commit(s) were added to refs/heads/main by this push:
     new fe438c18 Various fixes for C++11 and older.
fe438c18 is described below

commit fe438c184717b5e7f80f3522f1632e181b192e9a
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Oct 20 09:14:27 2025 -0400

    Various fixes for C++11 and older.
---
 shibsp/session/impl/AbstractSessionCache.cpp   |  2 +-
 shibsp/session/impl/FilesystemSessionCache.cpp |  2 +-
 shibsp/session/impl/MemorySessionCache.cpp     |  2 +-
 shibsp/util/ReloadableXMLFile.cpp              | 24 ++++++++++++++++++------
 4 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/shibsp/session/impl/AbstractSessionCache.cpp b/shibsp/session/impl/AbstractSessionCache.cpp
index e1f3b683..616df5fa 100644
--- a/shibsp/session/impl/AbstractSessionCache.cpp
+++ b/shibsp/session/impl/AbstractSessionCache.cpp
@@ -710,7 +710,7 @@ void* AbstractSessionCache::cleanup_fn(void* p)
     }
 
     mutex internal_mutex;
-    unique_lock lock(internal_mutex);
+    unique_lock<mutex> lock(internal_mutex);
 
     pcache->m_log.info("cleanup thread started...run every %u secs, timeout after %u secs", cleanupInterval, inprocTimeout);
 
diff --git a/shibsp/session/impl/FilesystemSessionCache.cpp b/shibsp/session/impl/FilesystemSessionCache.cpp
index 2932688b..176e4f6d 100644
--- a/shibsp/session/impl/FilesystemSessionCache.cpp
+++ b/shibsp/session/impl/FilesystemSessionCache.cpp
@@ -554,7 +554,7 @@ void* FilesystemSessionCache::file_cleanup_fn(void* p)
     }
 
     mutex internal_mutex;
-    unique_lock lock(internal_mutex);
+    unique_lock<mutex> lock(internal_mutex);
 
     pcache->m_spilog.info("file cleanup thread started...run every %u secs, purge after %u seconds of disuse",
         pcache->m_cleanupInterval, pcache->m_fileTimeout);
diff --git a/shibsp/session/impl/MemorySessionCache.cpp b/shibsp/session/impl/MemorySessionCache.cpp
index 5233aa3f..779ac8a1 100644
--- a/shibsp/session/impl/MemorySessionCache.cpp
+++ b/shibsp/session/impl/MemorySessionCache.cpp
@@ -307,7 +307,7 @@ void* MemorySessionCache::memory_cleanup_fn(void* p)
 #endif
 
     mutex internal_mutex;
-    unique_lock lock(internal_mutex);
+    unique_lock<mutex> lock(internal_mutex);
 
     pcache->m_spilog.info("memory back-end cleanup thread started...run every %u secs, timeout after %u secs",
         pcache->m_cleanupInterval, memoryTimeout);
diff --git a/shibsp/util/ReloadableXMLFile.cpp b/shibsp/util/ReloadableXMLFile.cpp
index 997959a0..3a041e88 100644
--- a/shibsp/util/ReloadableXMLFile.cpp
+++ b/shibsp/util/ReloadableXMLFile.cpp
@@ -157,28 +157,34 @@ pair<bool,ptree*> ReloadableXMLFile::load() noexcept
 
 void ReloadableXMLFile::lock()
 {
+#ifdef HAVE_CXX14
     if (m_lock) {
         m_lock->lock();
     }
+#endif
 }
 
 bool ReloadableXMLFile::try_lock()
 {
+#ifdef HAVE_CXX14
     if (m_lock) {
         return m_lock->try_lock();
-    } else {
-        return true;
     }
+#endif
+    return true;
 }
 
 void ReloadableXMLFile::unlock()
 {
+#ifdef HAVE_CXX14
     if (m_lock)
         m_lock->unlock();
+#endif
 }
 
 void ReloadableXMLFile::lock_shared()
 {
+#ifdef HAVE_CXX14
     if (!m_lock) {
         return;
     }
@@ -201,18 +207,24 @@ void ReloadableXMLFile::lock_shared()
     load();
 
     m_lock->lock_shared();
+#endif
 }
 
 bool ReloadableXMLFile::try_lock_shared()
 {
-    if (m_lock)
+#ifdef HAVE_CXX14
+    if (m_lock) {
         return m_lock->try_lock_shared();
-    else
-        return true;
+    }
+#endif
+    return true;
 }
 
 void ReloadableXMLFile::unlock_shared()
 {
-    if (m_lock)
+#ifdef HAVE_CXX14
+    if (m_lock) {
         m_lock->unlock_shared();
+    }
+#endif
 }

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