Substitute emp namespace inside macros

mmore500 · Oct 14, 2022 · 5a9cb9e · 5a9cb9e
1 parent 73369a1
commit 5a9cb9e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/include/uit_emp/vendorization/pop_uit_emp.hh b/include/uit_emp/vendorization/pop_uit_emp.hh
@@ -1,6 +1,7 @@
 #ifdef UIT_VENDORIZE_EMP
 
 #undef emp
+#undef EMP_NAMESPACE
 
 #include "pop_headerguards.hh"
 #include "pop_macros.hh"

diff --git a/include/uit_emp/vendorization/push_uit_emp.hh b/include/uit_emp/vendorization/push_uit_emp.hh
@@ -1,6 +1,7 @@
 #ifdef UIT_VENDORIZE_EMP
 
 #define emp uit_emp
+#define EMP_NAMESPACE() emp
 
 #include "push_headerguards.hh"
 #include "push_macros.hh"

diff --git a/third-party/Empirical b/third-party/Empirical
+3 −0		include/emp/base/_is_streamable.hpp
+4 −3		include/emp/base/always_assert.hpp
+4 −3		include/emp/base/always_assert_warning.hpp
+3 −1		include/emp/base/error.hpp
+2 −0		include/emp/bits/bitset_utils.hpp