Page MenuHomePhabricator
Differential D14392

Replace boost::variant with std::variant
ClosedPublic
Actions

Authored by PiRK on Aug 21 2023, 13:41.

Details

Reviewers
Fabien
Group Reviewers
Restricted Project
Commits
rABCbb2ac46df04e: Replace boost::variant with std::variant
Summary

This is a backport of core#20480

Test Plan

ninja all check-all

Diff Detail

Repository
rABC Bitcoin ABC
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

PiRK created this revision.Aug 21 2023, 13:41
Herald added a reviewer: Restricted Project. · View Herald TranscriptAug 21 2023, 13:41
PiRK requested review of this revision.Aug 21 2023, 13:41
teamcity edited the summary of this revision. (Show Details)Aug 21 2023, 13:41
PiRK added inline comments.Aug 21 2023, 13:44
src/test/cashaddrenc_tests.cpp
135 ↗(On Diff #41873)

Note that the previous code fails to compile after switching from boost::variant to std::variant.

194 ↗(On Diff #41873)

dito

PiRK updated this revision to Diff 41874.Aug 21 2023, 13:46

remove lint-includes.sh

Harbormaster completed remote builds in B24803: Diff 41873.Aug 21 2023, 13:47
teamcity added a comment.Aug 21 2023, 13:47
Build Bitcoin ABC Diffs / Diff Testing (build-clang) failed.

Tail of the build log:

OK
[186/486] cd /work/contrib/devtools/chainparams && /usr/bin/python3.9 ./test_make_chainparams.py
.....
----------------------------------------------------------------------
Ran 5 tests in 0.002s

OK
[187/486] Automatic MOC for target test_bitcoin-qt
[188/486] Building CXX object src/test/CMakeFiles/test_bitcoin.dir/__/wallet/test/scriptpubkeyman_tests.cpp.o
[189/486] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/bitcoinaddressvalidatortests.cpp.o
[190/486] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/compattests.cpp.o
[191/486] Test Bitcoin utilities...
[192/486] pow: testing aserti32d_tests
[193/486] Building CXX object src/test/CMakeFiles/test_bitcoin.dir/__/wallet/test/ismine_tests.cpp.o
[194/486] Running utility command for check-pow-aserti32d_tests
[195/486] Running pow test suite
PASSED: pow test suite
[196/486] avalanche: testing peermanager_tests
[197/486] Running utility command for check-avalanche-peermanager_tests
[198/486] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/util.cpp.o
[199/486] Building CXX object src/test/CMakeFiles/test_bitcoin.dir/__/wallet/test/psbt_wallet_tests.cpp.o
[200/486] avalanche: testing processor_tests
[201/486] Running utility command for check-avalanche-processor_tests
[202/486] Running avalanche test suite
PASSED: avalanche test suite
[203/486] Building CXX object src/test/CMakeFiles/test_bitcoin.dir/__/wallet/test/walletdb_tests.cpp.o
[204/486] Building CXX object src/test/CMakeFiles/test_bitcoin.dir/__/wallet/test/coinselector_tests.cpp.o
[205/486] Building CXX object src/seeder/test/CMakeFiles/test-seeder.dir/message_writer_tests.cpp.o
[206/486] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/test_bitcoin-qt_autogen/mocs_compilation.cpp.o
[207/486] Linking CXX executable src/seeder/test/test-seeder
[208/486] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/guiutiltests.cpp.o
[209/486] seeder: testing p2p_messaging_tests
[210/486] seeder: testing options_tests
[211/486] seeder: testing message_writer_tests
[212/486] seeder: testing parse_name_tests
[213/486] Running utility command for check-seeder-p2p_messaging_tests
[214/486] Running utility command for check-seeder-options_tests
[215/486] Running utility command for check-seeder-message_writer_tests
[216/486] Running utility command for check-seeder-parse_name_tests
[217/486] seeder: testing write_name_tests
[218/486] Running utility command for check-seeder-write_name_tests
[219/486] Running seeder test suite
PASSED: seeder test suite
[220/486] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/uritests.cpp.o
[221/486] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/test_main.cpp.o
[222/486] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/apptests.cpp.o
[223/486] Building CXX object src/test/CMakeFiles/test_bitcoin.dir/__/wallet/test/wallet_tests.cpp.o
[224/486] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/rpcnestedtests.cpp.o
[225/486] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/paymentservertests.cpp.o
[226/486] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/__/__/wallet/test/wallet_test_fixture.cpp.o
[227/486] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/wallettests.cpp.o
[228/486] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/addressbooktests.cpp.o
[229/486] Linking CXX executable src/qt/test/test_bitcoin-qt
[230/486] bitcoin-qt: testing test_bitcoin-qt
[231/486] Running bitcoin-qt test suite
PASSED: bitcoin-qt test suite
[232/486] Building CXX object src/test/CMakeFiles/test_bitcoin.dir/script_tests.cpp.o
ninja: build stopped: cannot make progress due to previous errors.
Build build-clang failed with exit code 1
Harbormaster completed remote builds in B24804: Diff 41874.Aug 21 2023, 13:53
teamcity added a comment.Aug 21 2023, 13:53
Build Bitcoin ABC Diffs / Diff Testing (build-clang) failed.

Tail of the build log:

----------------------------------------------------------------------
Ran 5 tests in 0.001s

OK
[182/486] Automatic MOC for target test_bitcoin-qt
[183/486] Building CXX object src/seeder/test/CMakeFiles/test-seeder.dir/parse_name_tests.cpp.o
[184/486] Building CXX object src/seeder/test/CMakeFiles/test-seeder.dir/options_tests.cpp.o
[185/486] Building CXX object src/seeder/test/CMakeFiles/test-seeder.dir/write_name_tests.cpp.o
[186/486] Test Bitcoin utilities...
[187/486] Building CXX object src/pow/test/CMakeFiles/test-pow.dir/grasberg_tests.cpp.o
[188/486] Building CXX object src/seeder/test/CMakeFiles/test-seeder.dir/p2p_messaging_tests.cpp.o
[189/486] Building CXX object src/seeder/test/CMakeFiles/test-seeder.dir/message_writer_tests.cpp.o
[190/486] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/bitcoinaddressvalidatortests.cpp.o
[191/486] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/compattests.cpp.o
[192/486] Building CXX object src/test/CMakeFiles/test_bitcoin.dir/__/wallet/test/wallet_tests.cpp.o
[193/486] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/test_bitcoin-qt_autogen/mocs_compilation.cpp.o
[194/486] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/util.cpp.o
[195/486] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/guiutiltests.cpp.o
[196/486] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/uritests.cpp.o
[197/486] Building CXX object src/test/CMakeFiles/test_bitcoin.dir/util_tests.cpp.o
[198/486] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/apptests.cpp.o
[199/486] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/test_main.cpp.o
[200/486] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/rpcnestedtests.cpp.o
[201/486] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/paymentservertests.cpp.o
[202/486] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/__/__/wallet/test/wallet_test_fixture.cpp.o
[203/486] Building CXX object src/test/CMakeFiles/test_bitcoin.dir/script_tests.cpp.o
[204/486] Building CXX object src/pow/test/CMakeFiles/test-pow.dir/fixture.cpp.o
[205/486] Linking CXX executable src/pow/test/test-pow
[206/486] pow: testing daa_tests
[207/486] Running utility command for check-pow-daa_tests
[208/486] pow: testing eda_tests
[209/486] Running utility command for check-pow-eda_tests
[210/486] pow: testing grasberg_tests
[211/486] Running utility command for check-pow-grasberg_tests
[212/486] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/addressbooktests.cpp.o
[213/486] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/wallettests.cpp.o
[214/486] Linking CXX executable src/qt/test/test_bitcoin-qt
[215/486] Building CXX object src/seeder/test/CMakeFiles/test-seeder.dir/fixture.cpp.o
[216/486] Linking CXX executable src/seeder/test/test-seeder
[217/486] pow: testing aserti32d_tests
[218/486] Running utility command for check-pow-aserti32d_tests
[219/486] Running pow test suite
PASSED: pow test suite
[220/486] seeder: testing message_writer_tests
[221/486] seeder: testing p2p_messaging_tests
[222/486] seeder: testing options_tests
[223/486] seeder: testing parse_name_tests
[224/486] Running utility command for check-seeder-message_writer_tests
[225/486] Running utility command for check-seeder-p2p_messaging_tests
[226/486] Running utility command for check-seeder-options_tests
[227/486] seeder: testing write_name_tests
[228/486] Running utility command for check-seeder-parse_name_tests
[229/486] Running utility command for check-seeder-write_name_tests
[230/486] Running seeder test suite
PASSED: seeder test suite
[231/486] bitcoin-qt: testing test_bitcoin-qt
[232/486] Running bitcoin-qt test suite
PASSED: bitcoin-qt test suite
ninja: build stopped: cannot make progress due to previous errors.
Build build-clang failed with exit code 1
Fabien requested changes to this revision.Aug 21 2023, 20:01
Fabien added a subscriber: Fabien.

Back to your queue

This revision now requires changes to proceed.Aug 21 2023, 20:01
PiRK updated this revision to Diff 41881.Aug 22 2023, 06:02

remove unused variable causing the compilation to error with clang (in untouched test case... weird)

Harbormaster completed remote builds in B24808: Diff 41881.Aug 22 2023, 06:21
Fabien accepted this revision.Aug 22 2023, 08:44
This revision is now accepted and ready to land.Aug 22 2023, 08:44
Closed by commit rABCbb2ac46df04e: Replace boost::variant with std::variant (authored by MarcoFalke <falke.marco@gmail.com>, committed by PiRK). · Explain WhyAug 22 2023, 11:38
This revision was automatically updated to reflect the committed changes.
PiRK added a commit: rABCbb2ac46df04e: Replace boost::variant with std::variant.

Revision Contents
Changeset List

PathSize
src/
avalanche/
3 lines
7 lines
7 lines
qt/
3 lines
4 lines
3 lines
3 lines
rpc/
7 lines
script/
4 lines
4 lines
5 lines
6 lines
test/
13 lines
32 lines
util/
2 lines
wallet/
rpc/
2 lines
10 lines
2 lines
test/
7 lines
4 lines
test/
lint/
3 lines

Diff 41887

View Options

src/avalanche/proof.cpp

Loading...
View Options

src/cashaddrenc.cpp

Loading...
View Options

src/key_io.cpp

Loading...
View Options

src/qt/addresstablemodel.cpp

Loading...
View Options

src/qt/coincontroldialog.cpp

Loading...
View Options

src/qt/signverifymessagedialog.cpp

Loading...
View Options

src/qt/transactionrecord.cpp

Loading...
View Options

src/rpc/util.cpp

Loading...
View Options

src/script/descriptor.cpp

Loading...
View Options

src/script/signingprovider.cpp

Loading...
View Options

src/script/standard.h

Loading...
View Options

src/script/standard.cpp

Loading...
View Options

src/test/cashaddrenc_tests.cpp

Loading...
View Options

src/test/script_standard_tests.cpp

Loading...
View Options

src/util/message.cpp

Loading...
View Options

src/wallet/rpc/signmessage.cpp

Loading...
View Options

src/wallet/rpcwallet.cpp

Loading...
View Options

src/wallet/spend.cpp

Loading...
View Options

src/wallet/test/wallet_tests.cpp

Loading...
View Options

src/wallet/wallet.cpp

Loading...
View Options

test/lint/lint-boost-dependencies.sh

Loading...