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

Remove old non-perfect forwarding find and count

Browse source
This commit is contained in:
Jamie Seward 2017-10-24 00:01:56 -07:00
parent 16ffdbcb20
commit 6c9a401ebc
1 changed files with 3 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
src/json.hpp
View file

@ -10884,7 +10884,7 @@ class basic_json
@note This method always returns @ref end() when executed on a JSON type @note This method always returns @ref end() when executed on a JSON type
that is not an object. that is not an object.
@param[in] key key value of the element to search for @param[in] key key value of the element to search for.
@return Iterator to an element with key equivalent to @a key. If no such @return Iterator to an element with key equivalent to @a key. If no such
element is found or the JSON value is not an object, past-the-end (see element is found or the JSON value is not an object, past-the-end (see
@ -10896,39 +10896,6 @@ class basic_json
@since version 1.0.0 @since version 1.0.0
*/ */
iterator find(typename object_t::key_type key)
{
auto result = end();
if (is_object())
{
result.m_it.object_iterator = m_value.object->find(key);
}
return result;
}
/*!
@brief find an element in a JSON object
@copydoc find(typename object_t::key_type)
*/
const_iterator find(typename object_t::key_type key) const
{
auto result = cend();
if (is_object())
{
result.m_it.object_iterator = m_value.object->find(key);
}
return result;
}
#ifdef JSON_HAS_CPP_14
/*!
@brief find an element in a JSON object
@copydoc find(typename object_t::key_type)
*/
template<typename KeyT> template<typename KeyT>
iterator find(KeyT&& key) iterator find(KeyT&& key)
{ {
@ -10944,7 +10911,7 @@ class basic_json
/*! /*!
@brief find an element in a JSON object @brief find an element in a JSON object
@copydoc find(typename object_t::key_type) @copydoc find(KeyT&&)
*/ */
template<typename KeyT> template<typename KeyT>
const_iterator find(KeyT&& key) const const_iterator find(KeyT&& key) const
@ -10958,7 +10925,6 @@ class basic_json
return result; return result;
} }
#endif
/*! /*!
@brief returns the number of occurrences of a key in a JSON object @brief returns the number of occurrences of a key in a JSON object
@ -10981,24 +10947,13 @@ class basic_json
@since version 1.0.0 @since version 1.0.0
*/ */
size_type count(typename object_t::key_type key) const
{
// return 0 for all nonobject types
return is_object() ? m_value.object->count(key) : 0;
}
#ifdef JSON_HAS_CPP_14
/*!
@brief returns the number of occurrences of a key in a JSON object
@copydoc count(typename object_t::key_type)
*/
template<typename KeyT> template<typename KeyT>
size_type count(KeyT&& key) const size_type count(KeyT&& key) const
{ {
// return 0 for all nonobject types // return 0 for all nonobject types
return is_object() ? m_value.object->count(std::forward<KeyT>(key)) : 0; return is_object() ? m_value.object->count(std::forward<KeyT>(key)) : 0;
} }
#endif
/// @} /// @}