aboutsummaryrefslogtreecommitdiff
path: root/src/script
diff options
context:
space:
mode:
authorPieter Wuille <[email protected]>2014-10-06 23:49:05 +0200
committerPieter Wuille <[email protected]>2014-10-06 23:51:45 +0200
commita2a5fe3b727bcf5f87b91f5b625c98e132fd3d22 (patch)
tree13bc40e378a91585f3054b8ca518029dd4dc5101 /src/script
parentMerge pull request #5036 (diff)
parentfix a lock indentation in main.cpp (diff)
downloaddiscoin-a2a5fe3b727bcf5f87b91f5b625c98e132fd3d22.tar.xz
discoin-a2a5fe3b727bcf5f87b91f5b625c98e132fd3d22.zip
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.h2
-rw-r--r--src/script/sigcache.cpp4
-rw-r--r--src/script/sigcache.h6
3 files changed, 6 insertions, 6 deletions
diff --git a/src/script/interpreter.h b/src/script/interpreter.h
index f5363a753..0ff73964b 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 981563b7a..ab366898d 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 9537efbd1..46b8f4d33 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