mirror/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2024-11-28 00:59:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed deprecated warnings in issue #42

Browse Source
This commit is contained in:
Niels 2015-03-22 17:50:43 +01:00
parent abc6137001
commit cf829ac2e8
2 changed files with 56 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/json.hpp
View File

@ -2072,11 +2072,22 @@ class basic_json
}
}
/// copy constructor
inline iterator(const iterator& other) noexcept
: m_object(other.m_object), m_it(other.m_it)
{}
/// copy assignment
inline iterator& operator=(const iterator& other) noexcept
inline iterator& operator=(iterator other) noexcept (
std::is_nothrow_move_constructible<pointer>::value and
std::is_nothrow_move_assignable<pointer>::value and
std::is_nothrow_move_constructible<internal_iterator<typename array_t::iterator, typename object_t::iterator>>::value
and
std::is_nothrow_move_assignable<internal_iterator<typename array_t::iterator, typename object_t::iterator>>::value
)
{
m_object = other.m_object;
m_it = other.m_it;
std::swap(m_object, other.m_object);
std::swap(m_it, other.m_it);
return *this;
}
@ -2575,11 +2586,22 @@ class basic_json
}
}
/// copy constructor
inline const_iterator(const const_iterator& other) noexcept
: m_object(other.m_object), m_it(other.m_it)
{}
/// copy assignment
inline const_iterator& operator=(const const_iterator& other) noexcept
inline const_iterator& operator=(const_iterator other) noexcept(
std::is_nothrow_move_constructible<pointer>::value and
std::is_nothrow_move_assignable<pointer>::value and
std::is_nothrow_move_constructible<internal_iterator<typename array_t::const_iterator, typename object_t::const_iterator>>::value
and
std::is_nothrow_move_assignable<internal_iterator<typename array_t::const_iterator, typename object_t::const_iterator>>::value
)
{
m_object = other.m_object;
m_it = other.m_it;
std::swap(m_object, other.m_object);
std::swap(m_it, other.m_it);
return *this;
}

34
src/json.hpp.re2c
View File

@ -2072,11 +2072,22 @@ class basic_json
}
}
/// copy constructor
inline iterator(const iterator& other) noexcept
: m_object(other.m_object), m_it(other.m_it)
{}
/// copy assignment
inline iterator& operator=(const iterator& other) noexcept
inline iterator& operator=(iterator other) noexcept (
std::is_nothrow_move_constructible<pointer>::value and
std::is_nothrow_move_assignable<pointer>::value and
std::is_nothrow_move_constructible<internal_iterator<typename array_t::iterator, typename object_t::iterator>>::value
and
std::is_nothrow_move_assignable<internal_iterator<typename array_t::iterator, typename object_t::iterator>>::value
)
{
m_object = other.m_object;
m_it = other.m_it;
std::swap(m_object, other.m_object);
std::swap(m_it, other.m_it);
return *this;
}
@ -2575,11 +2586,22 @@ class basic_json
}
}
/// copy constructor
inline const_iterator(const const_iterator& other) noexcept
: m_object(other.m_object), m_it(other.m_it)
{}
/// copy assignment
inline const_iterator& operator=(const const_iterator& other) noexcept
inline const_iterator& operator=(const_iterator other) noexcept(
std::is_nothrow_move_constructible<pointer>::value and
std::is_nothrow_move_assignable<pointer>::value and
std::is_nothrow_move_constructible<internal_iterator<typename array_t::const_iterator, typename object_t::const_iterator>>::value
and
std::is_nothrow_move_assignable<internal_iterator<typename array_t::const_iterator, typename object_t::const_iterator>>::value
)
{
m_object = other.m_object;
m_it = other.m_it;
std::swap(m_object, other.m_object);
std::swap(m_it, other.m_it);
return *this;
}