From 0eec1c1d4a29518e559d2522ab2b8c8be9d1a343 Mon Sep 17 00:00:00 2001
From: Mike Samsonov <misams@microsoft.com>
Date: Tue, 21 May 2019 16:05:38 +0100
Subject: [PATCH] One map to rule them all

---
 code/FBXConverter.cpp | 9 ++++-----
 code/FBXConverter.h   | 5 +----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/code/FBXConverter.cpp b/code/FBXConverter.cpp
index 50ea60b91..5031665a6 100644
--- a/code/FBXConverter.cpp
+++ b/code/FBXConverter.cpp
@@ -442,16 +442,15 @@ namespace Assimp {
         void FBXConverter::GetUniqueName(const std::string &name, std::string &uniqueName)
         {
             uniqueName = name;
-            auto it_pair = mNodeNameInstances.insert({ name, 0 }); // duplicate node name instance count
+            auto it_pair = mNodeNames.insert({ name, 0 }); // duplicate node name instance count
             unsigned int& i = it_pair.first->second;
-            auto uniqueIt_pair = mNodeNames.insert(uniqueName);
-            while (!uniqueIt_pair.second)
+            while (!it_pair.second)
             {
                 i++;
-                std::stringstream ext;
+                std::ostringstream ext;
                 ext << name << std::setfill('0') << std::setw(3) << i;
                 uniqueName = ext.str();
-                uniqueIt_pair = mNodeNames.insert(uniqueName);
+                it_pair = mNodeNames.insert({ uniqueName, 0 });
             }
         }
 
diff --git a/code/FBXConverter.h b/code/FBXConverter.h
index f5de99ae3..dba7c0a05 100644
--- a/code/FBXConverter.h
+++ b/code/FBXConverter.h
@@ -462,10 +462,7 @@ private:
     NodeAnimBitMap node_anim_chain_bits;
 
     // number of nodes with the same name
-    using NodeAnimNameMap = std::unordered_map<std::string, unsigned int>;
-    NodeAnimNameMap mNodeNameInstances;
-
-    using NodeNameCache = std::unordered_set<std::string>;
+    using NodeNameCache = std::unordered_map<std::string, unsigned int>;
     NodeNameCache mNodeNames;
 
     double anim_fps;