From 066e2a1403fe306787a2ce0c8571aa9de57386cf Mon Sep 17 00:00:00 2001 From: Cory Fields Date: Wed, 24 Sep 2014 22:24:46 -0400 Subject: script: move CScriptID to standard.h and add a ctor for creating them from CScripts This allows for a reversal of the current behavior. This: CScript foo; CScriptID bar(foo.GetID()); Becomes: CScript foo; CScriptID bar(foo); This way, CScript is no longer dependent on CScriptID or Hash(); --- src/script/compressor.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/script/compressor.cpp') diff --git a/src/script/compressor.cpp b/src/script/compressor.cpp index 51a3cf602..dbb4df8b7 100644 --- a/src/script/compressor.cpp +++ b/src/script/compressor.cpp @@ -4,6 +4,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include "compressor.h" +#include "script/standard.h" bool CScriptCompressor::IsToKeyID(CKeyID &hash) const { -- cgit v1.2.3 From 85c579e3a63cf505d6cedc454755265572e97d3e Mon Sep 17 00:00:00 2001 From: Cory Fields Date: Wed, 24 Sep 2014 23:32:36 -0400 Subject: script: add a slew of includes all around and drop includes from script.h Lots of files ended up with indirect includes from script.h. --- src/script/compressor.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/script/compressor.cpp') diff --git a/src/script/compressor.cpp b/src/script/compressor.cpp index dbb4df8b7..af1acf48d 100644 --- a/src/script/compressor.cpp +++ b/src/script/compressor.cpp @@ -4,6 +4,8 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include "compressor.h" + +#include "key.h" #include "script/standard.h" bool CScriptCompressor::IsToKeyID(CKeyID &hash) const -- cgit v1.2.3