namespace Yosys

6 files changed, 28 insertions, 16 deletions

diff --git a/kernel/bitpattern.h b/kernel/bitpattern.h
index 91f54593f..4d88c8e34 100644
--- a/kernel/bitpattern.h
+++ b/kernel/bitpattern.h
@@ -23,6 +23,8 @@
 #include "kernel/log.h"
 #include "kernel/rtlil.h"
 
+YOSYS_NAMESPACE_BEGIN
+
 struct BitPatternPool
 {
 	int width;
@@ -133,4 +135,6 @@ struct BitPatternPool
 	}
 }; 
 
+YOSYS_NAMESPACE_END
+
 #endif
diff --git a/kernel/consteval.h b/kernel/consteval.h
index 2d29d3f7e..12895ec78 100644
--- a/kernel/consteval.h
+++ b/kernel/consteval.h
@@ -25,6 +25,8 @@
 #include "kernel/celltypes.h"
 #include "kernel/macc.h"
 
+YOSYS_NAMESPACE_BEGIN
+
 struct ConstEval
 {
 	RTLIL::Module *module;
@@ -376,4 +378,6 @@ struct ConstEval
 	}
 };
 
+YOSYS_NAMESPACE_END
+
 #endif
diff --git a/kernel/log.h b/kernel/log.h
index e2b4db87b..2177db095 100644
--- a/kernel/log.h
+++ b/kernel/log.h
@@ -26,6 +26,9 @@
 #include <sys/time.h>
 #include <sys/resource.h>
 
+// from libs/sha1/sha1.h
+class SHA1;
+
 YOSYS_NAMESPACE_BEGIN
 
 #define S__LINE__sub2(x) #x
@@ -37,7 +40,7 @@ struct log_cmd_error_expection { };
 extern std::vector<FILE*> log_files;
 extern std::vector<std::ostream*> log_streams;
 extern FILE *log_errfile;
-extern class SHA1 *log_hasher;
+extern SHA1 *log_hasher;
 
 extern bool log_time;
 extern bool log_cmd_error_throw;
@@ -68,9 +71,9 @@ template<typename T> static inline const char *log_id(T *obj) {
 
 void log_cell(RTLIL::Cell *cell, std::string indent = "");
 
-#define log_abort() log_error("Abort in %s:%d.\n", __FILE__, __LINE__)
-#define log_assert(_assert_expr_) do { if (_assert_expr_) break; log_error("Assert `%s' failed in %s:%d.\n", #_assert_expr_, __FILE__, __LINE__); } while (0)
-#define log_ping() log("-- %s:%d %s --\n", __FILE__, __LINE__, __PRETTY_FUNCTION__)
+#define log_abort() YOSYS_NAMESPACE_PREFIX log_error("Abort in %s:%d.\n", __FILE__, __LINE__)
+#define log_assert(_assert_expr_) do { if (_assert_expr_) break; YOSYS_NAMESPACE_PREFIX log_error("Assert `%s' failed in %s:%d.\n", #_assert_expr_, __FILE__, __LINE__); } while (0)
+#define log_ping() YOSYS_NAMESPACE_PREFIX log("-- %s:%d %s --\n", __FILE__, __LINE__, __PRETTY_FUNCTION__)
 
 
 // ---------------------------------------------------
diff --git a/kernel/satgen.h b/kernel/satgen.h
index 692c6e7fb..84a47c43f 100644
--- a/kernel/satgen.h
+++ b/kernel/satgen.h
@@ -26,6 +26,9 @@
 #include "kernel/macc.h"
 
 #include "libs/ezsat/ezminisat.h"
+
+YOSYS_NAMESPACE_BEGIN
+
 typedef ezMiniSAT ezDefaultSAT;
 
 struct SatGen
@@ -1158,4 +1161,6 @@ struct SatGen
 	}
 };
 
+YOSYS_NAMESPACE_END
+
 #endif
diff --git a/kernel/utils.h b/kernel/utils.h
index a03caf804..264558b83 100644
--- a/kernel/utils.h
+++ b/kernel/utils.h
@@ -25,6 +25,8 @@
 #ifndef UTILS_H
 #define UTILS_H
 
+YOSYS_NAMESPACE_BEGIN
+
 // ------------------------------------------------
 // A map-like container, but you can save and restore the state
 // ------------------------------------------------
@@ -207,4 +209,6 @@ struct TopoSort
 	}
 };
 
+YOSYS_NAMESPACE_END
+
 #endif
diff --git a/kernel/yosys.h b/kernel/yosys.h
index b571e177f..e796919f2 100644
--- a/kernel/yosys.h
+++ b/kernel/yosys.h
@@ -60,18 +60,10 @@
 
 #define PRIVATE_NAMESPACE_BEGIN  namespace {
 #define PRIVATE_NAMESPACE_END    }
-
-#if 0
-#  define YOSYS_NAMESPACE_BEGIN  namespace Yosys {
-#  define YOSYS_NAMESPACE_END    }
-#  define YOSYS_NAMESPACE_PREFIX Yosys::
-#  define USING_YOSYS_NAMESPACE  using namespace Yosys;
-#else
-#  define YOSYS_NAMESPACE_BEGIN
-#  define YOSYS_NAMESPACE_END
-#  define YOSYS_NAMESPACE_PREFIX
-#  define USING_YOSYS_NAMESPACE
-#endif
+#define YOSYS_NAMESPACE_BEGIN    namespace Yosys {
+#define YOSYS_NAMESPACE_END      }
+#define YOSYS_NAMESPACE_PREFIX   Yosys::
+#define USING_YOSYS_NAMESPACE    using namespace Yosys;
 
 #if __cplusplus >= 201103L
 #  define OVERRIDE override