mirror of
https://github.com/amyinspace/MagicSetEditor2.git
synced 2026-06-10 04:57:00 -04:00
Fix #132, regex compilation issues for boost 1.76.
It looks like they switched to a different hash function that uses integer operations on characters.
This commit is contained in:
+11
-16
@@ -31,23 +31,18 @@
|
|||||||
// ----------------------------------------------------------------------------- : Boost implementation
|
// ----------------------------------------------------------------------------- : Boost implementation
|
||||||
|
|
||||||
#if USE_BOOST_REGEX
|
#if USE_BOOST_REGEX
|
||||||
// needed for boost::regex
|
// needed for boost::regex to compute hash values of unicode chars
|
||||||
inline std::size_t hash_value(wxUniChar const& x) {
|
#if BOOST_VERSION < 107600
|
||||||
boost::hash<int> hasher;
|
inline std::size_t hash_value(wxUniChar const& x) {
|
||||||
return hasher(static_cast<int>(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);
|
|
||||||
}
|
|
||||||
inline bool can_start(wxUniCharRef 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;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
/// Our own regular expression wrapper
|
/// Our own regular expression wrapper
|
||||||
/** Suppors both boost::regex and wxRegEx.
|
/** Suppors both boost::regex and wxRegEx.
|
||||||
|
|||||||
Reference in New Issue
Block a user