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

util: Update tinyformat #1640

Merged
merged 1 commit into from Oct 25, 2016

Conversation

Projects
None yet
3 participants
@daira
Contributor

daira commented Oct 25, 2016

Updates tinyformat.h to commit
c42f/tinyformat@3a33bbf upstream.

Makes sure that our local changes are kept:

Inspired by bitcoin/bitcoin#8264.

For Zcash: ref #1349

util: Update tinyformat
Updates `tinyformat.h` to commit
c42f/tinyformat@3a33bbf upstream.

Makes sure that our local changes are kept:

- #3767 1b8fd35 Make tinyformat errors raise an exception instead of assert()ing
- #4735 9b6d4c5 Move strprintf define to tinyformat.h
- #4748 6e5fd00 include stdexcept (for std::exception)
- #8000 9eaa0af force USE_VARIADIC_TEMPLATES
- Add `std::string format(const std::string &fmt...` added this
  at the time, as we want to be able to do `strprintf(_(...), ...)`

Inspired by #8264.

@daira daira added the review needed label Oct 25, 2016

@daira daira added this to the 1.0.0-rc3 milestone Oct 25, 2016

@daira

This comment has been minimized.

Show comment
Hide comment
@daira

daira Oct 25, 2016

Contributor

This is the same as upstream bitcoin/bitcoin@695041e (trivial cherry-pick).

Contributor

daira commented Oct 25, 2016

This is the same as upstream bitcoin/bitcoin@695041e (trivial cherry-pick).

@str4d

This comment has been minimized.

Show comment
Hide comment
@str4d

str4d Oct 25, 2016

Contributor

I have checked that this is indeed identical to bitcoin/bitcoin@695041e.

utACK. We will retain any bugs present in upstream Bitcoin ;P

Contributor

str4d commented Oct 25, 2016

I have checked that this is indeed identical to bitcoin/bitcoin@695041e.

utACK. We will retain any bugs present in upstream Bitcoin ;P

@daira

This comment has been minimized.

Show comment
Hide comment
@daira

daira Oct 25, 2016

Contributor

@zkbot r+

Contributor

daira commented Oct 25, 2016

@zkbot r+

@zkbot

This comment has been minimized.

Show comment
Hide comment
@zkbot

zkbot Oct 25, 2016

Contributor

📌 Commit c5b9bd9 has been approved by daira

Contributor

zkbot commented Oct 25, 2016

📌 Commit c5b9bd9 has been approved by daira

@zkbot

This comment has been minimized.

Show comment
Hide comment
@zkbot

zkbot Oct 25, 2016

Contributor

⌛️ Testing commit c5b9bd9 with merge 6bad499...

Contributor

zkbot commented Oct 25, 2016

⌛️ Testing commit c5b9bd9 with merge 6bad499...

zkbot pushed a commit that referenced this pull request Oct 25, 2016

zkbot
Auto merge of #1640 - daira:upstream-update-tinyformat, r=daira
util: Update tinyformat

Updates `tinyformat.h` to commit
c42f/tinyformat@3a33bbf upstream.

Makes sure that our local changes are kept:

- bitcoin/bitcoin#3767 1b8fd35 Make tinyformat errors raise an exception instead of assert()ing
- bitcoin/bitcoin#4735 9b6d4c5 Move strprintf define to tinyformat.h
- bitcoin/bitcoin#4748 6e5fd00 include stdexcept (for std::exception)
- bitcoin/bitcoin#8000 9eaa0af force USE_VARIADIC_TEMPLATES
- Add `std::string format(const std::string &fmt...` added this
  at the time, as we want to be able to do `strprintf(_(...), ...)`

Inspired by bitcoin/bitcoin#8264.

For Zcash: ref #1349
@zkbot

This comment has been minimized.

Show comment
Hide comment
@zkbot

zkbot Oct 25, 2016

Contributor

☀️ Test successful - zcash

Contributor

zkbot commented Oct 25, 2016

☀️ Test successful - zcash

@zkbot zkbot merged commit c5b9bd9 into zcash:master Oct 25, 2016

1 check passed

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