From 52355f5185fe42e28775e897f458b38a439c0ec5 Mon Sep 17 00:00:00 2001
From: Eddie Hung <eddie@fpgeh.com>
Date: Thu, 15 Aug 2019 14:50:10 -0700
Subject: Use more ID::{A,B,Y,blackbox,whitebox}

---
 kernel/yosys.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'kernel/yosys.h')

diff --git a/kernel/yosys.h b/kernel/yosys.h
index 49716ed52..52e7b3383 100644
--- a/kernel/yosys.h
+++ b/kernel/yosys.h
@@ -210,6 +210,7 @@ namespace RTLIL {
 	struct Module;
 	struct Design;
 	struct Monitor;
+    namespace ID {}
 }
 
 namespace AST {
@@ -224,6 +225,7 @@ using RTLIL::Wire;
 using RTLIL::Cell;
 using RTLIL::Module;
 using RTLIL::Design;
+namespace ID = RTLIL::ID;
 
 namespace hashlib {
 	template<> struct hash_ops<RTLIL::Wire*> : hash_obj_ops {};
-- 
cgit v1.2.3


From 453a9429b67551f94f8c714c24f12929e472052c Mon Sep 17 00:00:00 2001
From: Eddie Hung <eddie@fpgeh.com>
Date: Thu, 15 Aug 2019 14:54:41 -0700
Subject: Fix spacing

---
 kernel/yosys.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'kernel/yosys.h')

diff --git a/kernel/yosys.h b/kernel/yosys.h
index 52e7b3383..0cf230722 100644
--- a/kernel/yosys.h
+++ b/kernel/yosys.h
@@ -210,7 +210,7 @@ namespace RTLIL {
 	struct Module;
 	struct Design;
 	struct Monitor;
-    namespace ID {}
+	namespace ID {}
 }
 
 namespace AST {
-- 
cgit v1.2.3


From 0b9ee4fbbf3a5fc818e5ae39a013cdd9e17f641f Mon Sep 17 00:00:00 2001
From: Eddie Hung <eddie@fpgeh.com>
Date: Thu, 15 Aug 2019 16:20:54 -0700
Subject: Try this for gcc-4.8?

---
 kernel/yosys.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'kernel/yosys.h')

diff --git a/kernel/yosys.h b/kernel/yosys.h
index 0cf230722..895286a53 100644
--- a/kernel/yosys.h
+++ b/kernel/yosys.h
@@ -225,7 +225,7 @@ using RTLIL::Wire;
 using RTLIL::Cell;
 using RTLIL::Module;
 using RTLIL::Design;
-namespace ID = RTLIL::ID;
+namespace ID = ::YOSYS_NAMESPACE::RTLIL::ID;
 
 namespace hashlib {
 	template<> struct hash_ops<RTLIL::Wire*> : hash_obj_ops {};
-- 
cgit v1.2.3


From 3b19c3657cda6d972bd3b1c3eeacdfca5fb35de8 Mon Sep 17 00:00:00 2001
From: Eddie Hung <eddie@fpgeh.com>
Date: Fri, 16 Aug 2019 19:37:11 +0000
Subject: Move namespace alias

---
 kernel/yosys.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'kernel/yosys.h')

diff --git a/kernel/yosys.h b/kernel/yosys.h
index 895286a53..a80cb00b4 100644
--- a/kernel/yosys.h
+++ b/kernel/yosys.h
@@ -210,7 +210,6 @@ namespace RTLIL {
 	struct Module;
 	struct Design;
 	struct Monitor;
-	namespace ID {}
 }
 
 namespace AST {
@@ -225,7 +224,6 @@ using RTLIL::Wire;
 using RTLIL::Cell;
 using RTLIL::Module;
 using RTLIL::Design;
-namespace ID = ::YOSYS_NAMESPACE::RTLIL::ID;
 
 namespace hashlib {
 	template<> struct hash_ops<RTLIL::Wire*> : hash_obj_ops {};
@@ -317,6 +315,7 @@ RTLIL::IdString new_id(std::string file, int line, std::string func);
 //
 #define ID(_id) ([]() { const char *p = "\\" #_id, *q = p[1] == '$' ? p+1 : p; \
         static const YOSYS_NAMESPACE_PREFIX RTLIL::IdString id(q); return id; })()
+namespace ID = RTLIL::ID;
 
 RTLIL::Design *yosys_get_design();
 std::string proc_self_dirname();
-- 
cgit v1.2.3