i40e_bm: remove using namespace directives

sims/nic/i40e_bm/i40e_adminq.cc

@@ -31,7 +31,7 @@
 #include "sims/nic/i40e_bm/i40e_base_wrapper.h"
 #include "sims/nic/i40e_bm/i40e_bm.h"
 
-using namespace i40e;
+namespace i40e {
 
 extern nicbm::Runner *runner;
 
@@ -421,3 +421,4 @@ void queue_admin_tx::admin_desc_ctx::process() {
     desc_complete(0);
   }
 }
+}  // namespace i40e

sims/nic/i40e_bm/i40e_bm.cc

@@ -32,10 +32,10 @@
 
 #include "sims/nic/i40e_bm/i40e_base_wrapper.h"
 
-nicbm::Runner *runner;
-
 namespace i40e {
 
+nicbm::Runner *runner;
+
 i40e_bm::i40e_bm()
     : log("i40e"),
       pf_atq(*this, regs.pf_atqba, regs.pf_atqlen, regs.pf_atqh, regs.pf_atqt),
@@ -826,10 +826,8 @@ int_ev::int_ev() {
 
 }  // namespace i40e
 
-using namespace i40e;
-
 int main(int argc, char *argv[]) {
-  i40e_bm dev;
-  runner = new nicbm::Runner(dev);
-  return runner->RunMain(argc, argv);
+  i40e::i40e_bm dev;
+  i40e::runner = new nicbm::Runner(dev);
+  return i40e::runner->RunMain(argc, argv);
 }

sims/nic/i40e_bm/i40e_hmc.cc

@@ -31,7 +31,7 @@
 #include "sims/nic/i40e_bm/i40e_base_wrapper.h"
 #include "sims/nic/i40e_bm/i40e_bm.h"
 
-using namespace i40e;
+namespace i40e {
 
 extern nicbm::Runner *runner;
 
@@ -139,3 +139,4 @@ void host_mem_cache::issue_mem_op(mem_op &op) {
 #endif
   runner->IssueDma(op);
 }
+}  // namespace i40e

sims/nic/i40e_bm/i40e_lan.cc

@@ -33,7 +33,7 @@
 #include "sims/nic/i40e_bm/i40e_base_wrapper.h"
 #include "sims/nic/i40e_bm/i40e_bm.h"
 
-using namespace i40e;
+namespace i40e {
 
 extern nicbm::Runner *runner;
 
@@ -709,3 +709,4 @@ void lan_queue_tx::dma_hwb::done() {
   queue.trigger();
   delete this;
 }
+}  // namespace i40e

sims/nic/i40e_bm/i40e_queues.cc

@@ -32,7 +32,7 @@
 #include "sims/nic/i40e_bm/i40e_base_wrapper.h"
 #include "sims/nic/i40e_bm/i40e_bm.h"
 
-using namespace i40e;
+namespace i40e {
 
 extern nicbm::Runner *runner;
 
@@ -447,3 +447,4 @@ void queue_base::dma_data_wb::done() {
   ctx.queue.trigger();
   delete this;
 }
+}  // namespace i40e

sims/nic/i40e_bm/logger.cc

@@ -26,7 +26,7 @@
 
 #include "sims/nic/i40e_bm/i40e_bm.h"
 
-using namespace i40e;
+namespace i40e {
 
 extern nicbm::Runner *runner;
 
@@ -85,3 +85,4 @@ logger &logger::operator<<(void *ptr) {
   ss << ptr;
   return *this;
 }
+}  // namespace i40e

sims/nic/i40e_bm/rss.cc

@@ -24,7 +24,7 @@
 
 #include "sims/nic/i40e_bm/i40e_bm.h"
 
-using namespace i40e;
+namespace i40e {
 
 rss_key_cache::rss_key_cache(const uint32_t (&key_)[key_len / 4]) : key(key_) {
   cache_dirty = true;
@@ -87,3 +87,4 @@ uint32_t rss_key_cache::hash_ipv4(uint32_t sip, uint32_t dip, uint16_t sp,
 
   return res;
 }
+}  // namespace i40e