From 04727c7e0fb4c00b38999da192e4ada2a6f9474a Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Sat, 2 Aug 2014 18:58:40 +0200
Subject: No implicit conversion from IdString to anything else

---
 passes/abc/abc.cc               | 2 +-
 passes/cmds/design.cc           | 2 +-
 passes/cmds/select.cc           | 4 ++--
 passes/cmds/show.cc             | 2 +-
 passes/fsm/fsm_export.cc        | 2 +-
 passes/memory/memory_collect.cc | 2 +-
 passes/techmap/extract.cc       | 4 ++--
 passes/techmap/techmap.cc       | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'passes')

diff --git a/passes/abc/abc.cc b/passes/abc/abc.cc
index 19664357..77419e61 100644
--- a/passes/abc/abc.cc
+++ b/passes/abc/abc.cc
@@ -303,7 +303,7 @@ static void handle_loops()
 					id1 = id2;
 				else if (edges[id1].size() > edges[id2].size())
 					continue;
-				else if (w1->name > w2->name)
+				else if (w2->name < w1->name)
 					id1 = id2;
 			}
 
diff --git a/passes/cmds/design.cc b/passes/cmds/design.cc
index 260e7b5d..9f800c31 100644
--- a/passes/cmds/design.cc
+++ b/passes/cmds/design.cc
@@ -192,7 +192,7 @@ struct DesignPass : public Pass {
 
 			for (auto mod : copy_src_modules)
 			{
-				std::string trg_name = as_name.empty() ? std::string(mod->name) : RTLIL::escape_id(as_name);
+				std::string trg_name = as_name.empty() ? mod->name.str() : RTLIL::escape_id(as_name);
 
 				if (copy_to_design->modules_.count(trg_name))
 					delete copy_to_design->modules_.at(trg_name);
diff --git a/passes/cmds/select.cc b/passes/cmds/select.cc
index b4f4d26a..2d49e85e 100644
--- a/passes/cmds/select.cc
+++ b/passes/cmds/select.cc
@@ -1080,7 +1080,7 @@ struct SelectPass : public Pass {
 				RTLIL::IdString mod_name = RTLIL::escape_id(args[++argidx]);
 				if (design->modules_.count(mod_name) == 0)
 					log_cmd_error("No such module: %s\n", id2cstr(mod_name));
-				design->selected_active_module = mod_name;
+				design->selected_active_module = mod_name.str();
 				got_module = true;
 				continue;
 			}
@@ -1304,7 +1304,7 @@ struct CdPass : public Pass {
 			if (design->modules_.count(design->selected_active_module) > 0)
 				module = design->modules_.at(design->selected_active_module);
 			if (module != NULL && module->cells_.count(modname) > 0)
-				modname = module->cells_.at(modname)->type;
+				modname = module->cells_.at(modname)->type.str();
 		}
 
 		if (design->modules_.count(modname) > 0) {
diff --git a/passes/cmds/show.cc b/passes/cmds/show.cc
index bbc0ff44..cbc4725f 100644
--- a/passes/cmds/show.cc
+++ b/passes/cmds/show.cc
@@ -322,7 +322,7 @@ struct ShowWorker
 				else if (it.second->port_output)
 					all_sinks.insert(stringf("n%d", id2num(it.first)));
 			} else {
-				wires_on_demand[stringf("n%d", id2num(it.first))] = it.first;
+				wires_on_demand[stringf("n%d", id2num(it.first))] = it.first.str();
 			}
 		}
 
diff --git a/passes/fsm/fsm_export.cc b/passes/fsm/fsm_export.cc
index 97ccf91e..cb762dc1 100644
--- a/passes/fsm/fsm_export.cc
+++ b/passes/fsm/fsm_export.cc
@@ -61,7 +61,7 @@ void write_kiss2(struct RTLIL::Module *module, struct RTLIL::Cell *cell, std::st
 		kiss_name.assign(attr_it->second.decode_string());
 	}
 	else {
-		kiss_name.assign(module->name);
+		kiss_name.assign(module->name.str());
 		kiss_name.append('-' + cell->name.str() + ".kiss2");
 	}
 
diff --git a/passes/memory/memory_collect.cc b/passes/memory/memory_collect.cc
index 471a7d53..9c670f00 100644
--- a/passes/memory/memory_collect.cc
+++ b/passes/memory/memory_collect.cc
@@ -126,7 +126,7 @@ static void handle_memory(RTLIL::Module *module, RTLIL::Memory *memory)
 	}
 
 	std::stringstream sstr;
-	sstr << "$mem$" << memory->name << "$" << (autoidx++);
+	sstr << "$mem$" << memory->name.str() << "$" << (autoidx++);
 
 	RTLIL::Cell *mem = module->addCell(sstr.str(), "$mem");
 	mem->parameters["\\MEMID"] = RTLIL::Const(memory->name.str());
diff --git a/passes/techmap/extract.cc b/passes/techmap/extract.cc
index 06af2923..985d51e5 100644
--- a/passes/techmap/extract.cc
+++ b/passes/techmap/extract.cc
@@ -240,8 +240,8 @@ namespace
 
 					if (sig_bit_ref.count(bit) == 0) {
 						bit_ref_t &bit_ref = sig_bit_ref[bit];
-						bit_ref.cell = cell->name;
-						bit_ref.port = conn.first;
+						bit_ref.cell = cell->name.str();
+						bit_ref.port = conn.first.str();
 						bit_ref.bit = i;
 					}
 
diff --git a/passes/techmap/techmap.cc b/passes/techmap/techmap.cc
index 374fa9bf..c639cc48 100644
--- a/passes/techmap/techmap.cc
+++ b/passes/techmap/techmap.cc
@@ -155,7 +155,7 @@ struct TechmapWorker
 		if (!flatten_mode)
 			for (auto &it : tpl->cells_)
 				if (it.first == "\\_TECHMAP_REPLACE_") {
-					orig_cell_name = cell->name;
+					orig_cell_name = cell->name.str();
 					module->rename(cell, stringf("$techmap%d", autoidx++) + cell->name.str());
 					break;
 				}
-- 
cgit v1.2.3