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/core_read.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/core_read.cpp')
| -rw-r--r-- | src/core_read.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/core_read.cpp b/src/core_read.cpp index 179d3514a4..6bd3d9a4fa 100644 --- a/src/core_read.cpp +++ b/src/core_read.cpp @@ -3,21 +3,22 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include "core_io.h" + #include "core.h" -#include "serialize.h" #include "script/script.h" +#include "serialize.h" +#include "univalue/univalue.h" #include "util.h" -#include <boost/assign/list_of.hpp> #include <boost/algorithm/string/classification.hpp> #include <boost/algorithm/string/predicate.hpp> -#include <boost/algorithm/string/split.hpp> #include <boost/algorithm/string/replace.hpp> -#include "univalue/univalue.h" +#include <boost/algorithm/string/split.hpp> +#include <boost/assign/list_of.hpp> -using namespace std; using namespace boost; using namespace boost::algorithm; +using namespace std; CScript ParseScript(std::string s) { |