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
1e08654f
Unverified
Commit
1e08654f
authored
Apr 02, 2018
by
Niels Lohmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🔨
cleanup
parent
aa89c5e0
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
10 deletions
+5
-10
.travis.yml
.travis.yml
+1
-0
include/nlohmann/detail/input/input_adapters.hpp
include/nlohmann/detail/input/input_adapters.hpp
+2
-5
include/nlohmann/detail/input/json_sax.hpp
include/nlohmann/detail/input/json_sax.hpp
+0
-1
single_include/nlohmann/json.hpp
single_include/nlohmann/json.hpp
+2
-4
No files found.
.travis.yml
View file @
1e08654f
...
@@ -277,6 +277,7 @@ script:
...
@@ -277,6 +277,7 @@ script:
if [[ (-x $(which brew)) ]]; then
if [[ (-x $(which brew)) ]]; then
brew update
brew update
brew install cmake ninja
brew install cmake ninja
brew upgrade cmake
cmake --version
cmake --version
fi
fi
...
...
include/nlohmann/detail/input/input_adapters.hpp
View file @
1e08654f
#pragma once
#pragma once
#include <algorithm> // min
#include <array> // array
#include <cassert> // assert
#include <cassert> // assert
#include <cstddef> // size_t
#include <cstddef> // size_t
#include <cstring> // strlen
#include <cstring> // strlen
#include <ios> // streamsize, streamoff, streampos
#include <istream> // istream
#include <istream> // istream
#include <iterator> // begin, end, iterator_traits, random_access_iterator_tag, distance, next
#include <iterator> // begin, end, iterator_traits, random_access_iterator_tag, distance, next
#include <memory> // shared_ptr, make_shared, addressof
#include <memory> // shared_ptr, make_shared, addressof
...
@@ -31,7 +28,7 @@ enum class input_format_t { json, cbor, msgpack, ubjson };
...
@@ -31,7 +28,7 @@ enum class input_format_t { json, cbor, msgpack, ubjson };
@brief abstract input adapter interface
@brief abstract input adapter interface
Produces a stream of std::char_traits<char>::int_type characters from a
Produces a stream of std::char_traits<char>::int_type characters from a
std::istream, a buffer, or some other input type.
Accepts the return of
std::istream, a buffer, or some other input type. Accepts the return of
exactly one non-EOF character for future input. The int_type characters
exactly one non-EOF character for future input. The int_type characters
returned consist of all valid char values as positive values (typically
returned consist of all valid char values as positive values (typically
unsigned char), plus an EOF value outside that range, specified by the value
unsigned char), plus an EOF value outside that range, specified by the value
...
@@ -115,7 +112,7 @@ class input_buffer_adapter : public input_adapter_protocol
...
@@ -115,7 +112,7 @@ class input_buffer_adapter : public input_adapter_protocol
/// pointer to the current character
/// pointer to the current character
const
char
*
cursor
;
const
char
*
cursor
;
/// pointer past the last character
/// pointer past the last character
const
char
*
limit
;
const
char
*
const
limit
;
};
};
class
input_adapter
class
input_adapter
...
...
include/nlohmann/detail/input/json_sax.hpp
View file @
1e08654f
...
@@ -660,4 +660,3 @@ class json_sax_acceptor : public json_sax<BasicJsonType>
...
@@ -660,4 +660,3 @@ class json_sax_acceptor : public json_sax<BasicJsonType>
}
}
}
}
single_include/nlohmann/json.hpp
View file @
1e08654f
...
@@ -1572,12 +1572,10 @@ constexpr const auto& to_json = detail::static_const<detail::to_json_fn>::value;
...
@@ -1572,12 +1572,10 @@ constexpr const auto& to_json = detail::static_const<detail::to_json_fn>::value;
// #include <nlohmann/detail/input/input_adapters.hpp>
// #include <nlohmann/detail/input/input_adapters.hpp>
#include <algorithm> // min
#include <array> // array
#include <array> // array
#include <cassert> // assert
#include <cassert> // assert
#include <cstddef> // size_t
#include <cstddef> // size_t
#include <cstring> // strlen
#include <cstring> // strlen
#include <ios> // streamsize, streamoff, streampos
#include <istream> // istream
#include <istream> // istream
#include <iterator> // begin, end, iterator_traits, random_access_iterator_tag, distance, next
#include <iterator> // begin, end, iterator_traits, random_access_iterator_tag, distance, next
#include <memory> // shared_ptr, make_shared, addressof
#include <memory> // shared_ptr, make_shared, addressof
...
@@ -1686,9 +1684,9 @@ class input_buffer_adapter : public input_adapter_protocol
...
@@ -1686,9 +1684,9 @@ class input_buffer_adapter : public input_adapter_protocol
private:
private:
/// pointer to the current character
/// pointer to the current character
const
char
*
cursor
;
const
char
*
c
onst
c
ursor
;
/// pointer past the last character
/// pointer past the last character
const
char
*
limit
;
const
char
*
const
limit
;
};
};
class
input_adapter
class
input_adapter
...
...
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