diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2014-10-06 23:49:05 +0200 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2014-10-06 23:51:45 +0200 |
| commit | a2a5fe3b727bcf5f87b91f5b625c98e132fd3d22 (patch) | |
| tree | 13bc40e378a91585f3054b8ca518029dd4dc5101 /src/script | |
| parent | 5505a1b13f75af9f0f6421b42d97c06e079db345 (diff) | |
| parent | 4dc5eb057c1d3b3cab8eb6462a0e134b128de1fd (diff) | |
| download | bitcoin-a2a5fe3b727bcf5f87b91f5b625c98e132fd3d22.tar.xz | |
Merge pull request #5049
4dc5eb0 fix a lock indentation in main.cpp (Philip Kaufmann)
5eed8c2 minor license, header end comment etc. cleanup in /script (Philip Kaufmann)
Diffstat (limited to 'src/script')
| -rw-r--r-- | src/script/interpreter.h | 2 | ||||
| -rw-r--r-- | src/script/sigcache.cpp | 4 | ||||
| -rw-r--r-- | src/script/sigcache.h | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/script/interpreter.h b/src/script/interpreter.h index f5363a7535..0ff73964ba 100644 --- a/src/script/interpreter.h +++ b/src/script/interpreter.h @@ -10,10 +10,10 @@ #include <stdint.h> #include <string> -class uint256; class CPubKey; class CScript; class CTransaction; +class uint256; /** Signature hash types/flags */ enum diff --git a/src/script/sigcache.cpp b/src/script/sigcache.cpp index 981563b7ae..ab366898d8 100644 --- a/src/script/sigcache.cpp +++ b/src/script/sigcache.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2013 The Bitcoin developers -// Distributed under the MIT/X11 software license, see the accompanying +// Copyright (c) 2009-2014 The Bitcoin developers +// Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include "sigcache.h" diff --git a/src/script/sigcache.h b/src/script/sigcache.h index 9537efbd11..46b8f4d335 100644 --- a/src/script/sigcache.h +++ b/src/script/sigcache.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2013 The Bitcoin developers -// Distributed under the MIT/X11 software license, see the accompanying +// Copyright (c) 2009-2014 The Bitcoin developers +// Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #ifndef H_BITCOIN_SCRIPT_SIGCACHE @@ -23,4 +23,4 @@ public: bool VerifySignature(const std::vector<unsigned char>& vchSig, const CPubKey& vchPubKey, const uint256& sighash) const; }; -#endif +#endif // H_BITCOIN_SCRIPT_SIGCACHE |