[cpp-sp] branch main updated: Move IIS support code into platform section of main lib.

[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=202e33307e1d04d30e10658352d6f2ae21edbeb7

The following commit(s) were added to refs/heads/main by this push:
     new 202e3330 Move IIS support code into platform section of main lib.
202e3330 is described below

commit 202e33307e1d04d30e10658352d6f2ae21edbeb7
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Jan 14 09:04:32 2025 -0500

    Move IIS support code into platform section of main lib.
---
 shibsp/Makefile.am                                        | 6 ++++++
 {iis7_shib => shibsp/platform/iis}/ModuleConfig.cpp       | 8 ++++----
 {iis7_shib/headers => shibsp/platform/iis}/ModuleConfig.h | 0
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/shibsp/Makefile.am b/shibsp/Makefile.am
index 3d2e11ee..3cb99420 100644
--- a/shibsp/Makefile.am
+++ b/shibsp/Makefile.am
@@ -12,6 +12,8 @@ ioincludedir = $(includedir)/shibsp/io
 
 logincludedir = $(includedir)/shibsp/logging
 
+iisincludedir = $(includedir)/shibsp/platform/iis
+
 remincludedir = $(includedir)/shibsp/remoting
 
 sessionincludedir = $(includedir)/shibsp/session
@@ -59,6 +61,9 @@ loginclude_HEADERS = \
 	logging/LoggingService.h \
 	logging/Priority.h
 
+iisinclude_HEADERS = \
+	platform/iis/ModuleConfig.h
+
 reminclude_HEADERS = \
 	remoting/ddf.h \
 	remoting/RemotingService.h
@@ -120,6 +125,7 @@ libshibsp_la_SOURCES = \
 	logging/impl/Priority.cpp \
 	logging/impl/StringUtil.cpp \
 	logging/impl/SyslogLoggingService.cpp \
+	platform/iis/ModuleConfig.cpp \
 	remoting/impl/ddf.cpp \
 	remoting/impl/RemotingService.cpp \
 	session/impl/AbstractSessionCache.cpp \
diff --git a/iis7_shib/ModuleConfig.cpp b/shibsp/platform/iis/ModuleConfig.cpp
similarity index 96%
rename from iis7_shib/ModuleConfig.cpp
rename to shibsp/platform/iis/ModuleConfig.cpp
index ad297e04..9cd77447 100644
--- a/iis7_shib/ModuleConfig.cpp
+++ b/shibsp/platform/iis/ModuleConfig.cpp
@@ -59,7 +59,7 @@ ModuleConfig::ModuleConfig() {}
 ModuleConfig::~ModuleConfig() {}
 
 ModuleConfigImpl::ModuleConfigImpl(unique_ptr<ptree> pt, bool xml)
-    : m_log(Category::getInstance(SHIBSP_LOGCAT ".IIS")), m_root(move(pt))
+    : m_log(Category::getInstance(SHIBSP_LOGCAT ".IIS")), m_root(std::move(pt))
 {
     if (xml) {
         // Size was checked by caller as 1, so a single child exists.
@@ -124,7 +124,7 @@ void ModuleConfigImpl::doSites(ptree& parent)
                 child.second.add("<xmlattr>.aliases", aliases);
             }
 
-            m_sites[id] = move(propset);
+            m_sites[id] = std::move(propset);
             m_log.info("installed Site mapping for (%s)", id);
         }
         else if (child.first == "<xmlattr>" || child.first == "Roles") {
@@ -140,7 +140,7 @@ void ModuleConfigImpl::doSites(ptree& parent)
 
             unique_ptr<BoostPropertySet> propset(new BoostPropertySet());
             propset->load(child.second);
-            m_sites[child.first] = move(propset);
+            m_sites[child.first] = std::move(propset);
             m_log.info("installed Site mapping for (%s)", child.first.c_str());
         }
     }
@@ -178,5 +178,5 @@ unique_ptr<ModuleConfig> ModuleConfig::newModuleConfig()
         ini_parser::read_ini(path, *config_root);
     }
 
-    return unique_ptr<ModuleConfig>(new ModuleConfigImpl(move(config_root), xml));
+    return unique_ptr<ModuleConfig>(new ModuleConfigImpl(std::move(config_root), xml));
 }
diff --git a/iis7_shib/headers/ModuleConfig.h b/shibsp/platform/iis/ModuleConfig.h
similarity index 100%
rename from iis7_shib/headers/ModuleConfig.h
rename to shibsp/platform/iis/ModuleConfig.h

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