History

Remove 'using namespace' statements from all but the execution table file.

arr committed 9 years ago

Commit 2519a931 parent 68d4d6931 files · +725 −426Browse files

Showing the changes to src/vm/execution_table.cpp (1 of 31 files). Show all

Unified · Split

src/vm/execution_table.cpp+13−13
@@ -1286,8 +1286,8 @@ namespace · 1285 unmodified lines
1286 {1286 {
1287 r.request_mutex.pending_request = false;1287 r.request_mutex.pending_request = false;
1288 1288
1289 if (debug::is_component_tracing_enabled<debug::component_trace_t::channel>())1289 if (disvm::debug::is_component_tracing_enabled<debug::component_trace_t::channel>())
1290 debug::log_msg(debug::component_trace_t::channel, debug::log_level_t::debug, "alt: request: non-blocking");1290 disvm::debug::log_msg(debug::component_trace_t::channel, debug::log_level_t::debug, "alt: request: non-blocking");
1291 1291
1292 // Cancel request in all channels.1292 // Cancel request in all channels.
1293 for (auto i = word_t{ 0 }; i < channel_count; ++i)1293 for (auto i = word_t{ 0 }; i < channel_count; ++i)
@@ -1482,8 +1482,8 @@ namespace · 188 unmodified lines
1482 if (new_frame == nullptr)1482 if (new_frame == nullptr)
1483 r.current_thread_state = vm_thread_state_t::empty_stack;1483 r.current_thread_state = vm_thread_state_t::empty_stack;
1484 1484
1485 if (debug::is_component_tracing_enabled<debug::component_trace_t::stack>())1485 if (disvm::debug::is_component_tracing_enabled<debug::component_trace_t::stack>())
1486 debug::log_msg(debug::component_trace_t::stack, debug::log_level_t::debug, "exit: function");1486 disvm::debug::log_msg(debug::component_trace_t::stack, debug::log_level_t::debug, "exit: function");
1487 }1487 }
1488 1488
1489 EXEC_DECL(call)1489 EXEC_DECL(call)
@@ -1500,7 +1500,7 @@ namespace · 10 unmodified lines
1500 1500
1501 r.next_pc = vt_ref<vm_pc_t>(r.dest);1501 r.next_pc = vt_ref<vm_pc_t>(r.dest);
1502 1502
1503 debug::log_msg(debug::component_trace_t::stack, debug::log_level_t::debug, "enter: function");1503 disvm::debug::log_msg(debug::component_trace_t::stack, debug::log_level_t::debug, "enter: function");
1504 }1504 }
1505 1505
1506 EXEC_DECL(mcall)1506 EXEC_DECL(mcall)
@@ -1529,9 +1529,9 @@ namespace · 22 unmodified lines
1529 top_frame->prev_pc() = r.next_pc;1529 top_frame->prev_pc() = r.next_pc;
1530 top_frame->prev_module_ref() = r.module_ref;1530 top_frame->prev_module_ref() = r.module_ref;
1531 1531
1532 if (debug::is_component_tracing_enabled<debug::component_trace_t::stack>())1532 if (disvm::debug::is_component_tracing_enabled<debug::component_trace_t::stack>())
1533 {1533 {
1534 debug::log_msg(1534 disvm::debug::log_msg(
1535 debug::component_trace_t::stack,1535 debug::component_trace_t::stack,
1536 debug::log_level_t::debug,1536 debug::log_level_t::debug,
1537 "enter: function: inter-module: %d >>%s<< %d %s",1537 "enter: function: inter-module: %d >>%s<< %d %s",
@@ -1660,8 +1660,8 @@ namespace · 122 unmodified lines
1660 // String1660 // String
1661 exception_id = static_cast<vm_string_t *>(e);1661 exception_id = static_cast<vm_string_t *>(e);
1662 1662
1663 if (debug::is_component_tracing_enabled<debug::component_trace_t::exception>())1663 if (disvm::debug::is_component_tracing_enabled<debug::component_trace_t::exception>())
1664 debug::log_msg(debug::component_trace_t::exception, debug::log_level_t::debug, "raise: string: >>%s<<", exception_id->str());1664 disvm::debug::log_msg(debug::component_trace_t::exception, debug::log_level_t::debug, "raise: string: >>%s<<", exception_id->str());
1665 }1665 }
1666 else1666 else
1667 {1667 {
@@ -1673,8 +1673,8 @@ namespace · 5 unmodified lines
1673 exception_id = at_val<vm_string_t>(content);1673 exception_id = at_val<vm_string_t>(content);
1674 assert(exception_id != nullptr);1674 assert(exception_id != nullptr);
1675 1675
1676 if (debug::is_component_tracing_enabled<debug::component_trace_t::exception>())1676 if (disvm::debug::is_component_tracing_enabled<debug::component_trace_t::exception>())
1677 debug::log_msg(debug::component_trace_t::exception, debug::log_level_t::debug, "raise: exception: >>%s<<", exception_id->str());1677 disvm::debug::log_msg(debug::component_trace_t::exception, debug::log_level_t::debug, "raise: exception: >>%s<<", exception_id->str());
1678 }1678 }
1679 1679
1680 // Check if the tool dispatcher has been supplied1680 // Check if the tool dispatcher has been supplied
@@ -1682,7 +1682,7 @@ namespace · 1 unmodified line
1682 if (tool_dispatch != nullptr)1682 if (tool_dispatch != nullptr)
1683 tool_dispatch->on_exception_raised(r, *exception_id, *e);1683 tool_dispatch->on_exception_raised(r, *exception_id, *e);
1684 1684
1685 const handler_t *handler;1685 const handler_entry_t *handler;
1686 vm_frame_t *target_frame;1686 vm_frame_t *target_frame;
1687 vm_pc_t handler_pc;1687 vm_pc_t handler_pc;
1688 1688
@@ -1783,7 +1783,7 @@ namespace · 94 unmodified lines
1783 }1783 }
1784 catch (const vm_module_exception &e)1784 catch (const vm_module_exception &e)
1785 {1785 {
1786 debug::log_msg(debug::component_trace_t::module, debug::log_level_t::debug, "exception: load: >>%s<<", e.what());1786 disvm::debug::log_msg(debug::component_trace_t::module, debug::log_level_t::debug, "exception: load: >>%s<<", e.what());
1787 return;1787 return;
1788 }1788 }
1789 }1789 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t