From de219ab9ba6af800edbe044d29451dc8fc7b6fd0 Mon Sep 17 00:00:00 2001
From: QwQ <59914293+Qv2ray-dev@users.noreply.github.com>
Date: Thu, 23 Jul 2020 15:12:13 +0800
Subject: [PATCH] update: updated QvPair to support secondary type

---
 makespec/BUILDVERSION          |  2 +-
 src/base/models/QvSafeType.hpp | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/makespec/BUILDVERSION b/makespec/BUILDVERSION
index 6838a64c..d01f253a 100644
--- a/makespec/BUILDVERSION
+++ b/makespec/BUILDVERSION
@@ -1 +1 @@
-5819
+5820
diff --git a/src/base/models/QvSafeType.hpp b/src/base/models/QvSafeType.hpp
index e018ab65..2566e9e9 100644
--- a/src/base/models/QvSafeType.hpp
+++ b/src/base/models/QvSafeType.hpp
@@ -37,12 +37,14 @@ namespace Qv2ray::base::safetype
     SAFE_TYPEDEF(QJsonArray, OUTBOUNDS);
     SAFE_TYPEDEF(QJsonArray, INBOUNDS);
 
-    template<typename T>
+    template<typename T1, typename T2 = T1>
     struct QvPair
     {
-        T value1;
-        T value2;
-        JSONSTRUCT_REGISTER(QvPair<T>, F(value1, value2))
+        T1 value1;
+        T2 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>
     struct QvEnumMap : QMap<enumKey, TValue>