[cpp-sp] branch main updated: Change the regexp namespace to stop VC++ complaining

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

The following commit(s) were added to refs/heads/main by this push:
     new c7650cbc Change the regexp namespace to stop VC++ complaining
c7650cbc is described below

commit c7650cbc9815173fe86a799356a599e1041e7aec
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat Jan 11 16:24:45 2025 +0000

    Change the regexp namespace to stop VC++ complaining
---
 apache/mod_shib_24.cpp | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/apache/mod_shib_24.cpp b/apache/mod_shib_24.cpp
index cf050ed3..8009d14a 100644
--- a/apache/mod_shib_24.cpp
+++ b/apache/mod_shib_24.cpp
@@ -64,10 +64,10 @@
 
 #ifdef SHIBSP_USE_BOOST_REGEX
 # include <boost/regex.hpp>
-namespace exp = boost;
+namespace regexp = boost;
 #else
 # include <regex>
-namespace exp = std;
+namespace regexp = std;
 #endif
 // Apache specific header files
 #include <httpd.h>
@@ -878,10 +878,10 @@ AccessControl::aclresult_t htAccessControl::doUser(const ShibTargetApache& sta,
         if (regexp) {
             try {
                 // TODO: support regex options?
-                exp::regex re(w, exp::regex_constants::extended);
-                match = exp::regex_match(sta.getRemoteUser(), re, exp::regex_constants::match_any | exp::regex_constants::match_not_null);
+                regexp::regex re(w, regexp::regex_constants::extended);
+                match = regexp::regex_match(sta.getRemoteUser(), re, regexp::regex_constants::match_any | regexp::regex_constants::match_not_null);
             }
-            catch (const exp::regex_error& e) {
+            catch (const regexp::regex_error& e) {
                 sta.log(Priority::SHIB_ERROR,
                     string("htaccess plugin caught exception while parsing regular expression (") + w + "): " + e.what());
             }
@@ -923,10 +923,10 @@ AccessControl::aclresult_t htAccessControl::doAuthnContext(const ShibTargetApach
             bool match = false;
             if (regexp) {
                 try {
-                    exp::regex re(w, exp::regex_constants::extended);
-                    match = exp::regex_match(ref, re, exp::regex_constants::match_any | exp::regex_constants::match_not_null);
+                    regexp::regex re(w, regexp::regex_constants::extended);
+                    match = regexp::regex_match(ref, re, regexp::regex_constants::match_any | regexp::regex_constants::match_not_null);
                 }
-                catch (const exp::regex_error& e) {
+                catch (const regexp::regex_error& e) {
                     sta.log(Priority::SHIB_ERROR,
                         string("htaccess plugin caught exception while parsing regular expression (") + w + "): " + e.what());
                 }
@@ -956,18 +956,18 @@ bool htAccessControl::checkAttribute(const SPRequest& request, const Attribute*
     const vector<string>& vals = attr->getSerializedValues();
     for (vector<string>::const_iterator v = vals.begin(); v != vals.end(); ++v) {
         if (isRegex) {
-            exp::regex_constants::syntax_option_type flags = exp::regex_constants::extended;
+            regexp::regex_constants::syntax_option_type flags = regexp::regex_constants::extended;
             if (!caseSensitive) {
-                flags |= exp::regex_constants::icase;
+                flags |= regexp::regex_constants::icase;
             }
             try {
-                exp::regex exp(toMatch, flags);
-                if (exp::regex_match(*v, exp, exp::regex_constants::match_any | exp::regex_constants::match_not_null)) {
+                regexp::regex exp(toMatch, flags);
+                if (regexp::regex_match(*v, exp, regexp::regex_constants::match_any | regexp::regex_constants::match_not_null)) {
                     if (request.isPriorityEnabled(Priority::SHIB_DEBUG))
                         request.log(Priority::SHIB_DEBUG, string("htaccess: expecting regexp ") + toMatch + ", got " + *v + ": accepted");
                     return true;
                 }
-            } catch (const exp::regex_error& e) {
+            } catch (const regexp::regex_error& e) {
                 request.log(Priority::SHIB_ERROR,
                     string("htaccess plugin caught exception while parsing regular expression (") + toMatch + "): " + e.what());
             }
@@ -1036,8 +1036,8 @@ public:
 
 private:
     unique_ptr<RequestMapper> m_mapper;
-    static thread_local const ShibTargetApache* m_sta;
-    static thread_local const PropertySet* m_props;
+     thread_local const ShibTargetApache* m_sta;
+    thread_local const PropertySet* m_props;
     mutable htAccessControl m_htaccess;
 };
 

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