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
45819dce
Commit
45819dce
authored
Jan 30, 2019
by
past-due
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Disable -Wmismatched-tags warning on tuple_size / tuple_element
parent
68ec3eb8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
1 deletion
+18
-1
include/nlohmann/detail/iterators/iteration_proxy.hpp
include/nlohmann/detail/iterators/iteration_proxy.hpp
+9
-1
single_include/nlohmann/json.hpp
single_include/nlohmann/json.hpp
+9
-0
No files found.
include/nlohmann/detail/iterators/iteration_proxy.hpp
View file @
45819dce
...
@@ -147,6 +147,11 @@ auto get(const nlohmann::detail::iteration_proxy_value<IteratorType>& i) -> decl
...
@@ -147,6 +147,11 @@ auto get(const nlohmann::detail::iteration_proxy_value<IteratorType>& i) -> decl
// And see https://github.com/nlohmann/json/pull/1391
// And see https://github.com/nlohmann/json/pull/1391
namespace
std
namespace
std
{
{
#if defined(__clang__)
// Fix: https://github.com/nlohmann/json/issues/1401
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wmismatched-tags"
#endif
template
<
typename
IteratorType
>
template
<
typename
IteratorType
>
class
tuple_size
<::
nlohmann
::
detail
::
iteration_proxy_value
<
IteratorType
>>
class
tuple_size
<::
nlohmann
::
detail
::
iteration_proxy_value
<
IteratorType
>>
:
public
std
::
integral_constant
<
std
::
size_t
,
2
>
{};
:
public
std
::
integral_constant
<
std
::
size_t
,
2
>
{};
...
@@ -159,4 +164,7 @@ class tuple_element<N, ::nlohmann::detail::iteration_proxy_value<IteratorType >>
...
@@ -159,4 +164,7 @@ class tuple_element<N, ::nlohmann::detail::iteration_proxy_value<IteratorType >>
get
<
N
>
(
std
::
declval
<
get
<
N
>
(
std
::
declval
<
::
nlohmann
::
detail
::
iteration_proxy_value
<
IteratorType
>>
()));
::
nlohmann
::
detail
::
iteration_proxy_value
<
IteratorType
>>
()));
};
};
}
#if defined(__clang__)
\ No newline at end of file
#pragma clang diagnostic pop
#endif
}
single_include/nlohmann/json.hpp
View file @
45819dce
...
@@ -1808,6 +1808,11 @@ auto get(const nlohmann::detail::iteration_proxy_value<IteratorType>& i) -> decl
...
@@ -1808,6 +1808,11 @@ auto get(const nlohmann::detail::iteration_proxy_value<IteratorType>& i) -> decl
// And see https://github.com/nlohmann/json/pull/1391
// And see https://github.com/nlohmann/json/pull/1391
namespace
std
namespace
std
{
{
#if defined(__clang__)
// Fix: https://github.com/nlohmann/json/issues/1401
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wmismatched-tags"
#endif
template
<
typename
IteratorType
>
template
<
typename
IteratorType
>
class
tuple_size
<::
nlohmann
::
detail
::
iteration_proxy_value
<
IteratorType
>>
class
tuple_size
<::
nlohmann
::
detail
::
iteration_proxy_value
<
IteratorType
>>
:
public
std
::
integral_constant
<
std
::
size_t
,
2
>
{};
:
public
std
::
integral_constant
<
std
::
size_t
,
2
>
{};
...
@@ -1820,8 +1825,12 @@ class tuple_element<N, ::nlohmann::detail::iteration_proxy_value<IteratorType >>
...
@@ -1820,8 +1825,12 @@ class tuple_element<N, ::nlohmann::detail::iteration_proxy_value<IteratorType >>
get
<
N
>
(
std
::
declval
<
get
<
N
>
(
std
::
declval
<
::
nlohmann
::
detail
::
iteration_proxy_value
<
IteratorType
>>
()));
::
nlohmann
::
detail
::
iteration_proxy_value
<
IteratorType
>>
()));
};
};
#if defined(__clang__)
#pragma clang diagnostic pop
#endif
}
}
namespace
nlohmann
namespace
nlohmann
{
{
namespace
detail
namespace
detail
...
...
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