Skip to content

Conversation

MarcoFalke added 2 commits September 25, 2016 15:19
daf1285 Merge pull request #2 from jgarzik/master
d9e62d3 Merge pull request #24 from MarcoFalke/Mf1608-cleanup
faf260f Rem unused vars and prefer prefix operator for non-primitive type
09a2693 Merge pull request #22 from laanwj/2016_04_unicode
c74a04c Merge pull request #23 from paveljanik/20160527_Wshadow
fceb4f8 Do not shadow variables

git-subtree-dir: src/univalue
git-subtree-split: daf1285af60c2c73801c0f41469c9802c849343d
@laanwj
Copy link
Member

laanwj commented Sep 25, 2016

Code review ACK 9bf41af, looks like only shadowing changes.

src/univalue in HEAD was last updated to upstream commit daf1285af60c2c73801c0f41469c9802c849343d (tree 6ae2456f21359c3e87429fecfaf2b8de643a07de) src/univalue in HEAD currently refers to tree 6ae2456f21359c3e87429fecfaf2b8de643a07de GOOD

@laanwj laanwj merged commit 9bf41af into bitcoin:master Sep 25, 2016
laanwj added a commit that referenced this pull request Sep 25, 2016
3650668 Squashed 'src/univalue/' changes from f32df99..daf1285 (MarcoFalke)
@paveljanik
Copy link
Contributor

Not only shadowing, but also i++ -> ++i.
Postmerge ACK.

Wshadow issue updated to mention, this is merged.

@maflcko maflcko deleted the Mf1609-univalueSync branch September 25, 2016 15:30
codablock pushed a commit to codablock/dash that referenced this pull request Jan 11, 2018
3650668 Squashed 'src/univalue/' changes from f32df99..daf1285 (MarcoFalke)
lateminer pushed a commit to lateminer/bitcoin that referenced this pull request Jan 5, 2019
andvgal pushed a commit to energicryptocurrency/gen2-energi that referenced this pull request Jan 6, 2019
3650668 Squashed 'src/univalue/' changes from f32df99..daf1285 (MarcoFalke)
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants