scripted-diff: Remove BOOST_FOREACH, Q_FOREACH and PAIRTYPE #10502

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merged

sipa merged 4 commits into bitcoin:master from jtimon:b15-boost-foreach

Jun 14, 2017

Contributor

jtimon commented Jun 1, 2017

Separated from #10193 since the reverse iterator isn't working there, as suggested in #10193 (comment) (but without removing #include <boost/foreach.hpp> everywhere except where BOOST_REVERSE_FOREACH is needed).

Seems to compete with #10497

This was referenced Jun 1, 2017

scripted-diff: Remove #include <boost/foreach.hpp> #10193

Merged

remove the PAIRTYPE macro #10497

Closed

Contributor

practicalswift commented Jun 1, 2017

utACK 9eafbf2

Excellent work! I ❤️ modern C++

jtimon force-pushed the b15-boost-foreach branch from 9eafbf2 to 3e27936 Compare

June 1, 2017 20:40

Contributor Author

jtimon commented Jun 1, 2017

Added one small preparation commit since not all environments where passing travis.

fanquake added Refactoring Scripts and tools labels

jtimon force-pushed the b15-boost-foreach branch from 3e27936 to c04c186 Compare

June 2, 2017 01:29

Contributor Author

jtimon commented Jun 2, 2017

Needed rebase after #10195. Just run the sed scripts again. Review should be as simple as it was, more or less.

sipa mentioned this pull request

scripted-diff: Use the C++11 keyword nullptr to denote the pointer literal instead of the macro NULL #10483

Merged

jtimon added 4 commits

June 5, 2017 20:02


          Small preparations for Q_FOREACH, PAIRTYPE and #include <boost/foreac…

a5410ac

…h.hpp> removal


          scripted-diff: Fully remove BOOST_FOREACH

7c00c26

