diff options
| author | Adam <Adam@anope.org> | 2011-09-10 16:27:10 -0400 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2011-09-10 16:27:10 -0400 |
| commit | 26c1d67556d1475c0a27938aa760f834469b1d43 (patch) | |
| tree | bd9a14c1a4e5a058a2bf9912164542906f27f9d9 /modules/database | |
| parent | 3d5889c3089145af675a47267e15181bda84bf21 (diff) | |
Fixed compile errors & warnings from 1.9.6 to 1.9 merge
Diffstat (limited to 'modules/database')
| -rw-r--r-- | modules/database/db_mysql.cpp | 4 | ||||
| -rw-r--r-- | modules/database/db_plain.cpp | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/modules/database/db_mysql.cpp b/modules/database/db_mysql.cpp index 4a9c52202..e03c89d16 100644 --- a/modules/database/db_mysql.cpp +++ b/modules/database/db_mysql.cpp @@ -1538,11 +1538,7 @@ static void SaveDatabases() me->OnAkickAdd(ci, ak); } -<<<<<<< HEAD - me->OnLevelChange(NULL, ci, -1, -1); -======= me->OnLevelChange(NULL, ci, "ALL", -1); ->>>>>>> 348a3db... Allow modules to add their own channel levels for (unsigned j = 0, end = ci->memos.memos.size(); j < end; ++j) { diff --git a/modules/database/db_plain.cpp b/modules/database/db_plain.cpp index fffa02c87..bf0b05e3d 100644 --- a/modules/database/db_plain.cpp +++ b/modules/database/db_plain.cpp @@ -580,14 +580,14 @@ class DBPlain : public Module bool set = params[0] == "1" ? true : false; Anope::string mode_name = params[1]; Anope::string setter = params[2]; - time_t created = params[3].is_pos_number_only() ? convertTo<time_t>(params[3]) : Anope::CurTime; + time_t mcreated = params[3].is_pos_number_only() ? convertTo<time_t>(params[3]) : Anope::CurTime; Anope::string param = params.size() > 4 ? params[4] : ""; for (size_t i = CMODE_BEGIN + 1; i < CMODE_END; ++i) if (ChannelModeNameStrings[i] == mode_name) { ChannelModeName n = static_cast<ChannelModeName>(i); - ci->mode_locks.insert(std::make_pair(n, ModeLock(set, n, param, setter, created))); + ci->mode_locks.insert(std::make_pair(n, ModeLock(set, n, param, setter, mcreated))); break; } } |