From a45e13b183b8f6e4b3d975bdfacde004e3543e92 Mon Sep 17 00:00:00 2001 From: Marc-Antoine Lortie Date: Tue, 17 Dec 2019 15:12:19 -0500 Subject: [PATCH] Fixed compilation issue. "insert_or_assign" was not defined in the Visual Studio 2013 toolset. --- code/MDL/HalfLife/HL1MDLLoader.cpp | 4 ++-- code/MDL/HalfLife/UniqueNameGenerator.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/MDL/HalfLife/HL1MDLLoader.cpp b/code/MDL/HalfLife/HL1MDLLoader.cpp index a95f65060..c518f2230 100644 --- a/code/MDL/HalfLife/HL1MDLLoader.cpp +++ b/code/MDL/HalfLife/HL1MDLLoader.cpp @@ -665,7 +665,7 @@ void HL1MDLLoader::read_meshes() { */ auto AddTrivertToBone = [&](int bone, short trivert_index) { if (bone_triverts.count(bone) == 0) - bone_triverts.insert_or_assign(bone, std::set{ trivert_index }); + bone_triverts.insert({ bone, std::set{ trivert_index }}); else bone_triverts[bone].insert(trivert_index); }; @@ -681,7 +681,7 @@ void HL1MDLLoader::read_meshes() { short new_trivert_index = static_cast(triverts.size()); if (triverts_similars.count(trivert.vertindex) == 0) - triverts_similars.insert_or_assign(trivert.vertindex, std::set{ new_trivert_index }); + triverts_similars.insert({ trivert.vertindex, std::set{ new_trivert_index }}); else triverts_similars[trivert.vertindex].insert(new_trivert_index); diff --git a/code/MDL/HalfLife/UniqueNameGenerator.cpp b/code/MDL/HalfLife/UniqueNameGenerator.cpp index 8c46b1078..1efc3238c 100644 --- a/code/MDL/HalfLife/UniqueNameGenerator.cpp +++ b/code/MDL/HalfLife/UniqueNameGenerator.cpp @@ -146,7 +146,7 @@ void UniqueNameGenerator::make_unique(std::vector &names) { // Map each unique name to it's duplicate. if (names_to_duplicates.count(names[i]) == 0) - names_to_duplicates.insert_or_assign(names[i], DuplicateInfo()); + names_to_duplicates.insert({ names[i], DuplicateInfo()}); else names_to_duplicates[names[i]].indices.push_back(i); }