j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

🔨 cleanup

Browse source
This commit is contained in:
Niels Lohmann 2018-04-02 22:25:17 +02:00
parent aa89c5e048
commit 1e08654f99
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
4 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.travis.yml
View file

@ -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

7
include/nlohmann/detail/input/input_adapters.hpp
View file

@ -1,11 +1,8 @@
#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 };
@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
/// 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

1
include/nlohmann/detail/input/json_sax.hpp
View file

@ -660,4 +660,3 @@ class json_sax_acceptor : public json_sax<BasicJsonType>
} }
} }

6
single_include/nlohmann/json.hpp
View file

@ -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
private: private:
/// pointer to the current character /// pointer to the current character
const char* cursor; const char* const cursor;
/// pointer past the last character /// pointer past the last character
const char* limit; const char* const limit;
}; };
class input_adapter class input_adapter