olegpz
/
ericw-tools
mirror of https://github.com/ericwa/ericw-tools.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix emplace UB

This commit is contained in:
Jonathan 2022-01-25 04:21:07 -05:00
parent f9f76b6dbb
commit ff2ff5c87f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/common/polylib.hh
View File

@ -303,7 +303,7 @@ public:
{
// move us to dynamic
if (count == N)
data.template emplace<vector_type>(begin(), end());
data = vector_type(begin(), end());
if (is_dynamic())
std::get<vector_type>(data).push_back(vec);
@ -317,8 +317,9 @@ public:
{
// move us to dynamic if we'll expand too big
if (new_size > N && !is_dynamic()) {
auto &vector = data.template emplace<vector_type>(begin(), end());
auto &vector = vector_type(begin(), end());
vector.resize(new_size);
data = std::move(vector);
} else if (is_dynamic()) {
if (new_size > N)
std::get<vector_type>(data).resize(new_size);