[refactor] Remove using namespace <xxx> from src/ #9644

kallewoof · 2017-01-27T09:09:43Z

This is the final PR of the #9235 sub-sets, including the remaining files in src/.

I don't know if this should go into 0.14 or not (it is binary-checked so it should not affect anything), but I figured I would wrap these up just in case.

Same-binaries check:

$ ../bitcoin-maintainer-tools/build-for-compare.py 9b4d2673b7757fd242b13c972c73897c92a90ce1 b7b48c8bbdf7a90861610b035d8b0a247ef78c45 --executables "src/bitcoind,src/bitcoin-cli,src/bitcoin-tx" --patches "stripbuildinfo.patch,stripbuildinfo-without-using-ns.patch"
[...]
make[1]: Leaving directory '/tmp/repo/src'
>>> [do_build] Copying object files...
>>> [do_build] Performing basic analysis pass...
>>> [do_build] Use these commands to compare results:
>>> [do_build] $ sha256sum /tmp/compare/*.stripped
>>> [do_build] $ git diff -W --word-diff /tmp/compare/9b4d2673b7757fd242b13c972c73897c92a90ce1 /tmp/compare/b7b48c8bbdf7a90861610b035d8b0a247ef78c45
$ sha256sum /tmp/compare/*.stripped
e949fef0c4e3c9fcd7927acfaca0737629caa82cc70218e483adbb1ecc9b8bfc  /tmp/compare/bitcoin-cli.9b4d2673b7757fd242b13c972c73897c92a90ce1.stripped
e949fef0c4e3c9fcd7927acfaca0737629caa82cc70218e483adbb1ecc9b8bfc  /tmp/compare/bitcoin-cli.b7b48c8bbdf7a90861610b035d8b0a247ef78c45.stripped
59345e230f87b0f4a9a4f24b17dce83f783f13fe18fdaa9f88573400e6f8730c  /tmp/compare/bitcoind.9b4d2673b7757fd242b13c972c73897c92a90ce1.stripped
59345e230f87b0f4a9a4f24b17dce83f783f13fe18fdaa9f88573400e6f8730c  /tmp/compare/bitcoind.b7b48c8bbdf7a90861610b035d8b0a247ef78c45.stripped
512ca5f056c02478c638bf48c056e8bb12d5a7ca924f972bf2f1f8a833e92bab  /tmp/compare/bitcoin-tx.9b4d2673b7757fd242b13c972c73897c92a90ce1.stripped
512ca5f056c02478c638bf48c056e8bb12d5a7ca924f972bf2f1f8a833e92bab  /tmp/compare/bitcoin-tx.b7b48c8bbdf7a90861610b035d8b0a247ef78c45.stripped
$ git diff -W --word-diff /tmp/compare/9b4d2673b7757fd242b13c972c73897c92a90ce1 /tmp/compare/b7b48c8bbdf7a90861610b035d8b0a247ef78c45
$

The affected files and namespaces:

bloom.cpp:                std
chain.cpp:                std [unused]
core_read.cpp:            std
core_write.cpp:           std
init.cpp:                 std, boost::filesystem [inside void CleanupBlockRevFiles()]
merkleblock.cpp:          std
miner.cpp:                std
net_processing.cpp:       std
rest.cpp:                 std
timedata.cpp:             std
txdb.cpp:                 std
txmempool.cpp:            std
validation.cpp:           std

laanwj · 2017-01-27T15:13:45Z

That's a much larger diff than I expected, but it seems sane, utACK.

sipa · 2017-01-27T17:57:07Z

Concept ACK, and if it doesn't change the binaries (I haven't checked myself yet), I'm fine with merging it anytime.

practicalswift · 2017-01-28T07:16:25Z

utACK. Thanks for doing this. See my related PR #9544.

fanquake · 2017-01-28T07:23:16Z

utACK

…

On Sat, 28 Jan 2017 at 07:16, practicalswift ***@***.***> wrote: utACK. Thanks for doing this. See my related PR #9544 <#9544>. — You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub <#9644 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AA0t8rorVIjg41JvY87Cun5egIxX5rABks5rWutOgaJpZM4LvjgS> .

btcdrak · 2017-01-28T09:09:33Z

utACK

maflcko · 2017-01-28T14:58:03Z

same binaries ACK on b7b48c8, but unfortunately we can not merge it, as it conflicts with an open net bug fix tagged for 0.14.

maflcko · 2017-01-30T12:11:30Z

Meh, just going to merge this as the bugfix needs rebase anyway and this pull seems to be sufficiently reviewed.

b7b48c8 Refactor: Remove using namespace <xxx> from src/*.cpp. (Karl-Johan Alm)

rebroad · 2017-02-01T11:43:20Z

@MarcoFalke sufficiently reviewed? All the ACKs were either untested or concept only from what I can see.

maflcko · 2017-02-01T12:48:36Z

@rebroad, I think for a simple refactoring patch the following review is sufficient: * OP checked for same binaries * I checked for same binaries * 5 people were reading the diff and utACKed, one was just Concept ACKing * The automated tests passed * I checked against all open pull request for 0.14 that no new conflicts are introduced I do not understand why you call that insufficient.

…

On Wed, Feb 1, 2017 at 12:43 PM, R E Broadley ***@***.***> wrote: @MarcoFalke <https://github.com/MarcoFalke> sufficiently reviewed? All the ACKs were either untested or concept only from what I can see. — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#9644 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AGGmvzd2P94KQ5OD5Iqooo6c6zAeaAtiks5rYG_ngaJpZM4LvjgS> .

rebroad · 2017-02-02T05:33:12Z

@MarcoFalke thanks for clarifying

b7b48c8 Refactor: Remove using namespace <xxx> from src/*.cpp. (Karl-Johan Alm)

Backport bloom filter improvements Cherry-picked from the following upstream PRs: - bitcoin/bitcoin#7113 - bitcoin/bitcoin#7818 - Only the second commit (to resolve conflicts). - bitcoin/bitcoin#7934 - bitcoin/bitcoin#8655 - Partial backport to help resolve conflicts. - bitcoin/bitcoin#9060 - bitcoin/bitcoin#9223 - bitcoin/bitcoin#9644 - Partial backport to help resolve conflicts. - bitcoin/bitcoin#9916 - bitcoin/bitcoin#9750 - bitcoin/bitcoin#13176 - bitcoin/bitcoin#13948 - bitcoin/bitcoin#16073 - bitcoin/bitcoin#18670 - bitcoin/bitcoin#18806 - Reveals upstream's covert fix for CVE-2013-5700. - bitcoin/bitcoin#19968

Refactor: Remove using namespace <xxx> from src/*.cpp.

b7b48c8

kallewoof mentioned this pull request Jan 27, 2017

[WIP] Refactor: Remove all uses of using namespace in all source files. #9235

Closed

kallewoof force-pushed the no-using-namespace-src branch from a9f997e to b7b48c8 Compare January 27, 2017 09:15

laanwj added the Refactoring label Jan 27, 2017

maflcko merged commit b7b48c8 into bitcoin:master Jan 30, 2017

maflcko pushed a commit that referenced this pull request Jan 30, 2017

Merge #9644: [refactor] Remove using namespace <xxx> from src/

668de70

b7b48c8 Refactor: Remove using namespace <xxx> from src/*.cpp. (Karl-Johan Alm)

kallewoof deleted the no-using-namespace-src branch January 30, 2017 12:14

codablock pushed a commit to codablock/dash that referenced this pull request Jan 23, 2018

Merge bitcoin#9644: [refactor] Remove using namespace <xxx> from src/

25074ae

b7b48c8 Refactor: Remove using namespace <xxx> from src/*.cpp. (Karl-Johan Alm)

andvgal pushed a commit to energicryptocurrency/gen2-energi that referenced this pull request Jan 6, 2019

Merge bitcoin#9644: [refactor] Remove using namespace <xxx> from src/

775b312

b7b48c8 Refactor: Remove using namespace <xxx> from src/*.cpp. (Karl-Johan Alm)

CryptoCentric pushed a commit to absolute-community/absolute that referenced this pull request Feb 27, 2019

Merge bitcoin#9644: [refactor] Remove using namespace <xxx> from src/

23b277e

b7b48c8 Refactor: Remove using namespace <xxx> from src/*.cpp. (Karl-Johan Alm)

str4d mentioned this pull request Mar 5, 2021

Backport bloom filter improvements zcash/zcash#5026

Merged

bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[refactor] Remove using namespace <xxx> from src/ #9644

[refactor] Remove using namespace <xxx> from src/ #9644

Uh oh!

kallewoof commented Jan 27, 2017 •

edited

Loading

Uh oh!

laanwj commented Jan 27, 2017

Uh oh!

sipa commented Jan 27, 2017

Uh oh!

practicalswift commented Jan 28, 2017

Uh oh!

fanquake commented Jan 28, 2017 via email

Uh oh!

btcdrak commented Jan 28, 2017

Uh oh!

maflcko commented Jan 28, 2017

Uh oh!

maflcko commented Jan 30, 2017

Uh oh!

rebroad commented Feb 1, 2017

Uh oh!

maflcko commented Feb 1, 2017 via email

Uh oh!

rebroad commented Feb 2, 2017

Uh oh!

Uh oh!

[refactor] Remove using namespace <xxx> from src/ #9644

[refactor] Remove using namespace <xxx> from src/ #9644

Uh oh!

Conversation

kallewoof commented Jan 27, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

laanwj commented Jan 27, 2017

Uh oh!

sipa commented Jan 27, 2017

Uh oh!

practicalswift commented Jan 28, 2017

Uh oh!

fanquake commented Jan 28, 2017 via email

Uh oh!

btcdrak commented Jan 28, 2017

Uh oh!

maflcko commented Jan 28, 2017

Uh oh!

maflcko commented Jan 30, 2017

Uh oh!

rebroad commented Feb 1, 2017

Uh oh!

maflcko commented Feb 1, 2017 via email

Uh oh!

rebroad commented Feb 2, 2017

Uh oh!

Uh oh!

kallewoof commented Jan 27, 2017 •

edited

Loading