diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2014-09-16 04:06:33 +0200 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2014-09-16 04:12:52 +0200 |
| commit | 7388b74cd2c5e3b71e991d26953c89c059ba6f2f (patch) | |
| tree | 347fc05ed00ce4d0a0a86e16d6b716d291f13dfb /src/rpcrawtransaction.cpp | |
| parent | 765f3984364bfd9647efa5f3e978cf203a7c5183 (diff) | |
| parent | 611116d4e31634384e9757befbd5e5a1a80e8cd3 (diff) | |
| download | bitcoin-7388b74cd2c5e3b71e991d26953c89c059ba6f2f.tar.xz | |
Merge pull request #4911
611116d header include cleanup (Philip Kaufmann)
Diffstat (limited to 'src/rpcrawtransaction.cpp')
| -rw-r--r-- | src/rpcrawtransaction.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rpcrawtransaction.cpp b/src/rpcrawtransaction.cpp index cf19c277d8..1828a5dc7d 100644 --- a/src/rpcrawtransaction.cpp +++ b/src/rpcrawtransaction.cpp @@ -12,8 +12,8 @@ #include "net.h" #include "rpcserver.h" #include "script/script.h" -#include "script/standard.h" #include "script/sign.h" +#include "script/standard.h" #include "uint256.h" #ifdef ENABLE_WALLET #include "wallet.h" @@ -25,10 +25,10 @@ #include "json/json_spirit_utils.h" #include "json/json_spirit_value.h" -using namespace std; using namespace boost; using namespace boost::assign; using namespace json_spirit; +using namespace std; void ScriptPubKeyToJSON(const CScript& scriptPubKey, Object& out, bool fIncludeHex) { |