github/Qv2ray
5
0
Fork 0
mirror of https://github.com/Qv2ray/Qv2ray.git synced 2025-05-20 10:50:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

update: updated QvPair to support secondary type

Browse Source
This commit is contained in:
QwQ 2020-07-23 15:12:13 +08:00
parent 0a923d1768
commit de219ab9ba
No known key found for this signature in database
GPG Key ID: E7FAEFAFCD031D4B
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
makespec/BUILDVERSION
View File

@ -1 +1 @@
5819 5820

10
src/base/models/QvSafeType.hpp
View File

@ -37,12 +37,14 @@ namespace Qv2ray::base::safetype
SAFE_TYPEDEF(QJsonArray, OUTBOUNDS); SAFE_TYPEDEF(QJsonArray, OUTBOUNDS);
SAFE_TYPEDEF(QJsonArray, INBOUNDS); SAFE_TYPEDEF(QJsonArray, INBOUNDS);
template<typename T> template<typename T1, typename T2 = T1>
struct QvPair struct QvPair
{ {
T value1; T1 value1;
T value2; T2 value2;
JSONSTRUCT_REGISTER(QvPair<T>, F(value1, value2)) JSONSTRUCT_REGISTER(___qvpair_t, F(value1, value2))
private:
typedef QvPair<T1, T2> ___qvpair_t;
}; };
template<typename enumKey, typename TValue, typename = typename std::enable_if<std::is_enum<enumKey>::value>::type> template<typename enumKey, typename TValue, typename = typename std::enable_if<std::is_enum<enumKey>::value>::type>
struct QvEnumMap : QMap<enumKey, TValue> struct QvEnumMap : QMap<enumKey, TValue>