[cpp-sp] branch main updated: Try and fix a variable name clash.

[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=1806b39e1f62cfe5d2cd184fb73ae8811c9713ff

The following commit(s) were added to refs/heads/main by this push:
     new 1806b39e Try and fix a variable name clash.
1806b39e is described below

commit 1806b39e1f62cfe5d2cd184fb73ae8811c9713ff
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Jan 6 10:26:18 2025 -0500

    Try and fix a variable name clash.
---
 shibsp/impl/XMLRequestMapper.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/shibsp/impl/XMLRequestMapper.cpp b/shibsp/impl/XMLRequestMapper.cpp
index 341b42ad..ceb925d6 100644
--- a/shibsp/impl/XMLRequestMapper.cpp
+++ b/shibsp/impl/XMLRequestMapper.cpp
@@ -356,9 +356,9 @@ Override::Override(bool unicodeAware, ptree& pt, Category& log, const Override*
                     if (!o->getBool("caseSensitive", false)) {
                         flags |= exp::regex_constants::icase;
                     }
-                    exp::regex exp(regexpprop, flags);
+                    exp::regex expr(regexpprop, flags);
 
-                    m_queries.push_back(make_tuple(nameprop, boost::optional<exp::regex>(exp), std::move(o)));
+                    m_queries.push_back(make_tuple(nameprop, boost::optional<exp::regex>(expr), std::move(o)));
                     log.debug("added <Query> mapping (%s)", nameprop.c_str());
                 }
                 catch (const exp::regex_error& e) {
@@ -520,8 +520,8 @@ XMLRequestMapperImpl::XMLRequestMapperImpl(ptree& pt, Category& log)
                 if (!o->getBool("caseSensitive", false)) {
                     flags |= exp::regex_constants::icase;
                 }
-                exp::regex exp(regexprop, flags);
-                m_regexps.push_back(make_pair(exp, std::move(o)));
+                exp::regex expr(regexprop, flags);
+                m_regexps.push_back(make_pair(expr, std::move(o)));
             }
             catch (const exp::regex_error& e) {
                 log.error("caught exception while parsing HostRegex regular expression: %s", e.what());

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