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

added test cases and fixed some warnings

Browse source
This commit is contained in:
Niels 2015-02-09 20:21:26 +01:00
parent 0df642ded0
commit 0cfd0f5d68
3 changed files with 115 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/json.hpp
View file

@ -443,8 +443,9 @@ class basic_json
}
/// copy assignment
inline reference operator=(basic_json other) noexcept
inline reference& operator=(basic_json other) noexcept
{
assert(false); // not sure if function will ever be called
std::swap(m_type, other.m_type);
std::swap(m_value, other.m_value);
return *this;
@ -1704,6 +1705,7 @@ class basic_json
/// copy assignment
inline iterator& operator=(const iterator& other) noexcept
{
assert(false); // not sure if function will ever be called
m_object = other.m_object;
m_it = other.m_it;
return *this;
@ -2085,7 +2087,7 @@ class basic_json
}
/// copy assignment
inline const_iterator operator=(const const_iterator& other) noexcept
inline const_iterator& operator=(const const_iterator& other) noexcept
{
m_object = other.m_object;
m_it = other.m_it;
@ -3329,7 +3331,7 @@ json_parser_60:
}
}
inline std::string token_type_name(token_type t)
inline static std::string token_type_name(token_type t)
{
switch (t)
{

8
src/json.hpp.re2c
View file

@ -443,8 +443,9 @@ class basic_json
}
/// copy assignment
inline reference operator=(basic_json other) noexcept
inline reference& operator=(basic_json other) noexcept
{
assert(false); // not sure if function will ever be called
std::swap(m_type, other.m_type);
std::swap(m_value, other.m_value);
return *this;
@ -1704,6 +1705,7 @@ class basic_json
/// copy assignment
inline iterator& operator=(const iterator& other) noexcept
{
assert(false); // not sure if function will ever be called
m_object = other.m_object;
m_it = other.m_it;
return *this;
@ -2085,7 +2087,7 @@ class basic_json
}
/// copy assignment
inline const_iterator operator=(const const_iterator& other) noexcept
inline const_iterator& operator=(const const_iterator& other) noexcept
{
m_object = other.m_object;
m_it = other.m_it;
@ -2689,7 +2691,7 @@ class basic_json
}
}
inline std::string token_type_name(token_type t)
inline static std::string token_type_name(token_type t)
{
switch (t)
{