pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-03 19:52:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for non-fmtlib related linux build failure

Browse Source
This commit is contained in:
Uleat 2019-09-05 21:01:47 -04:00
parent eefe0dfbb7
commit 96103b09e0
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/rulesys.cpp
View File

@ -401,7 +401,7 @@ bool RuleManager::UpdateInjectedRules(Database *db, const char *ruleset_name, bo
} }
// build database data entries // build database data entries
for (auto &row : results) { for (auto row : results) {
database_data.push_back(std::string(row[0])); database_data.push_back(std::string(row[0]));
} }
@ -519,7 +519,7 @@ bool RuleManager::UpdateOrphanedRules(Database *db, bool quiet_update)
} }
// build orphaned entries // build orphaned entries
for (auto &row : results) { for (auto row : results) {
const auto &rd_iter = std::find(rule_data.begin(), rule_data.end(), row[0]); const auto &rd_iter = std::find(rule_data.begin(), rule_data.end(), row[0]);
if (rd_iter == rule_data.end()) { if (rd_iter == rule_data.end()) {

6
zone/lua_general.cpp
View File

@ -2327,17 +2327,17 @@ luabind::scope lua_register_rules_const() {
return luabind::class_<Rule>("Rule") return luabind::class_<Rule>("Rule")
.enum_("constants") .enum_("constants")
[ [
#define RULE_INT(cat, rule, default_value) \ #define RULE_INT(cat, rule, default_value, notes) \
luabind::value(#rule, RuleManager::Int__##rule), luabind::value(#rule, RuleManager::Int__##rule),
#include "../common/ruletypes.h" #include "../common/ruletypes.h"
luabind::value("_IntRuleCount", RuleManager::_IntRuleCount), luabind::value("_IntRuleCount", RuleManager::_IntRuleCount),
#undef RULE_INT #undef RULE_INT
#define RULE_REAL(cat, rule, default_value) \ #define RULE_REAL(cat, rule, default_value, notes) \
luabind::value(#rule, RuleManager::Real__##rule), luabind::value(#rule, RuleManager::Real__##rule),
#include "../common/ruletypes.h" #include "../common/ruletypes.h"
luabind::value("_RealRuleCount", RuleManager::_RealRuleCount), luabind::value("_RealRuleCount", RuleManager::_RealRuleCount),
#undef RULE_REAL #undef RULE_REAL
#define RULE_BOOL(cat, rule, default_value) \ #define RULE_BOOL(cat, rule, default_value, notes) \
luabind::value(#rule, RuleManager::Bool__##rule), luabind::value(#rule, RuleManager::Bool__##rule),
#include "../common/ruletypes.h" #include "../common/ruletypes.h"
luabind::value("_BoolRuleCount", RuleManager::_BoolRuleCount) luabind::value("_BoolRuleCount", RuleManager::_BoolRuleCount)