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

Adding 4.8 test to travis

Browse source
This commit is contained in:
Henry Fredrick Schreiner 2018-09-25 18:15:29 +02:00
parent 99b7c7c8ef
commit 7a37ba0c02
9 changed files with 51 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

7
single_include/nlohmann/json.hpp
View file

@ -16016,7 +16016,9 @@ class basic_json
return {it, res.second};
}
/// helper for insertion of an iterator (supports GCC 4.8+)
/// Helper for insertion of an iterator
/// @note: This uses std::distance to support GCC 4.8,
/// see https://github.com/nlohmann/json/pull/1257
template<typename... Args>
iterator insert_iterator(const_iterator pos, Args&& ... args)
{
@ -16027,8 +16029,9 @@ class basic_json
m_value.array->insert(pos.m_it.array_iterator, std::forward<Args>(args)...);
result.m_it.array_iterator = m_value.array->begin() + insert_pos;
// For GCC 4.9+ only, this could become:
// This could have been written as:
// result.m_it.array_iterator = m_value.array->insert(pos.m_it.array_iterator, cnt, val);
// but the return value of insert is missing in GCC 4.8, so it is written this way instead.
return result;
}