diff options
| author |  Sadie Powell | 2025-03-02 00:57:33 +0000 |
|---|---|---|
| committer | Sadie Powell | 2025-03-02 00:57:33 +0000 |
| commit | 7c4830ac78633dac678bfd1d76ecb2534255201f (patch) | |
| tree | 75bf7767e38eef210eeffac6f3b5508e7d6f97e3 /src/helperfuncs.cpp | |
| parent | Use from_chars instead of istringstream in ConvToNum. (diff) | |
| parent | Fix a compiler error in helperfuncs. (diff) | |
Merge branch 'insp4' into master.
Diffstat (limited to 'src/helperfuncs.cpp')
| -rw-r--r-- | src/helperfuncs.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp index 48feb9b75..c34a70669 100644 --- a/src/helperfuncs.cpp +++ b/src/helperfuncs.cpp @@ -397,7 +397,7 @@ static constexpr unsigned int duration_multi[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }; -bool Duration::TryFrom(const std::string& str, unsigned long& duration, time_t base) +bool Duration::TryFrom(const std::string& str, unsigned long& duration) { unsigned long total = 0; unsigned long subtotal = 0; @@ -431,10 +431,10 @@ bool Duration::TryFrom(const std::string& str, unsigned long& duration, time_t b return true; } -unsigned long Duration::From(const std::string& str, time_t base) +unsigned long Duration::From(const std::string& str) { unsigned long out = 0; - Duration::TryFrom(str, out, base); + Duration::TryFrom(str, out); return out; } |