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
dfedefb9
Unverified
Commit
dfedefb9
authored
4 years ago
by
Niels Lohmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix warnings
parent
f15d4475
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
18 additions
and
0 deletions
+18
-0
include/nlohmann/detail/hash.hpp
include/nlohmann/detail/hash.hpp
+2
-0
include/nlohmann/detail/input/binary_reader.hpp
include/nlohmann/detail/input/binary_reader.hpp
+1
-0
include/nlohmann/detail/iterators/primitive_iterator.hpp
include/nlohmann/detail/iterators/primitive_iterator.hpp
+2
-0
include/nlohmann/detail/meta/type_traits.hpp
include/nlohmann/detail/meta/type_traits.hpp
+1
-0
include/nlohmann/thirdparty/hedley/hedley_undef.hpp
include/nlohmann/thirdparty/hedley/hedley_undef.hpp
+2
-0
single_include/nlohmann/json.hpp
single_include/nlohmann/json.hpp
+10
-0
No files found.
include/nlohmann/detail/hash.hpp
View file @
dfedefb9
...
@@ -3,6 +3,8 @@
...
@@ -3,6 +3,8 @@
#include <cstddef> // size_t, uint8_t
#include <cstddef> // size_t, uint8_t
#include <functional> // hash
#include <functional> // hash
#include <nlohmann/detail/macro_scope.hpp>
namespace
nlohmann
namespace
nlohmann
{
{
namespace
detail
namespace
detail
...
...
This diff is collapsed.
Click to expand it.
include/nlohmann/detail/input/binary_reader.hpp
View file @
dfedefb9
...
@@ -11,6 +11,7 @@
...
@@ -11,6 +11,7 @@
#include <limits> // numeric_limits
#include <limits> // numeric_limits
#include <string> // char_traits, string
#include <string> // char_traits, string
#include <utility> // make_pair, move
#include <utility> // make_pair, move
#include <vector> // vector
#include <nlohmann/detail/exceptions.hpp>
#include <nlohmann/detail/exceptions.hpp>
#include <nlohmann/detail/input/input_adapters.hpp>
#include <nlohmann/detail/input/input_adapters.hpp>
...
...
This diff is collapsed.
Click to expand it.
include/nlohmann/detail/iterators/primitive_iterator.hpp
View file @
dfedefb9
...
@@ -3,6 +3,8 @@
...
@@ -3,6 +3,8 @@
#include <cstddef> // ptrdiff_t
#include <cstddef> // ptrdiff_t
#include <limits> // numeric_limits
#include <limits> // numeric_limits
#include <nlohmann/detail/macro_scope.hpp>
namespace
nlohmann
namespace
nlohmann
{
{
namespace
detail
namespace
detail
...
...
This diff is collapsed.
Click to expand it.
include/nlohmann/detail/meta/type_traits.hpp
View file @
dfedefb9
...
@@ -3,6 +3,7 @@
...
@@ -3,6 +3,7 @@
#include <limits> // numeric_limits
#include <limits> // numeric_limits
#include <type_traits> // false_type, is_constructible, is_integral, is_same, true_type
#include <type_traits> // false_type, is_constructible, is_integral, is_same, true_type
#include <utility> // declval
#include <utility> // declval
#include <tuple> // tuple
#include <nlohmann/detail/iterators/iterator_traits.hpp>
#include <nlohmann/detail/iterators/iterator_traits.hpp>
#include <nlohmann/detail/macro_scope.hpp>
#include <nlohmann/detail/macro_scope.hpp>
...
...
This diff is collapsed.
Click to expand it.
include/nlohmann/thirdparty/hedley/hedley_undef.hpp
View file @
dfedefb9
#pragma once
#undef JSON_HEDLEY_ALWAYS_INLINE
#undef JSON_HEDLEY_ALWAYS_INLINE
#undef JSON_HEDLEY_ARM_VERSION
#undef JSON_HEDLEY_ARM_VERSION
#undef JSON_HEDLEY_ARM_VERSION_CHECK
#undef JSON_HEDLEY_ARM_VERSION_CHECK
...
...
This diff is collapsed.
Click to expand it.
single_include/nlohmann/json.hpp
View file @
dfedefb9
...
@@ -2818,6 +2818,7 @@ constexpr T static_const<T>::value;
...
@@ -2818,6 +2818,7 @@ constexpr T static_const<T>::value;
#include <limits> // numeric_limits
#include <limits> // numeric_limits
#include <type_traits> // false_type, is_constructible, is_integral, is_same, true_type
#include <type_traits> // false_type, is_constructible, is_integral, is_same, true_type
#include <utility> // declval
#include <utility> // declval
#include <tuple> // tuple
// #include <nlohmann/detail/iterators/iterator_traits.hpp>
// #include <nlohmann/detail/iterators/iterator_traits.hpp>
...
@@ -4671,6 +4672,9 @@ class byte_container_with_subtype : public BinaryType
...
@@ -4671,6 +4672,9 @@ class byte_container_with_subtype : public BinaryType
#include <cstddef> // size_t, uint8_t
#include <cstddef> // size_t, uint8_t
#include <functional> // hash
#include <functional> // hash
// #include <nlohmann/detail/macro_scope.hpp>
namespace nlohmann
namespace nlohmann
{
{
namespace detail
namespace detail
...
@@ -4799,6 +4803,7 @@ std::size_t hash(const BasicJsonType& j)
...
@@ -4799,6 +4803,7 @@ std::size_t hash(const BasicJsonType& j)
#include <limits> // numeric_limits
#include <limits> // numeric_limits
#include <string> // char_traits, string
#include <string> // char_traits, string
#include <utility> // make_pair, move
#include <utility> // make_pair, move
#include <vector> // vector
// #include <nlohmann/detail/exceptions.hpp>
// #include <nlohmann/detail/exceptions.hpp>
...
@@ -10707,6 +10712,9 @@ class parser
...
@@ -10707,6 +10712,9 @@ class parser
#include <cstddef> // ptrdiff_t
#include <cstddef> // ptrdiff_t
#include <limits> // numeric_limits
#include <limits> // numeric_limits
// #include <nlohmann/detail/macro_scope.hpp>
namespace nlohmann
namespace nlohmann
{
{
namespace detail
namespace detail
...
@@ -25410,6 +25418,8 @@ inline nlohmann::json::json_pointer operator "" _json_pointer(const char* s, std
...
@@ -25410,6 +25418,8 @@ inline nlohmann::json::json_pointer operator "" _json_pointer(const char* s, std
#undef JSON_EXPLICIT
#undef JSON_EXPLICIT
// #include <nlohmann/thirdparty/hedley/hedley_undef.hpp>
// #include <nlohmann/thirdparty/hedley/hedley_undef.hpp>
#undef JSON_HEDLEY_ALWAYS_INLINE
#undef JSON_HEDLEY_ALWAYS_INLINE
#undef JSON_HEDLEY_ARM_VERSION
#undef JSON_HEDLEY_ARM_VERSION
#undef JSON_HEDLEY_ARM_VERSION_CHECK
#undef JSON_HEDLEY_ARM_VERSION_CHECK
...
...
This diff is collapsed.
Click to expand it.
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