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

pull jtimon wants to merge 4 commits into bitcoin:master from jtimon:b15-boost-foreach changing 63 files +296 −300

jtimon commented at 5:25 PM on June 1, 2017: contributor

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
practicalswift commented at 6:07 PM on June 1, 2017: contributor

utACK 9eafbf2

Excellent work! I ❤️ modern C++
jtimon force-pushed on Jun 1, 2017
jtimon commented at 8:41 PM on June 1, 2017: contributor

Added one small preparation commit since not all environments where passing travis.
fanquake added the label Refactoring on Jun 1, 2017
fanquake added the label Scripts and tools on Jun 1, 2017
fanquake added this to the "In progress" column in a project

jtimon force-pushed on Jun 2, 2017
jtimon commented at 1:31 AM on June 2, 2017: contributor

Needed rebase after #10195. Just run the sed scripts again. Review should be as simple as it was, more or less.
Small preparations for Q_FOREACH, PAIRTYPE and #include <boost/foreach.hpp> removal a5410ac5ec

scripted-diff: Fully remove BOOST_FOREACH

-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-

7c00c26726

scripted-diff: Remove Q_FOREACH

-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-

18dc3c3962

scripted-diff: Remove PAIRTYPE

-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-

1238f13cf6

jtimon force-pushed on Jun 5, 2017
jtimon commented at 6:15 PM on June 5, 2017: contributor

Needed rebase again(2)
sipa commented at 6:20 PM on June 5, 2017: member

Concept ACK. Nit: you can add a commit that removes the #include <boost/foreach.hpp> directives.
jtimon commented at 7:04 PM on June 5, 2017: contributor

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 commented at 7:16 PM on June 5, 2017: member

utACK 1238f13cf6ccf1177b66df735f360c61ae1dc20b. Seems fine to remove includes in a followup pr as long as some of them are still needed for reverse iteration.
theuni commented at 8:01 PM on June 13, 2017: member

nice, utACK 1238f13cf6ccf1177b66df735f360c61ae1dc20b.
sipa merged this on Jun 14, 2017
sipa closed this on Jun 14, 2017
sipa referenced this in commit 1ad3d4e126 on Jun 14, 2017
sipa commented at 1:06 AM on June 14, 2017: member

utACK 1238f13cf6ccf1177b66df735f360c61ae1dc20b
fanquake moved this from the "In progress" to the "Done" column in a project

jtimon deleted the branch on Jun 14, 2017
PastaPastaPasta referenced this in commit c70a050b0d on Jul 5, 2019
PastaPastaPasta referenced this in commit 387da0a591 on Jul 5, 2019
PastaPastaPasta referenced this in commit bd9e9ee38a on Jul 5, 2019
PastaPastaPasta referenced this in commit 63800a55cc on Jul 5, 2019
PastaPastaPasta referenced this in commit ea1e4157d4 on Jul 5, 2019
PastaPastaPasta referenced this in commit 162daca146 on Jul 5, 2019
PastaPastaPasta referenced this in commit 56a09e8d21 on Jul 6, 2019
PastaPastaPasta referenced this in commit 126024f006 on Jul 6, 2019
PastaPastaPasta referenced this in commit e3d2723aca on Jul 6, 2019
PastaPastaPasta referenced this in commit a053b909e6 on Jul 8, 2019
PastaPastaPasta referenced this in commit 22c3c7b675 on Jul 8, 2019
PastaPastaPasta referenced this in commit db21a2ae09 on Jul 8, 2019
PastaPastaPasta referenced this in commit f4712c09ee on Jul 9, 2019
PastaPastaPasta referenced this in commit 770b52ad12 on Jul 9, 2019
PastaPastaPasta referenced this in commit 55bcf2a4a6 on Jul 9, 2019
PastaPastaPasta referenced this in commit a15d7405e3 on Jul 9, 2019
PastaPastaPasta referenced this in commit 0d52db844c on Jul 9, 2019
PastaPastaPasta referenced this in commit e81a28604c on Jul 9, 2019
barrystyle referenced this in commit b8aa4de7b4 on Jan 22, 2020
barrystyle referenced this in commit ddbe697693 on Jan 22, 2020
barrystyle referenced this in commit 9ed5a69d50 on Jan 22, 2020
zkbot referenced this in commit 77c2a5f810 on Dec 4, 2020
MarcoFalke locked this on Sep 8, 2021

Contributors

Labels

Refactoring Scripts and tools

Linked (view graph)

#10193 scripted-diff: Remove #include <boost/foreach.hpp>#10497 remove the PAIRTYPE macro