[cpp-sp] 02/02: Make split_to_container compile on windows

[Rod Widdowson]

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

rdw 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=ae5f4c5b16fb0c4824d48894e91bf8265342c5c2

commit ae5f4c5b16fb0c4824d48894e91bf8265342c5c2
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Jan 10 10:45:33 2025 +0000

    Make split_to_container compile on windows
    
    Windows doesn't allow the function cannot be static in a header without being
    declared everywhere it is used.
    
    This means that it has to be defined with it's namespace
---
 shibsp/util/Misc.cpp | 4 ++--
 shibsp/util/Misc.h   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/shibsp/util/Misc.cpp b/shibsp/util/Misc.cpp
index 9afd0f06..c8e5988d 100644
--- a/shibsp/util/Misc.cpp
+++ b/shibsp/util/Misc.cpp
@@ -28,7 +28,7 @@
 using namespace shibsp;
 using namespace std;
 
-vector<string>::size_type split_to_container(vector<string>& container, const char* s)
+vector<string>::size_type shibsp::split_to_container(vector<string>& container, const char* s)
 {
     if (s) {
         string dup(s);
@@ -38,7 +38,7 @@ vector<string>::size_type split_to_container(vector<string>& container, const ch
     return container.size();
 }
 
-set<string>::size_type split_to_container(set<string>& container, const char* s)
+set<string>::size_type shibsp::split_to_container(set<string>& container, const char* s)
 {
     if (s) {
         string dup(s);
diff --git a/shibsp/util/Misc.h b/shibsp/util/Misc.h
index 5fd18b00..bceafb0a 100644
--- a/shibsp/util/Misc.h
+++ b/shibsp/util/Misc.h
@@ -61,6 +61,6 @@ namespace shibsp {
     /**
      * Splitter functions that trim the input and split on whitespace into a container.
      */
-    static std::vector<std::string>::size_type split_to_container(std::vector<std::string>& container, const char* s);
-    static std::set<std::string>::size_type split_to_container(std::set<std::string>& container, const char* s);
+    std::vector<std::string>::size_type split_to_container(std::vector<std::string>& container, const char* s);
+    std::set<std::string>::size_type split_to_container(std::set<std::string>& container, const char* s);
 };
\ No newline at end of file

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