Progress in memory_bram

2 files changed, 9 insertions, 5 deletions

diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index c40af88a..7618780b 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -250,14 +250,14 @@ namespace RTLIL
 		// of cell types). the following functions helps with that.
 
 		template<typename T, typename... Args>
-		bool in(T first, Args... rest) {
+		bool in(T first, Args... rest) const {
 			return in(first) || in(rest...);
 		}
 
-		bool in(IdString rhs) { return *this == rhs; }
-		bool in(const char *rhs) { return *this == rhs; }
-		bool in(const std::string &rhs) { return *this == rhs; }
-		bool in(const pool<IdString> &rhs) { return rhs.count(*this) != 0; }
+		bool in(IdString rhs) const { return *this == rhs; }
+		bool in(const char *rhs) const { return *this == rhs; }
+		bool in(const std::string &rhs) const { return *this == rhs; }
+		bool in(const pool<IdString> &rhs) const { return rhs.count(*this) != 0; }
 	};
 
 	static inline std::string escape_id(std::string str) {
diff --git a/kernel/yosys.h b/kernel/yosys.h
index 88f060a5..d1e01b19 100644
--- a/kernel/yosys.h
+++ b/kernel/yosys.h
@@ -137,6 +137,8 @@ YOSYS_NAMESPACE_BEGIN
 
 using std::vector;
 using std::string;
+using std::pair;
+
 using hashlib::mkhash;
 using hashlib::mkhash_init;
 using hashlib::mkhash_add;
@@ -221,6 +223,8 @@ YOSYS_NAMESPACE_END
 
 YOSYS_NAMESPACE_BEGIN
 
+using RTLIL::State;
+
 namespace hashlib {
 	template<> struct hash_ops<RTLIL::State> : hash_ops<int> {};
 }