mirror of
https://github.com/nlohmann/json
synced 2024-11-21 19:50:04 +00:00
* Make iteration_proxy_value model forward_iterator * Amalgamate * Suppress tidy warning
This commit is contained in:
parent
1825117e63
commit
fde9a86c5a
@ -9,7 +9,7 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <cstddef> // size_t
|
#include <cstddef> // size_t
|
||||||
#include <iterator> // input_iterator_tag
|
#include <iterator> // forward_iterator_tag
|
||||||
#include <string> // string, to_string
|
#include <string> // string, to_string
|
||||||
#include <tuple> // tuple_size, get, tuple_element
|
#include <tuple> // tuple_size, get, tuple_element
|
||||||
#include <utility> // move
|
#include <utility> // move
|
||||||
@ -40,7 +40,7 @@ template<typename IteratorType> class iteration_proxy_value
|
|||||||
using value_type = iteration_proxy_value;
|
using value_type = iteration_proxy_value;
|
||||||
using pointer = value_type *;
|
using pointer = value_type *;
|
||||||
using reference = value_type &;
|
using reference = value_type &;
|
||||||
using iterator_category = std::input_iterator_tag;
|
using iterator_category = std::forward_iterator_tag;
|
||||||
using string_type = typename std::remove_cv< typename std::remove_reference<decltype( std::declval<IteratorType>().key() ) >::type >::type;
|
using string_type = typename std::remove_cv< typename std::remove_reference<decltype( std::declval<IteratorType>().key() ) >::type >::type;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
@ -5181,7 +5181,7 @@ NLOHMANN_JSON_NAMESPACE_END
|
|||||||
|
|
||||||
|
|
||||||
#include <cstddef> // size_t
|
#include <cstddef> // size_t
|
||||||
#include <iterator> // input_iterator_tag
|
#include <iterator> // forward_iterator_tag
|
||||||
#include <string> // string, to_string
|
#include <string> // string, to_string
|
||||||
#include <tuple> // tuple_size, get, tuple_element
|
#include <tuple> // tuple_size, get, tuple_element
|
||||||
#include <utility> // move
|
#include <utility> // move
|
||||||
@ -5215,7 +5215,7 @@ template<typename IteratorType> class iteration_proxy_value
|
|||||||
using value_type = iteration_proxy_value;
|
using value_type = iteration_proxy_value;
|
||||||
using pointer = value_type *;
|
using pointer = value_type *;
|
||||||
using reference = value_type &;
|
using reference = value_type &;
|
||||||
using iterator_category = std::input_iterator_tag;
|
using iterator_category = std::forward_iterator_tag;
|
||||||
using string_type = typename std::remove_cv< typename std::remove_reference<decltype( std::declval<IteratorType>().key() ) >::type >::type;
|
using string_type = typename std::remove_cv< typename std::remove_reference<decltype( std::declval<IteratorType>().key() ) >::type >::type;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
@ -171,7 +171,7 @@ TEST_CASE("README" * doctest::skip())
|
|||||||
|
|
||||||
// find an entry
|
// find an entry
|
||||||
CHECK(o.find("foo") != o.end());
|
CHECK(o.find("foo") != o.end());
|
||||||
if (o.find("foo") != o.end())
|
if (o.find("foo") != o.end()) // NOLINT(readability-container-contains)
|
||||||
{
|
{
|
||||||
// there is an entry with key "foo"
|
// there is an entry with key "foo"
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user