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.

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

Replace boost::array with std::array #3237

Merged
merged 2 commits into from Jun 7, 2018

Conversation

4 participants
@str4d
Copy link
Contributor

str4d commented May 3, 2018

No description provided.

@str4d str4d added the cleanup label May 3, 2018

@str4d str4d added this to Blocked in Zcashd Team May 3, 2018

@zkbot

This comment has been minimized.

Copy link
Collaborator

zkbot commented May 10, 2018

☔️ The latest upstream changes (presumably #3257) made this pull request unmergeable. Please resolve the merge conflicts.

@str4d str4d force-pushed the str4d:std-array branch from 940ef3a to db5d0ed May 14, 2018

@str4d str4d moved this from Blocked to In Review in Zcashd Team May 14, 2018

@zkbot

This comment has been minimized.

Copy link
Collaborator

zkbot commented May 16, 2018

☔️ The latest upstream changes (presumably #3251) made this pull request unmergeable. Please resolve the merge conflicts.

@str4d str4d moved this from In Review to Blocked in Zcashd Team May 16, 2018

@str4d str4d force-pushed the str4d:std-array branch from db5d0ed to a6bbb26 May 25, 2018

@str4d str4d added this to the v2.0.0 milestone Jun 6, 2018

@str4d str4d moved this from Blocked to In Review in Zcashd Team Jun 6, 2018

@bitcartel
Copy link
Contributor

bitcartel left a comment

utACK.

@bitcartel

This comment has been minimized.

Copy link
Contributor

bitcartel commented Jun 6, 2018

@zkbot try

@zkbot

This comment has been minimized.

Copy link
Collaborator

zkbot commented Jun 6, 2018

⌛️ Trying commit a6bbb26 with merge 62228e1...

zkbot added a commit that referenced this pull request Jun 6, 2018

Auto merge of #3237 - str4d:std-array, r=<try>
Replace boost::array with std::array
@zkbot

This comment has been minimized.

Copy link
Collaborator

zkbot commented Jun 6, 2018

💔 Test failed - pr-try

@str4d

This comment has been minimized.

Copy link
Contributor

str4d commented Jun 6, 2018

@daira

daira approved these changes Jun 7, 2018

Copy link
Contributor

daira left a comment

utACK. I also checked that there were no remaining uses of boost::array, and did a web search for any gotchas about switching from boost::array to std::array. The latter only came up with https://stackoverflow.com/a/35181737/393146 which if I'm reading it correctly, basically says that if it compiles it is very likely to work.

@@ -113,11 +114,11 @@ struct PaymentDisclosurePayload {

struct PaymentDisclosure {
PaymentDisclosurePayload payload;
boost::array<unsigned char, 64> payloadSig;
std::array<unsigned char, 64> payloadSig;

This comment has been minimized.

@daira

daira Jun 7, 2018

Contributor

Nit: either maintain column alignment, or remove all the extra spacing. (Does not block.)

@str4d

This comment has been minimized.

Copy link
Contributor

str4d commented Jun 7, 2018

Addressed @daira's comment.

@zkbot r+

@zkbot

This comment has been minimized.

Copy link
Collaborator

zkbot commented Jun 7, 2018

📌 Commit 4fb3d05 has been approved by str4d

@zkbot

This comment has been minimized.

Copy link
Collaborator

zkbot commented Jun 7, 2018

⌛️ Testing commit 4fb3d05 with merge 80338c0...

zkbot added a commit that referenced this pull request Jun 7, 2018

Auto merge of #3237 - str4d:std-array, r=str4d
Replace boost::array with std::array
@zkbot

This comment has been minimized.

Copy link
Collaborator

zkbot commented Jun 7, 2018

☀️ Test successful - pr-merge
Approved by: str4d
Pushing 80338c0 to master...

@zkbot zkbot merged commit 4fb3d05 into zcash:master Jun 7, 2018

1 check passed

homu Test successful
Details

Zcashd Team automation moved this from In Review to Released (Merged in Master) Jun 7, 2018

@zkbot zkbot referenced this pull request Jun 7, 2018

Merged

Naming improvements #3322

@daira
Copy link
Contributor

daira left a comment

Post-hoc ACK 4fb3d05

@str4d str4d deleted the str4d:std-array branch Jun 7, 2018

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