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.

Sign up for GitHub

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

Jump to bottom

Rename argument array_index to array_indx in json_pointer methods #1980

Merged
merged 2 commits into from
Apr 5, 2020
Merged

Rename argument array_index to array_indx in json_pointer methods #1980

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
00049c2
Rename argument array_index to array_indx in json_pointer methods
linev Mar 11, 2020
78e911b
Use array_idx as methods args
linev Mar 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions include/nlohmann/detail/json_pointer.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,8 @@ class json_pointer
/*!
@brief append an array index at the end of this JSON pointer

@param[in] array_index array index to append
@return JSON pointer with @a array_index appended
@param[in] array_indx array index to append
linev marked this conversation as resolved.
Show resolved Hide resolved
@return JSON pointer with @a array_indx appended
linev marked this conversation as resolved.
Show resolved Hide resolved

@liveexample{The example shows the usage of `operator/=`.,json_pointer__operator_add}

Expand All @@ -139,9 +139,9 @@ class json_pointer

@since version 3.6.0
*/
json_pointer& operator/=(std::size_t array_index)
json_pointer& operator/=(std::size_t array_indx)
linev marked this conversation as resolved.
Show resolved Hide resolved
{
return *this /= std::to_string(array_index);
return *this /= std::to_string(array_indx);
linev marked this conversation as resolved.
Show resolved Hide resolved
}

/*!
Expand Down Expand Up @@ -189,8 +189,8 @@ class json_pointer
@brief create a new JSON pointer by appending the array-index-token at the end of the JSON pointer

@param[in] ptr JSON pointer
@param[in] array_index array index
@return a new JSON pointer with @a array_index appended to @a ptr
@param[in] array_indx array index
linev marked this conversation as resolved.
Show resolved Hide resolved
@return a new JSON pointer with @a array_indx appended to @a ptr
linev marked this conversation as resolved.
Show resolved Hide resolved

@liveexample{The example shows the usage of `operator/`.,json_pointer__operator_add_binary}

Expand All @@ -200,9 +200,9 @@ class json_pointer

@since version 3.6.0
*/
friend json_pointer operator/(const json_pointer& ptr, std::size_t array_index)
friend json_pointer operator/(const json_pointer& ptr, std::size_t array_indx)
linev marked this conversation as resolved.
Show resolved Hide resolved
{
return json_pointer(ptr) /= array_index;
return json_pointer(ptr) /= array_indx;
linev marked this conversation as resolved.
Show resolved Hide resolved
}

/*!
Expand Down