🏁 fix for #581
This commit is contained in:
parent
978255da8c
commit
9b764ee5d6
1 changed files with 9 additions and 9 deletions
18
src/json.hpp
18
src/json.hpp
|
@ -7892,21 +7892,21 @@ class basic_json
|
||||||
/// conversion operator (calls key())
|
/// conversion operator (calls key())
|
||||||
operator typename basic_json::string_t() const
|
operator typename basic_json::string_t() const
|
||||||
{
|
{
|
||||||
return proxy.key();
|
return proxy.key();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// equal operator (calls key())
|
/// equal operator (calls key())
|
||||||
template<typename KeyType>
|
template<typename KeyType>
|
||||||
bool operator==(const KeyType& key) const
|
bool operator==(const KeyType& key) const
|
||||||
{
|
{
|
||||||
return proxy.key() == key;
|
return proxy.key() == key;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// not equal operator (calls key())
|
/// not equal operator (calls key())
|
||||||
template<typename KeyType>
|
template<typename KeyType>
|
||||||
bool operator!=(const KeyType& key) const
|
bool operator!=(const KeyType& key) const
|
||||||
{
|
{
|
||||||
return proxy.key() != key;
|
return proxy.key() != key;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -7925,29 +7925,29 @@ class basic_json
|
||||||
/// conversion operator (calls value())
|
/// conversion operator (calls value())
|
||||||
operator typename IteratorType::reference() const
|
operator typename IteratorType::reference() const
|
||||||
{
|
{
|
||||||
return proxy.value();
|
return proxy.value();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// equal operator (calls value())
|
/// equal operator (calls value())
|
||||||
template<typename ValueType>
|
template<typename ValueType>
|
||||||
bool operator==(const ValueType& value) const
|
bool operator==(const ValueType& value) const
|
||||||
{
|
{
|
||||||
return proxy.value() == value;
|
return proxy.value() == value;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// not equal operator (calls value())
|
/// not equal operator (calls value())
|
||||||
template<typename ValueType>
|
template<typename ValueType>
|
||||||
bool operator!=(const ValueType& value) const
|
bool operator!=(const ValueType& value) const
|
||||||
{
|
{
|
||||||
return proxy.value() != value;
|
return proxy.value() != value;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// assignment operator (calls value())
|
/// assignment operator (calls value())
|
||||||
template<typename ValueType>
|
template<typename ValueType>
|
||||||
iterator_value_property<ProxyType>& operator=(const ValueType& value)
|
iterator_value_property<ProxyType>& operator=(const ValueType& value)
|
||||||
{
|
{
|
||||||
proxy.value() = value;
|
proxy.value() = value;
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -9005,7 +9005,7 @@ class basic_json
|
||||||
{
|
{
|
||||||
// avoid reading too many characters
|
// avoid reading too many characters
|
||||||
const size_t max_length = static_cast<size_t>(limit - start);
|
const size_t max_length = static_cast<size_t>(limit - start);
|
||||||
return std::string(start + offset, std::min({length, max_length - offset}));
|
return std::string(start + offset, std::min(length, max_length - offset));
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
Loading…
Reference in a new issue