0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use std::tm instead of plain C tm

Browse source 
(cherry-picked from commit 36e83e646c)
This commit is contained in:
Charles Dang 2018-05-13 22:28:12 +11:00
parent 16fdbc417a
commit 64d176530f
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/format_time_summary.cpp
View file

@ -22,19 +22,19 @@ namespace utils {
std::string format_time_summary(std::time_t t) {
std::time_t curtime = std::time(nullptr);
const struct tm* timeptr = std::localtime(&curtime);
const std::tm* timeptr = std::localtime(&curtime);
if(timeptr == nullptr) {
return "";
}
const struct tm current_time = *timeptr;
const std::tm current_time = *timeptr;
timeptr = std::localtime(&t);
if(timeptr == nullptr) {
return "";
}
const struct tm save_time = *timeptr;
const std::tm save_time = *timeptr;
std::string format_string;

2
src/gui/dialogs/debug_clock.cpp
View file

@ -175,7 +175,7 @@ debug_clock::time::time() : hour(0), minute(0), second(0), millisecond(0)
void debug_clock::time::set_current_time()
{
std::time_t now = ::std::time(nullptr);
tm* stamp = std::localtime(&now);
std::tm* stamp = std::localtime(&now);
hour = stamp->tm_hour;
minute = stamp->tm_min;

2
src/save_index.cpp
View file

@ -213,7 +213,7 @@ const config& save_info::summary() const
std::string save_info::format_time_local() const
{
if(tm* tm_l = std::localtime(&modified())) {
if(std::tm* tm_l = std::localtime(&modified())) {
const std::string format = preferences::use_twelve_hour_clock_format()
? _("%a %b %d %I:%M %p %Y")
: _("%a %b %d %H:%M %Y");

2
src/server/ban.cpp
View file

@ -329,7 +329,7 @@ static lg::log_domain log_server("server");
if (!time) return false;
if (duration.substr(0,4) == "TIME") {
struct tm* loc;
std::tm* loc;
loc = std::localtime(time);
std::size_t number = 0;