-BEGIN VERIFY SCRIPT-
sed -i 's/BOOST_FOREACH *(\(.*\),/for (\1 :/' ./src/*.h ./src/*.cpp ./src/*/*.h ./src/*/*.cpp ./src/*/*/*.h ./src/*/*/*.cpp ;
-END VERIFY SCRIPT-


          scripted-diff: Remove Q_FOREACH

18dc3c3

-BEGIN VERIFY SCRIPT-
sed -i 's/Q_FOREACH *(\(.*\),/for (\1 :/' ./src/*.h ./src/*.cpp ./src/*/*.h ./src/*/*.cpp ./src/*/*/*.h ./src/*/*/*.cpp ;
-END VERIFY SCRIPT-


          scripted-diff: Remove PAIRTYPE

1238f13

-BEGIN VERIFY SCRIPT-
sed -i 's/PAIRTYPE(\([^,]*\), \([^\)]*\))/std::pair<\1, \2>/' ./src/*.h ./src/*.cpp ./src/*/*.h ./src/*/*.cpp ./src/*/*/*.h ./src/*/*/*.cpp ;
sed -i ':a;N;$!ba;s/#define std::pair<t1, t2>    std::pair<t1, t2>\n//' ./src/utilstrencodings.h ;
-END VERIFY SCRIPT-

jtimon force-pushed the b15-boost-foreach branch from c04c186 to 1238f13 Compare

June 5, 2017 18:15

Contributor Author

jtimon commented Jun 5, 2017

Needed rebase again(2)

Member

sipa commented Jun 5, 2017

Concept ACK. Nit: you can add a commit that removes the #include <boost/foreach.hpp> directives.

Contributor Author

jtimon commented Jun 5, 2017 •

edited

Loading

you can add a commit that removes the #include <boost/foreach.hpp> directives.

But not in the whole project yet, because I'm not able to remove BOOST_REVERSE_FOREACH yet, see #10193 on top of this one. I can remove it only on the files that I can for now.

ryanofsky reviewed

View reviewed changes

Contributor

ryanofsky left a comment

utACK 1238f13. Seems fine to remove includes in a followup pr as long as some of them are still needed for reverse iteration.

Member

theuni commented Jun 13, 2017

nice, utACK 1238f13.

jtimon mentioned this pull request

Improve commit-check-script.sh #10480

Merged

sipa merged commit 1238f13 into bitcoin:master

sipa added a commit that referenced this pull request


          Merge #10502: scripted-diff: Remove BOOST_FOREACH, Q_FOREACH and PAIR…

1ad3d4e

…TYPE

1238f13 scripted-diff: Remove PAIRTYPE (Jorge Timón)
18dc3c3 scripted-diff: Remove Q_FOREACH (Jorge Timón)
7c00c26 scripted-diff: Fully remove BOOST_FOREACH (Jorge Timón)
a5410ac Small preparations for Q_FOREACH, PAIRTYPE and #include <boost/foreach.hpp> removal (Jorge Timón)

Tree-SHA512: d3ab4a173366402e7dcef31608977b757d4aa07abbbad2ee1bcbcfa311e994a4552f24e5a55272cb22c2dcf89a4b0495e02e9d9aceae4b08c0bab668f20e324c

Member

sipa commented Jun 14, 2017

utACK 1238f13

jtimon mentioned this pull request

Util: Remove redundant calls to argsGlobal.IsArgSet() #10118

Merged

1 task

jtimon deleted the b15-boost-foreach branch

June 14, 2017 04:24

jtimon mentioned this pull request

TODO for release notes 0.15.0 #9889

Closed

12 tasks

PastaPastaPasta added a commit to PastaPastaPasta/dash that referenced this pull request


          scripted diff: bitcoin#10502 Fully remove BOOST_FOREACH

c70a050

-BEGIN VERIFY SCRIPT-
sed -i 's/BOOST_FOREACH *(\(.*\),/for (\1 :/' ./src/*.h ./src/*.cpp ./src/*/*.h ./src/*/*.cpp ./src/*/*/*.h ./src/*/*/*.cpp ;
-END VERIFY SCRIPT-

PastaPastaPasta added a commit to PastaPastaPasta/dash that referenced this pull request


          scripted-diff: Remove Q_FOREACH bitcoin#10502

387da0a

-BEGIN VERIFY SCRIPT-
sed -i 's/Q_FOREACH *(\(.*\),/for (\1 :/' ./src/*.h ./src/*.cpp ./src/*/*.h ./src/*/*.cpp ./src/*/*/*.h ./src/*/*/*.cpp ;
-END VERIFY SCRIPT-

PastaPastaPasta added a commit to PastaPastaPasta/dash that referenced this pull request


          scripted-diff: Remove PAIRTYPE bitcoin#10502

bd9e9ee

-BEGIN VERIFY SCRIPT-
sed -i 's/PAIRTYPE(\([^,]*\), \([^\)]*\))/std::pair<\1, \2>/' ./src/*.h ./src/*.cpp ./src/*/*.h ./src/*/*.cpp ./src/*/*/*.h ./src/*/*/*.cpp ;
sed -i ':a;N;$!ba;s/#define std::pair<t1, t2>    std::pair<t1, t2>\n//' ./src/utilstrencodings.h ;
-END VERIFY SCRIPT-

PastaPastaPasta added a commit to PastaPastaPasta/dash that referenced this pull request


          scripted diff: bitcoin#10502 Fully remove BOOST_FOREACH

63800a5

-BEGIN VERIFY SCRIPT-
sed -i 's/BOOST_FOREACH *(\(.*\),/for (\1 :/' ./src/*.h ./src/*.cpp ./src/*/*.h ./src/*/*.cpp ./src/*/*/*.h ./src/*/*/*.cpp ;
-END VERIFY SCRIPT-

PastaPastaPasta added a commit to PastaPastaPasta/dash that referenced this pull request


          scripted-diff: Remove Q_FOREACH bitcoin#10502

ea1e415

-BEGIN VERIFY SCRIPT-
sed -i 's/Q_FOREACH *(\(.*\),/for (\1 :/' ./src/*.h ./src/*.cpp ./src/*/*.h ./src/*/*.cpp ./src/*/*/*.h ./src/*/*/*.cpp ;
-END VERIFY SCRIPT-

PastaPastaPasta added a commit to PastaPastaPasta/dash that referenced this pull request


          scripted-diff: Remove PAIRTYPE bitcoin#10502

162daca

-BEGIN VERIFY SCRIPT-
sed -i 's/PAIRTYPE(\([^,]*\), \([^\)]*\))/std::pair<\1, \2>/' ./src/*.h ./src/*.cpp ./src/*/*.h ./src/*/*.cpp ./src/*/*/*.h ./src/*/*/*.cpp ;
sed -i ':a;N;$!ba;s/#define std::pair<t1, t2>    std::pair<t1, t2>\n//' ./src/utilstrencodings.h ;
-END VERIFY SCRIPT-

PastaPastaPasta added a commit to PastaPastaPasta/dash that referenced this pull request


          scripted diff: bitcoin#10502 Fully remove BOOST_FOREACH

56a09e8

-BEGIN VERIFY SCRIPT-
sed -i 's/BOOST_FOREACH *(\(.*\),/for (\1 :/' ./src/*.h ./src/*.cpp ./src/*/*.h ./src/*/*.cpp ./src/*/*/*.h ./src/*/*/*.cpp ;
-END VERIFY SCRIPT-

PastaPastaPasta added a commit to PastaPastaPasta/dash that referenced this pull request


          scripted-diff: Remove Q_FOREACH bitcoin#10502

126024f

-BEGIN VERIFY SCRIPT-
sed -i 's/Q_FOREACH *(\(.*\),/for (\1 :/' ./src/*.h ./src/*.cpp ./src/*/*.h ./src/*/*.cpp ./src/*/*/*.h ./src/*/*/*.cpp ;
-END VERIFY SCRIPT-

PastaPastaPasta added a commit to PastaPastaPasta/dash that referenced this pull request


          scripted-diff: Remove PAIRTYPE bitcoin#10502

e3d2723

-BEGIN VERIFY SCRIPT-
sed -i 's/PAIRTYPE(\([^,]*\), \([^\)]*\))/std::pair<\1, \2>/' ./src/*.h ./src/*.cpp ./src/*/*.h ./src/*/*.cpp ./src/*/*/*.h ./src/*/*/*.cpp ;
sed -i ':a;N;$!ba;s/#define std::pair<t1, t2>    std::pair<t1, t2>\n//' ./src/utilstrencodings.h ;
-END VERIFY SCRIPT-

PastaPastaPasta added a commit to PastaPastaPasta/dash that referenced this pull request


          scripted diff: bitcoin#10502 Fully remove BOOST_FOREACH

a053b90

-BEGIN VERIFY SCRIPT-
sed -i 's/BOOST_FOREACH *(\(.*\),/for (\1 :/' ./src/*.h ./src/*.cpp ./src/*/*.h ./src/*/*.cpp ./src/*/*/*.h ./src/*/*/*.cpp ;
-END VERIFY SCRIPT-

PastaPastaPasta added a commit to PastaPastaPasta/dash that referenced this pull request


          scripted-diff: Remove Q_FOREACH bitcoin#10502

22c3c7b

-BEGIN VERIFY SCRIPT-
sed -i 's/Q_FOREACH *(\(.*\),/for (\1 :/' ./src/*.h ./src/*.cpp ./src/*/*.h ./src/*/*.cpp ./src/*/*/*.h ./src/*/*/*.cpp ;
-END VERIFY SCRIPT-

PastaPastaPasta added a commit to PastaPastaPasta/dash that referenced this pull request


          scripted-diff: Remove PAIRTYPE bitcoin#10502

db21a2a

-BEGIN VERIFY SCRIPT-
sed -i 's/PAIRTYPE(\([^,]*\), \([^\)]*\))/std::pair<\1, \2>/' ./src/*.h ./src/*.cpp ./src/*/*.h ./src/*/*.cpp ./src/*/*/*.h ./src/*/*/*.cpp ;
sed -i ':a;N;$!ba;s/#define std::pair<t1, t2>    std::pair<t1, t2>\n//' ./src/utilstrencodings.h ;
-END VERIFY SCRIPT-

PastaPastaPasta added a commit to PastaPastaPasta/dash that referenced this pull request


          scripted diff: bitcoin#10502 Fully remove BOOST_FOREACH

f4712c0

-BEGIN VERIFY SCRIPT-
sed -i 's/BOOST_FOREACH *(\(.*\),/for (\1 :/' ./src/*.h ./src/*.cpp ./src/*/*.h ./src/*/*.cpp ./src/*/*/*.h ./src/*/*/*.cpp ;
-END VERIFY SCRIPT-

PastaPastaPasta added a commit to PastaPastaPasta/dash that referenced this pull request


          scripted-diff: Remove Q_FOREACH bitcoin#10502

770b52a

-BEGIN VERIFY SCRIPT-
sed -i 's/Q_FOREACH *(\(.*\),/for (\1 :/' ./src/*.h ./src/*.cpp ./src/*/*.h ./src/*/*.cpp ./src/*/*/*.h ./src/*/*/*.cpp ;
-END VERIFY SCRIPT-

PastaPastaPasta added a commit to PastaPastaPasta/dash that referenced this pull request


          scripted-diff: Remove PAIRTYPE bitcoin#10502

55bcf2a

-BEGIN VERIFY SCRIPT-
sed -i 's/PAIRTYPE(\([^,]*\), \([^\)]*\))/std::pair<\1, \2>/' ./src/*.h ./src/*.cpp ./src/*/*.h ./src/*/*.cpp ./src/*/*/*.h ./src/*/*/*.cpp ;
sed -i ':a;N;$!ba;s/#define std::pair<t1, t2>    std::pair<t1, t2>\n//' ./src/utilstrencodings.h ;
-END VERIFY SCRIPT-

PastaPastaPasta added a commit to PastaPastaPasta/dash that referenced this pull request


          scripted diff: bitcoin#10502 Fully remove BOOST_FOREACH

a15d740

-BEGIN VERIFY SCRIPT-
sed -i 's/BOOST_FOREACH *(\(.*\),/for (\1 :/' ./src/*.h ./src/*.cpp ./src/*/*.h ./src/*/*.cpp ./src/*/*/*.h ./src/*/*/*.cpp ;
-END VERIFY SCRIPT-

PastaPastaPasta added a commit to PastaPastaPasta/dash that referenced this pull request


          scripted-diff: Remove Q_FOREACH bitcoin#10502

0d52db8

-BEGIN VERIFY SCRIPT-
sed -i 's/Q_FOREACH *(\(.*\),/for (\1 :/' ./src/*.h ./src/*.cpp ./src/*/*.h ./src/*/*.cpp ./src/*/*/*.h ./src/*/*/*.cpp ;
-END VERIFY SCRIPT-

PastaPastaPasta added a commit to PastaPastaPasta/dash that referenced this pull request


          scripted-diff: Remove PAIRTYPE bitcoin#10502

e81a286

-BEGIN VERIFY SCRIPT-
sed -i 's/PAIRTYPE(\([^,]*\), \([^\)]*\))/std::pair<\1, \2>/' ./src/*.h ./src/*.cpp ./src/*/*.h ./src/*/*.cpp ./src/*/*/*.h ./src/*/*/*.cpp ;
sed -i ':a;N;$!ba;s/#define std::pair<t1, t2>    std::pair<t1, t2>\n//' ./src/utilstrencodings.h ;
-END VERIFY SCRIPT-

barrystyle pushed a commit to PACGlobalOfficial/PAC that referenced this pull request


          scripted diff: bitcoin#10502 Fully remove BOOST_FOREACH

b8aa4de

-BEGIN VERIFY SCRIPT-
sed -i 's/BOOST_FOREACH *(\(.*\),/for (\1 :/' ./src/*.h ./src/*.cpp ./src/*/*.h ./src/*/*.cpp ./src/*/*/*.h ./src/*/*/*.cpp ;
-END VERIFY SCRIPT-

barrystyle pushed a commit to PACGlobalOfficial/PAC that referenced this pull request


          scripted-diff: Remove Q_FOREACH bitcoin#10502

ddbe697

-BEGIN VERIFY SCRIPT-
sed -i 's/Q_FOREACH *(\(.*\),/for (\1 :/' ./src/*.h ./src/*.cpp ./src/*/*.h ./src/*/*.cpp ./src/*/*/*.h ./src/*/*/*.cpp ;
-END VERIFY SCRIPT-

barrystyle pushed a commit to PACGlobalOfficial/PAC that referenced this pull request


          scripted-diff: Remove PAIRTYPE bitcoin#10502

9ed5a69

-BEGIN VERIFY SCRIPT-
sed -i 's/PAIRTYPE(\([^,]*\), \([^\)]*\))/std::pair<\1, \2>/' ./src/*.h ./src/*.cpp ./src/*/*.h ./src/*/*.cpp ./src/*/*/*.h ./src/*/*/*.cpp ;
sed -i ':a;N;$!ba;s/#define std::pair<t1, t2>    std::pair<t1, t2>\n//' ./src/utilstrencodings.h ;
-END VERIFY SCRIPT-

str4d mentioned this pull request

Backport Boost removal PRs zcash/zcash#4877

Merged

zkbot added a commit to zcash/zcash that referenced this pull request


          Auto merge of #4877 - str4d:boost-backports, r=str4d

77c2a5f

Backport Boost removal PRs

Cherry-picked from the following upstream PRs:
- bitcoin/bitcoin#7613
- bitcoin/bitcoin#10502
- bitcoin/bitcoin#10193
- bitcoin/bitcoin#13961
- bitcoin/bitcoin#13734
  - Only the second commit (we don't need the first).
- bitcoin/bitcoin#14480

Part of #4819.

bitcoin locked as resolved and limited conversation to collaborators

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Refactoring Scripts and tools