Skip to content

Commit

Permalink
🏁 fix for #581
Browse files Browse the repository at this point in the history
  • Loading branch information
nlohmann committed May 13, 2017
1 parent 978255d commit 9b764ee
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions src/json.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -7892,21 +7892,21 @@ class basic_json
/// conversion operator (calls key())
operator typename basic_json::string_t() const
{
return proxy.key();
return proxy.key();
}

/// equal operator (calls key())
template<typename KeyType>
bool operator==(const KeyType& key) const
{
return proxy.key() == key;
return proxy.key() == key;
}

/// not equal operator (calls key())
template<typename KeyType>
bool operator!=(const KeyType& key) const
{
return proxy.key() != key;
return proxy.key() != key;
}
};

Expand All @@ -7925,29 +7925,29 @@ class basic_json
/// conversion operator (calls value())
operator typename IteratorType::reference() const
{
return proxy.value();
return proxy.value();
}

/// equal operator (calls value())
template<typename ValueType>
bool operator==(const ValueType& value) const
{
return proxy.value() == value;
return proxy.value() == value;
}

/// not equal operator (calls value())
template<typename ValueType>
bool operator!=(const ValueType& value) const
{
return proxy.value() != value;
return proxy.value() != value;
}

/// assignment operator (calls value())
template<typename ValueType>
iterator_value_property<ProxyType>& operator=(const ValueType& value)
{
proxy.value() = value;
return *this;
proxy.value() = value;
return *this;
}
};

Expand Down Expand Up @@ -9005,7 +9005,7 @@ class basic_json
{
// avoid reading too many characters
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:
Expand Down

0 comments on commit 9b764ee

Please sign in to comment.