There are two equal ifs, one inside another. If the first one is true, then the second one is true.
I'll add that I don't think it's a good idea to use the [] operator for checking the existance of items in a map in the context of a method that should only "show" the wtx (the map::[] operator adds a new item if it isn't found). I think the method should work with a const CWalletTx &wtx.
The patch makes absolutely sense and why not create a patch for your second suggestions, too :)?
Can you squash the 2 commits into one please.
- add version information to bitcoin-qt.rc, which is displayed on Windows, when looking in the executable properties and selecting "Details"
- introduce a new clientversion.h (used in bitcoin-qt.rc to generate
version information), which takes only the version defines from
version.h and is included in it (to allow usage with the windres rc-file
compiler)
- move #define STRINGIFY(s) #s into clientversion.h as that is used in
bitcoin-qt.rc and rename to DO_STRINGIZE(X)
- add #define STRINGIZE(X) DO_STRINGIZE(X), which is needed to convert the
version defines into a version string in the rc-file
- this ensures we only need to update 1 file and have bitcoin-qt.exe
version information
- for RC-file documentation see:
http://msdn.microsoft.com/en-us/library/windows/desktop/aa381058%28v=vs.85%29.aspx
Bugfix: Correct doubled-up & in translations
Bugfix: Remove extra spaces after ampersand in translations (this fixes hotkeys)
Restore copyright translations, now split up
Restore old translations lost due to changes to English structure
Skipped: ca_ES et eu_ES fr_CA (under 10% coverage)
[21:48:14] <md2k7> feel free to make it MIT if you like
We're in a wholly different world now, C++-compiler-wise.
Current std::stringstream implementations don't have the stated problem anymore,
and are just as fast as CDataStream.
The #ifdef'd block does not even compile anymore; CDataStream constructor changed,
and missing some std::. Also timing in whole seconds is also way too granular
to say anything sensible in such microbenchmarks. Just remove it,
it can always be found again in git history.
Matt pointed out some time ago that there existed a minor DOS
attack where a node in its initial block download could be wedged
by an overwrite attack in a fork created between checkpoints before
a time where BIP30 was enforced. Now that the BIP30 timestamp
is irreversibly past the check can be more aggressive and apply to
all blocks except the two historic violations.
Instead, fall back to IPv4 listening.
(and change so that only one case has to fail to make a tx_invalid
test correct)
- before, we used to show them in GUI when depth >= 2, which could lead to
confusion of users, as the RPC behaviour already showed the Tx
- Paging using PageUp / PageDown now works when entry widget has focus
- Typing or pasting while the messages widget has focus auto-selects entry widget
- removes the FIRST_CLASS_MESSAGING support from the client, which was no
default setting anyway
- re-order Qt Actions and connect() calls to match the real GUI layout,
which makes things easier to read and understand
- remove signMessageAction and verifyMessageAction from tabGroup as we
didn't use them anyway (as tooltips are not displayed in the menu remove
these too)
- update 2 comments
- I checked every occurance of strprintf() in the code and used %u, where
unsigned vars are used
- the change to GetByte() was made, as ip is an unsigned char
- replace Q_WS_MAC (not supported anymore in Qt5) with Q_OS_MAC (supported
in Qt4/5)
Update Qt Links
Revert Qt source link
Update Qt links
Update Qmenu include
This is to be more consistent with the rest of the source
Update Qt Includes
-detachdb option. Useful for upgrading, for example. Lets you use fast stops usually, but force a detach when needed. Also, allows
you to do a fast stop in a system normally configured for fast stops.
- a shortcut on "receive coins" was used twice
This patch currently excludes our Windows executable!
- change to use -fstack-protector-all
- the minimum size of buffers (i.e. arrays) that will receive stack
smashing protection was changed to 1 byte (GCC default: 8)
- warn about functions that will not be protected against stack
smashing by adding -Wstack-protector
As discussed on IRC. Intended to make using an external blockchain download
solution just a bit easier.
This finds about ~150 potential problems with format characters on a 64 bit build.
Encapsulate _snprintf/sprintf difference in implementation not header
Also const correctness for lookup tables in hex functions throughout the code.
commit 5a1a3622 effectively enabled these warnings, but they need
to be fixed before being enabled in the general build scripts.
Due to a bug in the implementation of MakeSameSize(), using OP_AND, OP_OR, or OP_XOR with signed values of unequal size will result in the sign-value becoming part of the smaller integer, with nonsensical results. This patch documents the unexpected behavior and provides the basis of a solution should decision be made to fix the bug in the future.
There are two equal ifs, one inside another. If the first one is true, then the second one is true.
As the code was before, toHTML added empty elements to mapValue to check for their existance. Now first it check for their existance and then for their non-emptiness.
git fetch upstream
git rebase upstream
git rebase origin -i
use squash before your 2nd commit
git push origin patch-20 -f