diff options
| author | practicalswift <[email protected]> | 2017-08-07 07:36:37 +0200 |
|---|---|---|
| committer | practicalswift <[email protected]> | 2017-08-07 07:36:37 +0200 |
| commit | 90d4d89230434493c3b1e9174abed2609ba74cf1 (patch) | |
| tree | 511237508ac27f66846c0aa9405658b835c9ae43 /src/script/bitcoinconsensus.h | |
| parent | Merge #10988: qt: Increase BLOCK_CHAIN_SIZE constants (diff) | |
| download | discoin-90d4d89230434493c3b1e9174abed2609ba74cf1.tar.xz discoin-90d4d89230434493c3b1e9174abed2609ba74cf1.zip | |
scripted-diff: Use the C++11 keyword nullptr to denote the pointer literal instead of the macro NULL
-BEGIN VERIFY SCRIPT-
sed -i 's/\<NULL\>/nullptr/g' src/*.cpp src/*.h src/*/*.cpp src/*/*.h src/qt/*/*.cpp src/qt/*/*.h src/wallet/*/*.cpp src/wallet/*/*.h src/support/allocators/*.h
sed -i 's/Prefer nullptr, otherwise SAFECOOKIE./Prefer NULL, otherwise SAFECOOKIE./g' src/torcontrol.cpp
sed -i 's/tor: Using nullptr authentication/tor: Using NULL authentication/g' src/torcontrol.cpp
sed -i 's/METHODS=nullptr/METHODS=NULL/g' src/test/torcontrol_tests.cpp src/torcontrol.cpp
sed -i 's/nullptr certificates/NULL certificates/g' src/qt/paymentserver.cpp
sed -i 's/"nullptr"/"NULL"/g' src/torcontrol.cpp src/test/torcontrol_tests.cpp
-END VERIFY SCRIPT-
Diffstat (limited to 'src/script/bitcoinconsensus.h')
| -rw-r--r-- | src/script/bitcoinconsensus.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/script/bitcoinconsensus.h b/src/script/bitcoinconsensus.h index 1bef4fe9e..33bf80e5a 100644 --- a/src/script/bitcoinconsensus.h +++ b/src/script/bitcoinconsensus.h @@ -63,7 +63,7 @@ enum /// Returns 1 if the input nIn of the serialized transaction pointed to by /// txTo correctly spends the scriptPubKey pointed to by scriptPubKey under /// the additional constraints specified by flags. -/// If not NULL, err will contain an error/success code for the operation +/// If not nullptr, err will contain an error/success code for the operation EXPORT_SYMBOL int bitcoinconsensus_verify_script(const unsigned char *scriptPubKey, unsigned int scriptPubKeyLen, const unsigned char *txTo , unsigned int txToLen, unsigned int nIn, unsigned int flags, bitcoinconsensus_error* err); |