diff options
author | Martijn Kaijser <mcm.kaijser@gmail.com> | 2016-07-15 19:21:13 +0200 |
---|---|---|
committer | Martijn Kaijser <mcm.kaijser@gmail.com> | 2016-07-15 21:23:54 +0200 |
commit | c4a2ccf69fe0d5844cc5919179087a7040afd9bd (patch) | |
tree | a344b888707fd2bdceda12cccf02255bdebf5885 | |
parent | fbae963de15c9d1e5660132c22eef407ba324518 (diff) |
[fix] revert commit c9884248b729709450087f05dd8449e794253a6 utils/Variant: use std::vector::emplace_back()
Causes crashing in win32.
-rw-r--r-- | xbmc/utils/Variant.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xbmc/utils/Variant.cpp b/xbmc/utils/Variant.cpp index 93c5629ca5..270d99e0e5 100644 --- a/xbmc/utils/Variant.cpp +++ b/xbmc/utils/Variant.cpp @@ -263,7 +263,7 @@ CVariant::CVariant(const std::vector<std::string> &strArray) m_data.array = new VariantArray; m_data.array->reserve(strArray.size()); for (const auto& item : strArray) - m_data.array->emplace_back(item); + m_data.array->push_back(CVariant(item)); } CVariant::CVariant(const std::map<std::string, std::string> &strMap) @@ -678,7 +678,7 @@ void CVariant::push_back(const CVariant &variant) } if (m_type == VariantTypeArray) - m_data.array->emplace_back(variant); + m_data.array->push_back(variant); } void CVariant::push_back(CVariant &&variant) @@ -690,7 +690,7 @@ void CVariant::push_back(CVariant &&variant) } if (m_type == VariantTypeArray) - m_data.array->emplace_back(std::move(variant)); + m_data.array->push_back(std::move(variant)); } void CVariant::append(const CVariant &variant) |