amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-10 04:57:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix #132, regex compilation issues for boost 1.76.

Browse Source 
It looks like they switched to a different hash function that uses integer operations on characters.
This commit is contained in:
Twan van Laarhoven
2021-07-06 20:49:38 +02:00
parent 2872862b01
commit f9d9356d51
1 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util/regex.hpp
+7 -12
View File
@@ -31,23 +31,18 @@
// ----------------------------------------------------------------------------- : Boost implementation
#if USE_BOOST_REGEX
// needed for boost::regex
// needed for boost::regex to compute hash values of unicode chars
#if BOOST_VERSION < 107600
inline std::size_t hash_value(wxUniChar const& x) {
boost::hash<int> hasher;
return hasher(static_cast<int>(x));
}
/*
// fix: boost regex doesn't like that wxUniChar can't be constructed from an int
namespace boost {
namespace BOOST_REGEX_DETAIL_NS {
inline bool can_start(wxUniChar c, const unsigned char* map, unsigned char mask) {
return can_start(c.GetValue(), map, mask);
#else
// boost > 1.76 uses its own hash function that needs operator +
inline int operator + (wxUniChar x, unsigned int y) {
return static_cast<int>(x) + y;
}
inline bool can_start(wxUniCharRef c, const unsigned char* map, unsigned char mask) {
return can_start(c.GetValue(), map, mask);
}
}
}*/
#endif
/// Our own regular expression wrapper
/** Suppors both boost::regex and wxRegEx.