From d912400f3200f38aec57d18fda4c9741a2e928bc Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Tue, 12 Jun 2018 00:31:20 -0700 Subject: [PATCH] ircd::m::vm: Move vm submodules ctor/dtor into libircd for recursive issues for now. --- ircd/m/m.cc | 1 + modules/vm.cc | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/ircd/m/m.cc b/ircd/m/m.cc index b88aee9dc..045c157d9 100644 --- a/ircd/m/m.cc +++ b/ircd/m/m.cc @@ -139,6 +139,7 @@ try // Manually load first modules m::modules.emplace("vm"s, "vm"s); + m::modules.emplace("vm_fetch"s, "vm_fetch"s); // The order of these prefixes will be the loading order. Order of // specific modules within a prefix is not determined here. diff --git a/modules/vm.cc b/modules/vm.cc index e026b8250..eb9883802 100644 --- a/modules/vm.cc +++ b/modules/vm.cc @@ -60,8 +60,6 @@ ircd::m::vm::notify_hook void ircd::m::vm::init() { - m::modules.emplace("vm_fetch"s, "vm_fetch"s); - id::event::buf event_id; current_sequence = retired_sequence(event_id); @@ -77,7 +75,6 @@ ircd::m::vm::init() void ircd::m::vm::fini() { - m::modules.erase("vm_fetch"s); assert(eval::list.empty()); id::event::buf event_id;