Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
json
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
json
Commits
5026acd7
Unverified
Commit
5026acd7
authored
Dec 11, 2020
by
Niels Lohmann
Committed by
GitHub
Dec 11, 2020
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2444 from linev/fix_gcc48_warn
Change argument name "subtype" in byte_container_with_subtype
parents
3ad6992f
30dd0c0f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
include/nlohmann/byte_container_with_subtype.hpp
include/nlohmann/byte_container_with_subtype.hpp
+6
-6
No files found.
include/nlohmann/byte_container_with_subtype.hpp
View file @
5026acd7
...
...
@@ -39,15 +39,15 @@ class byte_container_with_subtype : public BinaryType
:
container_type
(
std
::
move
(
b
))
{}
byte_container_with_subtype
(
const
container_type
&
b
,
std
::
uint8_t
subtype
)
noexcept
(
noexcept
(
container_type
(
b
)))
byte_container_with_subtype
(
const
container_type
&
b
,
std
::
uint8_t
subtype
_
)
noexcept
(
noexcept
(
container_type
(
b
)))
:
container_type
(
b
)
,
m_subtype
(
subtype
)
,
m_subtype
(
subtype
_
)
,
m_has_subtype
(
true
)
{}
byte_container_with_subtype
(
container_type
&&
b
,
std
::
uint8_t
subtype
)
noexcept
(
noexcept
(
container_type
(
std
::
move
(
b
))))
byte_container_with_subtype
(
container_type
&&
b
,
std
::
uint8_t
subtype
_
)
noexcept
(
noexcept
(
container_type
(
std
::
move
(
b
))))
:
container_type
(
std
::
move
(
b
))
,
m_subtype
(
subtype
)
,
m_subtype
(
subtype
_
)
,
m_has_subtype
(
true
)
{}
...
...
@@ -80,9 +80,9 @@ class byte_container_with_subtype : public BinaryType
@since version 3.8.0
*/
void
set_subtype
(
std
::
uint8_t
subtype
)
noexcept
void
set_subtype
(
std
::
uint8_t
subtype
_
)
noexcept
{
m_subtype
=
subtype
;
m_subtype
=
subtype
_
;
m_has_subtype
=
true
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment