Branch: refs/heads/master
Home: https://github.com/xrootd/xrootd
Commit: e7cf71c11f6504c6ff7a504a9e134ae66d923aa6
https://github.com/xrootd/xrootd/commit/e7cf71c11f6504c6ff7a504a9e134ae66d923aa6
Author: Mattias Ellert <[log in to unmask]>
Date: 2021-12-14 (Tue, 14 Dec 2021)
Changed paths:
M src/XrdMacaroons/XrdMacaroonsHandler.cc
M src/XrdSciTokens/XrdSciTokensAccess.cc
Log Message:
-----------
Fix compilation on GCC 4.8
../xrootd-5.4.0/src/XrdSciTokens/XrdSciTokensAccess.cc: In member function 'bool XrdAccSciTokens::GenerateAcls(const string&, uint64_t&, {anonymous}::AccessRulesRaw&, std::string&, std::string&, std::string&, std::vector<{anonymous}::MapRule>&, std::vector<std::basic_string<char> >&)':
../xrootd-5.4.0/src/XrdSciTokens/XrdSciTokensAccess.cc:652:83: error: no matching function for call to 'regex_replace(std::string&, std::regex, const char [2])'
std::regex("//"), "/");
^
../xrootd-5.4.0/src/XrdSciTokens/XrdSciTokensAccess.cc:652:83: note: candidates are:
In file included from /usr/include/c++/4.8.2/regex:62:0,
from ../xrootd-5.4.0/src/XrdSciTokens/XrdSciTokensAccess.cc:18:
/usr/include/c++/4.8.2/bits/regex.h:2162:5: note: template<class _Out_iter, class _Bi_iter, class _Rx_traits, class _Ch_type> _Out_iter std::regex_replace(_Out_iter, _Bi_iter, _Bi_iter, const std::basic_regex<_Ch_type, _Rx_traits>&, const std::basic_string<_Ch_type>&, std::regex_constants::match_flag_type)
regex_replace(_Out_iter __out, _Bi_iter __first, _Bi_iter __last,
^
/usr/include/c++/4.8.2/bits/regex.h:2162:5: note: template argument deduction/substitution failed:
../xrootd-5.4.0/src/XrdSciTokens/XrdSciTokensAccess.cc:652:83: note: deduced conflicting types for parameter '_Bi_iter' ('std::basic_regex<char>' and 'const char*')
std::regex("//"), "/");
^
In file included from /usr/include/c++/4.8.2/regex:62:0,
from ../xrootd-5.4.0/src/XrdSciTokens/XrdSciTokensAccess.cc:18:
/usr/include/c++/4.8.2/bits/regex.h:2182:5: note: template<class _Rx_traits, class _Ch_type> std::basic_string<_Ch_type> std::regex_replace(const std::basic_string<_Ch_type>&, const std::basic_regex<_Ch_type, _Rx_traits>&, const std::basic_string<_Ch_type>&, std::regex_constants::match_flag_type)
regex_replace(const basic_string<_Ch_type>& __s,
^
/usr/include/c++/4.8.2/bits/regex.h:2182:5: note: template argument deduction/substitution failed:
../xrootd-5.4.0/src/XrdSciTokens/XrdSciTokensAccess.cc:652:83: note: mismatched types 'const std::basic_string<_Ch_type>' and 'const char [2]'
std::regex("//"), "/");
^
Commit: 48b1bf4ae54f0829ae0c1e7dfea51317b4ea9dab
https://github.com/xrootd/xrootd/commit/48b1bf4ae54f0829ae0c1e7dfea51317b4ea9dab
Author: Andrew Hanushevsky <[log in to unmask]>
Date: 2021-12-15 (Wed, 15 Dec 2021)
Changed paths:
M src/XrdMacaroons/XrdMacaroonsHandler.cc
M src/XrdSciTokens/XrdSciTokensAccess.cc
Log Message:
-----------
Merge pull request #1571 from ellert/older-regex
Help older compiler find the right template.
Compare: https://github.com/xrootd/xrootd/compare/646a861d9714...48b1bf4ae54f
########################################################################
Use REPLY-ALL to reply to list
To unsubscribe from the XROOTD-DEV list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=XROOTD-DEV&A=1
