From 2cf217fb641d79973867976b2b1c39267d157e87 Mon Sep 17 00:00:00 2001
From: Wolfgang Thaller <wolfgang.thaller@gmx.net>
Date: Wed, 23 Jan 2019 23:09:44 +0100
Subject: [PATCH] ConvertObj: make module sorting deterministic

---
 ConvertObj/ConvertObj.cc | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/ConvertObj/ConvertObj.cc b/ConvertObj/ConvertObj.cc
index f7f9b1e4c4..40ff3e7170 100644
--- a/ConvertObj/ConvertObj.cc
+++ b/ConvertObj/ConvertObj.cc
@@ -2,6 +2,7 @@
 #include <iostream>
 #include <unordered_map>
 #include <unordered_set>
+#include <set>
 #include <string>
 #include "BinaryIO.h"
 #include <stdint.h>
@@ -194,9 +195,9 @@ void Module::write(std::ostream& out)
 
 void sortModules(std::vector<std::shared_ptr<Module>>& modules)
 {
-	std::unordered_set<std::shared_ptr<Module>> unemitted;
+	std::set<std::string> unemitted;
 	for(auto& m : modules)
-		unemitted.insert(m);
+		unemitted.insert(m->name);
 	
 	std::unordered_map<std::string, std::shared_ptr<Module>> nameMap;
 	for(auto& m : modules)
@@ -242,7 +243,7 @@ void sortModules(std::vector<std::shared_ptr<Module>>& modules)
 			{
 				if(std::shared_ptr<Module> m2 = m2weak.lock())
 				{
-					auto unemittedP = unemitted.find(m2);
+					auto unemittedP = unemitted.find(m2->name);
 					if(unemittedP != unemitted.end())
 					{
 						sorted.push_back(m2);
@@ -252,7 +253,7 @@ void sortModules(std::vector<std::shared_ptr<Module>>& modules)
 			}
 			++p;
 		}
-		sorted.push_back(*unemitted.begin());
+        sorted.push_back(nameMap[*unemitted.begin()]);
 		unemitted.erase(unemitted.begin());
 	}