Skip to content
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

Rename argument array_index to array_indx in json_pointer methods #1980

Merged
merged 2 commits into from
Apr 5, 2020

Conversation

linev
Copy link
Contributor

@linev linev commented Mar 11, 2020

Fixes gcc48 warning:

declaration of ‘array_index’ shadows a member of 'this' [-Wshadow]

Fixes gcc48 warning:

declaration of ‘array_index’ shadows a member of 'this' [-Wshadow]
@linev linev requested a review from nlohmann as a code owner March 11, 2020 06:45
Copy link
Owner

@nlohmann nlohmann left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please check the suggestions. Furthermore, could you please also run make amalgamate to create the single-header version?

include/nlohmann/detail/json_pointer.hpp Outdated Show resolved Hide resolved
include/nlohmann/detail/json_pointer.hpp Outdated Show resolved Hide resolved
include/nlohmann/detail/json_pointer.hpp Outdated Show resolved Hide resolved
include/nlohmann/detail/json_pointer.hpp Outdated Show resolved Hide resolved
include/nlohmann/detail/json_pointer.hpp Outdated Show resolved Hide resolved
include/nlohmann/detail/json_pointer.hpp Outdated Show resolved Hide resolved
include/nlohmann/detail/json_pointer.hpp Outdated Show resolved Hide resolved
include/nlohmann/detail/json_pointer.hpp Outdated Show resolved Hide resolved
Avoid mix-up with array_index member

Co-Authored-By: Niels Lohmann <niels.lohmann@gmail.com>
Copy link
Owner

@nlohmann nlohmann left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me.

@nlohmann nlohmann self-assigned this Apr 5, 2020
@nlohmann nlohmann added this to the Release 3.7.4 milestone Apr 5, 2020
@nlohmann nlohmann merged commit 3884d33 into nlohmann:develop Apr 5, 2020
@nlohmann
Copy link
Owner

nlohmann commented Apr 5, 2020

Thanks!

@nlohmann
Copy link
Owner

nlohmann commented Apr 5, 2020


🔖 Release item

This issue/PR will be part of the next release of the library. This template helps preparing the release notes.

Type

  • ✨ New Feature
  • 🐛 Bug Fix
  • ⚡️ Improvement
  • 🔨 Further Change
  • 🔥 Deprecated function

Description


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

Successfully merging this pull request may close these issues.

None yet

2 participants