diff --git a/server/gameserver/mt/MetaMgr.cc b/server/gameserver/mt/MetaMgr.cc index fc2ae315..cbeb2004 100644 --- a/server/gameserver/mt/MetaMgr.cc +++ b/server/gameserver/mt/MetaMgr.cc @@ -133,7 +133,7 @@ namespace mt void MetaMgr::UnInit() { - + meta_tables.clear(); } } diff --git a/server/gameserver/mt/MetaMgr.h b/server/gameserver/mt/MetaMgr.h index cc7c1845..6ad597ce 100644 --- a/server/gameserver/mt/MetaMgr.h +++ b/server/gameserver/mt/MetaMgr.h @@ -81,7 +81,7 @@ namespace mt template void RegMetaTable(const std::string& dir) { - mt::MetaTable* p = new mt::MetaTable(); + std::shared_ptr p = std::make_shared(); p->static_pre_init_cb = [] () { @@ -155,7 +155,7 @@ namespace mt const std::string GetResDir() { return res_path_; } private: - std::vector meta_tables; + std::vector> meta_tables; std::string res_path_; }; diff --git a/third_party/a8 b/third_party/a8 index 73a47066..1e577389 160000 --- a/third_party/a8 +++ b/third_party/a8 @@ -1 +1 @@ -Subproject commit 73a4706673d6b773ca2e5cf102c45e0f2245aa5b +Subproject commit 1e577389c8a2870db9ddbf18577bfca24def049b diff --git a/third_party/f8 b/third_party/f8 index f856de73..243bbe51 160000 --- a/third_party/f8 +++ b/third_party/f8 @@ -1 +1 @@ -Subproject commit f856de73d2a3087289495690e3ea9bd7b1aa79ef +Subproject commit 243bbe515ef4a01089f9a6cf608c93d4097018de