Merge pull request bitcoin#664 from kyuupichan/univalue-release

[Backport to release of bitcoin#624] Fix --enable-debug on OSX
ptschip · Jun 9, 2017 · db95f5a · db95f5a
2 parents 7e94f2e + 36e2632
commit db95f5a
Showing 1 changed file with 17 additions and 7 deletions.
diff --git a/src/univalue/include/univalue.h b/src/univalue/include/univalue.h
@@ -25,8 +25,14 @@ class UniValue {
         typ = initialType;
         val = initialStr;
     }
-    UniValue(uint64_t val_) {
-        setInt(val_);
+    UniValue(unsigned int val_) {
+       setInt((uint64_t)val_);
+    }
+    UniValue(unsigned long val_) {
+       setInt((uint64_t)val_);
+    }
+    UniValue(unsigned long long val_) {
+        setInt((uint64_t)val_);
     }
     UniValue(int64_t val_) {
         setInt(val_);
@@ -37,9 +43,6 @@ class UniValue {
     UniValue(int val_) {
         setInt(val_);
     }
-    UniValue(unsigned int val_) {  // BU
-       setInt((uint64_t)val_);
-    }
     UniValue(double val_) {
         setFloat(val_);
     }
@@ -180,10 +183,17 @@ static inline std::pair<std::string,UniValue> Pair(const char *cKey, std::string
     return std::make_pair(key, uVal);
 }
 
-static inline std::pair<std::string,UniValue> Pair(const char *cKey, uint64_t u64Val)
+static inline std::pair<std::string,UniValue> Pair(const char *cKey, unsigned long ulVal)
+{
+    std::string key(cKey);
+    UniValue uVal(ulVal);
+    return std::make_pair(key, uVal);
+}
+
+static inline std::pair<std::string,UniValue> Pair(const char *cKey, unsigned long long ullVal)
 {
     std::string key(cKey);
-    UniValue uVal(u64Val);
+    UniValue uVal(ullVal);
     return std::make_pair(key, uVal);
 }