Merge #36: Drop overloaded members

fanquake · fanquake · commit de4f73ddca40 · 2022-05-30T14:02:53.000+01:00
076c051 Drop overloaded members (MacroFake) Pull request description: This is taken from `https://github.com/bitcoin/bitcoin/pull/15975/commits/a844dbed0ff4bdba014052d7ee83cf6c41879fcb` This should be safe and sane, because: * The overloaded members construct temporary copies and pass them on as const UniValue&, which will need to be copied again. Future changes that want to disable UniValue copy constructors will be easier with those members removed. * UniValue constructors are not marked explicit and there are no plans to make them explicit, so this change should not make unrelated future changes harder. ACKs for top commit: fanquake: ACK 076c051 - did not test downstream. Tree-SHA512: db70fa0ad9bacb9b01063a18eada3dbc0908f014dc96e94752a66b680856a5833b9b1158790ee892b9b0edbf7511faa32866d5c944b183a8d1c71ddf0318c707
diff --git a/include/univalue.h b/include/univalue.h
@@ -83,66 +83,10 @@ class UniValue {
     bool isObject() const { return (typ == VOBJ); }
 
     bool push_back(const UniValue& val);
-    bool push_back(const std::string& val_) {
-        UniValue tmpVal(VSTR, val_);
-        return push_back(tmpVal);
-    }
-    bool push_back(const char *val_) {
-        std::string s(val_);
-        return push_back(s);
-    }
-    bool push_back(uint64_t val_) {
-        UniValue tmpVal(val_);
-        return push_back(tmpVal);
-    }
-    bool push_back(int64_t val_) {
-        UniValue tmpVal(val_);
-        return push_back(tmpVal);
-    }
-    bool push_back(bool val_) {
-        UniValue tmpVal(val_);
-        return push_back(tmpVal);
-    }
-    bool push_back(int val_) {
-        UniValue tmpVal(val_);
-        return push_back(tmpVal);
-    }
-    bool push_back(double val_) {
-        UniValue tmpVal(val_);
-        return push_back(tmpVal);
-    }
     bool push_backV(const std::vector<UniValue>& vec);
 
     void __pushKV(const std::string& key, const UniValue& val);
     bool pushKV(const std::string& key, const UniValue& val);
-    bool pushKV(const std::string& key, const std::string& val_) {
-        UniValue tmpVal(VSTR, val_);
-        return pushKV(key, tmpVal);
-    }
-    bool pushKV(const std::string& key, const char *val_) {
-        std::string _val(val_);
-        return pushKV(key, _val);
-    }
-    bool pushKV(const std::string& key, int64_t val_) {
-        UniValue tmpVal(val_);
-        return pushKV(key, tmpVal);
-    }
-    bool pushKV(const std::string& key, uint64_t val_) {
-        UniValue tmpVal(val_);
-        return pushKV(key, tmpVal);
-    }
-    bool pushKV(const std::string& key, bool val_) {
-        UniValue tmpVal(val_);
-        return pushKV(key, tmpVal);
-    }
-    bool pushKV(const std::string& key, int val_) {
-        UniValue tmpVal((int64_t)val_);
-        return pushKV(key, tmpVal);
-    }
-    bool pushKV(const std::string& key, double val_) {
-        UniValue tmpVal(val_);
-        return pushKV(key, tmpVal);
-    }
     bool pushKVs(const UniValue& obj);
 
     std::string write(unsigned int prettyIndent = 0,
