Skip to content

commits from bitcoin/master#347

Merged
Bushstar merged 9 commits into
FeatherCoin:masterfrom
Bushstar:master
Jun 18, 2018
Merged

commits from bitcoin/master#347
Bushstar merged 9 commits into
FeatherCoin:masterfrom
Bushstar:master

Conversation

@Bushstar
Copy link
Copy Markdown
Collaborator

Fix incorrect shell quoting in FreeBSD build instructions.
bitcoin/bitcoin#13476

Add linter: Enforce the source code file naming convention described in the developer notes
bitcoin/bitcoin#13450

Document validationinterace callback blocking deadlock potential.
bitcoin/bitcoin#13402

scripted-diff: Avoid temporary copies when looping over std::map
bitcoin/bitcoin#13241

Avoid concurrency issue when make multiple target
bitcoin/bitcoin#13465

contrib: Fix CVE-2018-12356 by hardening the regex
bitcoin/bitcoin#13479

Add linter: Make sure we explicitly open all text files using UTF-8 encoding in Python
bitcoin/bitcoin#13448

Docs: Improve readability of "Squashing commits"
bitcoin/bitcoin#13488

murrayn and others added 9 commits June 18, 2018 08:38
The ::value_type of the std::map/std::multimap/std::unordered_map containers is
std::pair<const Key, T>. Dropping the const results in an unnecessary copy,
for example in C++11 range-based loops.

For this I started with a more general scripted diff, then narrowed it down
based on the inspection showing that all actual map/multimap/unordered_map
variables used in loops start with m or have map in the name.

-BEGIN VERIFY SCRIPT-
sed -i -E 's/for \(([^<]*)std::pair<([^c])(.+) : m/for (\1std::pair<const \2\3 : m/' src/*.cpp src/**/*.cpp
sed -i -E 's/for \(([^<]*)std::pair<([^c])(.+) : (.*)map/for (\1std::pair<const \2\3 : \4map/' src/*.cpp src/**/*.cpp
-END VERIFY SCRIPT-
It was not easy to read the comment lines for me because I was not sure whether the sentence ended with the line or not ("pull set commits"?).
Therefore, dots had been invented and I have added them to signal the end of a sentence. Also begin New sentence with a capital letter.

I guess, not all 'pick' words should be replaced by 'squash'? At least I found [https://www.digitalocean.com/community/tutorials/how-to-rebase-and-update-a-pull-request](this) rebase/squash documentation helpful, where is written that the first line should not be changed.
@Bushstar Bushstar merged commit 290776e into FeatherCoin:master Jun 18, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants