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

🔨 trying to fix memory issue with valarray

Browse source
This commit is contained in:
Niels Lohmann 2017-08-27 10:41:39 +02:00
parent 0e94ba8857
commit 15e757c42b
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/json.hpp
View file

@ -667,11 +667,10 @@ struct external_constructor<value_t::array>
enable_if_t<std::is_convertible<T, BasicJsonType>::value, int> = 0> enable_if_t<std::is_convertible<T, BasicJsonType>::value, int> = 0>
static void construct(BasicJsonType& j, const std::valarray<T>& arr) static void construct(BasicJsonType& j, const std::valarray<T>& arr)
{ {
using std::begin;
using std::end;
j.m_type = value_t::array; j.m_type = value_t::array;
j.m_value = value_t::array; j.m_value = value_t::array;
j.m_value.array = j.template create<typename BasicJsonType::array_t>(begin(arr), end(arr)); j.m_value.array->resize(arr.size());
std::copy(std::begin(arr), std::end(arr), j.m_value.array->begin());
j.assert_invariant(); j.assert_invariant();
} }
}; };
@ -1112,10 +1111,7 @@ void from_json(const BasicJsonType& j, std::valarray<T>& l)
JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name()))); JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name())));
} }
l.resize(j.size()); l.resize(j.size());
for (size_t i = 0; i < j.size(); ++i) std::copy(j.m_value.array->begin(), j.m_value.array->end(), std::begin(l));
{
l[i] = j[i];
}
} }
template<typename BasicJsonType, typename CompatibleArrayType> template<typename BasicJsonType, typename CompatibleArrayType>