Skip to content
This repository was archived by the owner on Jun 17, 2022. It is now read-only.

Conversation

@maflcko
Copy link

@maflcko maflcko commented Mar 11, 2018

Exact commit taken from jgarzik#46 by jasonbcox

@maflcko
Copy link
Author

maflcko commented May 3, 2018

@jnewbery This is commit taken from "upstream". Mind to give it a quick review?

@jnewbery
Copy link

jnewbery commented May 3, 2018

Not sure why they didn't complete the job and remove using namespace std; from test/test_json.cpp.

This is fine to merge as is to match the upstream commit.

@maflcko
Copy link
Author

maflcko commented Aug 31, 2018

@laanwj I think this can be merged to make git diff easier against the jgarzik/univalue fork

@laanwj laanwj merged commit d208f98 into bitcoin-core:master Aug 31, 2018
laanwj added a commit that referenced this pull request Aug 31, 2018
d208f98 Cleaned up namespace imports to reduce symbol collisions (Jason B. Cox)

Pull request description:

  Exact commit taken from jgarzik#46 by jasonbcox

Tree-SHA512: 127db323530b03147d52de4107600024921f69756e0b2f0ecbb59f27f1783758a4d9016eb3b52c64170d03aa496c8b682affee171c51f86a4a4af6907b004b94
@maflcko maflcko deleted the Mf1803-univalue-std branch August 31, 2018 15:25
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants