define using control_block in eos-vm-oc.h instead of two separate…

… files
AntelopeIO · Oct 23, 2023 · 87cbe09 · 87cbe09
1 parent 6dbb6c2
commit 87cbe09
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/eos-vm-oc.h b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/eos-vm-oc.h
@@ -7,7 +7,9 @@
 #ifdef __cplusplus
 #include <vector>
 #include <list>
-namespace eosio { namespace chain {class apply_context;}}
+namespace eosio::chain {
+   class apply_context;
+}
 #endif
 
 struct eos_vm_oc_control_block {
@@ -38,3 +40,9 @@ struct eos_vm_oc_control_block {
    int64_t max_linear_memory_pages;
    void* globals;
 };
+
+#ifdef __cplusplus
+namespace eosio::chain::eosvmoc {
+   using control_block = eos_vm_oc_control_block;
+}
+#endif
diff --git a/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/eos-vm-oc.hpp b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/eos-vm-oc.hpp
@@ -12,13 +12,7 @@
 #include <vector>
 #include <list>
 
-namespace eosio { namespace chain {
-
-class apply_context;
-
-namespace eosvmoc {
-
-using control_block = eos_vm_oc_control_block;
+namespace eosio::chain::eosvmoc {
 
 struct no_offset{};
 struct code_offset {
@@ -52,7 +46,7 @@ enum eosvmoc_exitcode : int {
 
 static constexpr uint8_t current_codegen_version = 1;
 
-}}}
+}
 
 FC_REFLECT(eosio::chain::eosvmoc::no_offset, );
 FC_REFLECT(eosio::chain::eosvmoc::code_offset, (offset));

diff --git a/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/memory.hpp b/libraries/chain/include/eosio/chain/webassembly/eos-vm-oc/memory.hpp
@@ -11,8 +11,6 @@
 
 namespace eosio::chain::eosvmoc {
 
-using control_block = eos_vm_oc_control_block;
-
 class memory {
       static constexpr uint64_t intrinsic_count                   = intrinsic_table_size();
       //warning: changing the following 3 params will invalidate existing PIC