From b280ab9cdf451b147406138812e50ce5bd21aa45 Mon Sep 17 00:00:00 2001 From: Joakim Hove Date: Fri, 30 Jun 2017 15:23:10 +0200 Subject: [PATCH] Changed TimeMap::forward to use int64_t --- opm/parser/eclipse/EclipseState/Schedule/TimeMap.hpp | 4 ++-- src/opm/parser/eclipse/EclipseState/Schedule/TimeMap.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/opm/parser/eclipse/EclipseState/Schedule/TimeMap.hpp b/opm/parser/eclipse/EclipseState/Schedule/TimeMap.hpp index 35b298d13..d5802194d 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/TimeMap.hpp +++ b/opm/parser/eclipse/EclipseState/Schedule/TimeMap.hpp @@ -61,8 +61,8 @@ namespace Opm { static std::time_t timeFromEclipse(const DeckRecord &dateRecord); - static std::time_t forward(std::time_t t0, int hours, int minutes, long seconds); - static std::time_t forward(std::time_t t0, long seconds); + static std::time_t forward(std::time_t t0, int64_t hours, int64_t minutes, int64_t seconds); + static std::time_t forward(std::time_t t0, int64_t seconds); static std::time_t mkdate(int year, int month, int day); static std::time_t mkdatetime(int year, int month, int day, int hour, int minute, int second); private: diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/TimeMap.cpp b/src/opm/parser/eclipse/EclipseState/Schedule/TimeMap.cpp index e9fdd1013..06bb6ea95 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/TimeMap.cpp +++ b/src/opm/parser/eclipse/EclipseState/Schedule/TimeMap.cpp @@ -331,11 +331,11 @@ namespace Opm { } - std::time_t TimeMap::forward(std::time_t t, long seconds) { + std::time_t TimeMap::forward(std::time_t t, int64_t seconds) { return t + seconds; } - std::time_t TimeMap::forward(std::time_t t, int hours, int minutes, long seconds) { + std::time_t TimeMap::forward(std::time_t t, int64_t hours, int64_t minutes, int64_t seconds) { return t + seconds + minutes * 60 + hours * 3600; } }