From 48be5120bc198113bca2bb21b6c0a0280ff1b5b6 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Sun, 25 Dec 2022 15:12:09 +0800 Subject: [PATCH] 1 --- server/gameserver/mt/MetaMgr.cc | 2 +- server/gameserver/mt/MetaMgr.h | 3 +-- third_party/f8 | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/server/gameserver/mt/MetaMgr.cc b/server/gameserver/mt/MetaMgr.cc index a59731cc..9fa001bb 100644 --- a/server/gameserver/mt/MetaMgr.cc +++ b/server/gameserver/mt/MetaMgr.cc @@ -110,7 +110,7 @@ namespace mt itr->static_pre_init_cb(); itr->load_cb(); } - for (int i = 0; i < 3; ++i) { + for (size_t i = 0; i < 3; ++i) { for (auto& itr : meta_tables) { if (i < itr->init_cbs.size()) { itr->init_cbs.at(i)(); diff --git a/server/gameserver/mt/MetaMgr.h b/server/gameserver/mt/MetaMgr.h index 2bc4a82f..7fc660cd 100644 --- a/server/gameserver/mt/MetaMgr.h +++ b/server/gameserver/mt/MetaMgr.h @@ -70,7 +70,7 @@ namespace mt void Load(); template - mt::MetaTable* RegMetaTable(const std::string& dir) + void RegMetaTable(const std::string& dir) { mt::MetaTable* p = new mt::MetaTable(); p->static_pre_init_cb = @@ -131,7 +131,6 @@ namespace mt SafeCallStaticPostInit(0); }; meta_tables.push_back(p); - return p; } const std::string GetResDir() { return res_path_; } diff --git a/third_party/f8 b/third_party/f8 index be01cfc5..058af9a9 160000 --- a/third_party/f8 +++ b/third_party/f8 @@ -1 +1 @@ -Subproject commit be01cfc54ff35720f9a02a32d9fc98a307e79e53 +Subproject commit 058af9a9bed40b3c7c256b42b8cf70cd0a22625e