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

🔀 merge from develop

Browse source
This commit is contained in:
Niels Lohmann 2020-06-27 13:16:20 +02:00
parent ac3922c7aa
commit d7a2956b24
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
3 changed files with 626 additions and 625 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -403,9 +403,9 @@ using contiguous_bytes_input_adapter = decltype(input_adapter(std::declval<const
// Null-delimited strings, and the like. // Null-delimited strings, and the like.
template < typename CharT, template < typename CharT,
typename std::enable_if < typename std::enable_if <
std::is_pointer<CharT>::value && std::is_pointer<CharT>::value&&
not std::is_array<CharT>::value && not std::is_array<CharT>::value&&
std::is_integral<typename std::remove_pointer<CharT>::type>::value && std::is_integral<typename std::remove_pointer<CharT>::type>::value&&
sizeof(typename std::remove_pointer<CharT>::type) == 1, sizeof(typename std::remove_pointer<CharT>::type) == 1,
int >::type = 0 > int >::type = 0 >
contiguous_bytes_input_adapter input_adapter(CharT b) contiguous_bytes_input_adapter input_adapter(CharT b)

2
include/nlohmann/detail/input/lexer.hpp
View file

@ -1511,7 +1511,7 @@ scan_number_done:
skip_whitespace(); skip_whitespace();
// ignore comments // ignore comments
if (ignore_comments and current == '/') if (ignore_comments && current == '/')
{ {
if (not scan_comment()) if (not scan_comment())
{ {

1243
single_include/nlohmann/json.hpp
View file

File diff suppressed because it is too large Load diff