From 97f5effe3a56b9c395b20624b2a141ab84a625f8 Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Thu, 22 Aug 2013 12:18:14 -0700 Subject: Fix an overzealous warning on 32-bit systems --- src/common/utils2.hpp | 7 +++++++ src/login/login.cpp | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/common/utils2.hpp b/src/common/utils2.hpp index 119cc13..978ae54 100644 --- a/src/common/utils2.hpp +++ b/src/common/utils2.hpp @@ -277,4 +277,11 @@ T base_cast(U&& u) return std::forward(u); } +// use this when e.g. U is an int of unknown size +template +T maybe_cast(U u) +{ + return u; +} + #endif // UTILS2_HPP diff --git a/src/login/login.cpp b/src/login/login.cpp index 031abd7..e09f96b 100644 --- a/src/login/login.cpp +++ b/src/login/login.cpp @@ -3792,7 +3792,7 @@ void save_config_in_log(void) LOGIN_LOG("- to NOT check GM accounts file modifications.\n"); else LOGIN_LOG("- to check GM accounts file modifications every %lld seconds.\n", - static_cast(gm_account_filename_check_timer.count())); + maybe_cast(gm_account_filename_check_timer.count())); // not necessary to log the 'login_log_filename', we are inside :) -- cgit v1.2.3-70-g09d2