diff options
author | Cory Fields <cory-nospam-@coryfields.com> | 2014-09-30 19:45:20 -0400 |
---|---|---|
committer | Cory Fields <cory-nospam-@coryfields.com> | 2014-10-17 13:44:14 -0400 |
commit | db8eb54bd7239ff2b046fe34b1c8d692860c6b5b (patch) | |
tree | 1e7f930b2adeb44df71e1c32d55a8bdc71aff485 /src/script/script.h | |
parent | e9ca4280f3abb8b2b6fa35a41e881996278ebfff (diff) |
script: move ToString and ValueString out of the header
Diffstat (limited to 'src/script/script.h')
-rw-r--r-- | src/script/script.h | 30 |
1 files changed, 1 insertions, 29 deletions
diff --git a/src/script/script.h b/src/script/script.h index 6676e852ae..4f6ee0c521 100644 --- a/src/script/script.h +++ b/src/script/script.h @@ -318,13 +318,6 @@ private: int64_t m_value; }; -inline std::string ValueString(const std::vector<unsigned char>& vch) -{ - if (vch.size() <= 4) - return strprintf("%d", CScriptNum(vch).getint()); - else - return HexStr(vch); -} /** Serialized script, used inside transaction inputs and outputs */ class CScript : public std::vector<unsigned char> @@ -571,28 +564,7 @@ public: return (size() > 0 && *begin() == OP_RETURN); } - std::string ToString() const - { - std::string str; - opcodetype opcode; - std::vector<unsigned char> vch; - const_iterator pc = begin(); - while (pc < end()) - { - if (!str.empty()) - str += " "; - if (!GetOp(pc, opcode, vch)) - { - str += "[error]"; - return str; - } - if (0 <= opcode && opcode <= OP_PUSHDATA4) - str += ValueString(vch); - else - str += GetOpName(opcode); - } - return str; - } + std::string ToString() const; void clear() { // The default std::vector::clear() does not release memory. |