summaryrefslogtreecommitdiff
path: root/platform/darwin/src/NSDate+MGLAdditions.mm
diff options
context:
space:
mode:
authorFabian Guerra Soto <fabian.guerra@mapbox.com>2017-03-03 20:11:06 -0500
committerGitHub <noreply@github.com>2017-03-03 20:11:06 -0500
commit1f1cc131ea869eae57209bcc6ba74ddb3af14579 (patch)
treeca72da32853c0fe50271c15f442edf8cbcf0c3b3 /platform/darwin/src/NSDate+MGLAdditions.mm
parent8f892757b5c644986a68133c96684393df800670 (diff)
downloadqtlocation-mapboxgl-1f1cc131ea869eae57209bcc6ba74ddb3af14579.tar.gz
[ios] Fixed conversion between Duration and NSTimeInerval (#8276)
Diffstat (limited to 'platform/darwin/src/NSDate+MGLAdditions.mm')
-rw-r--r--platform/darwin/src/NSDate+MGLAdditions.mm13
1 files changed, 6 insertions, 7 deletions
diff --git a/platform/darwin/src/NSDate+MGLAdditions.mm b/platform/darwin/src/NSDate+MGLAdditions.mm
index deac3c4881..1739805e7c 100644
--- a/platform/darwin/src/NSDate+MGLAdditions.mm
+++ b/platform/darwin/src/NSDate+MGLAdditions.mm
@@ -1,15 +1,14 @@
#import "NSDate+MGLAdditions.h"
-@implementation NSDate (MGLAdditions)
-
-mbgl::Duration MGLDurationInSecondsFromTimeInterval(NSTimeInterval duration)
+mbgl::Duration MGLDurationFromTimeInterval(NSTimeInterval duration)
{
return std::chrono::duration_cast<mbgl::Duration>(std::chrono::duration<NSTimeInterval>(duration));
}
-NSTimeInterval MGLTimeIntervalFromDurationInSeconds(mbgl::Duration duration)
+NSTimeInterval MGLTimeIntervalFromDuration(mbgl::Duration duration)
{
- return duration.count();
+ std::chrono::nanoseconds nano(duration.count());
+ std::chrono::seconds sec = std::chrono::duration_cast<std::chrono::seconds>(nano);
+
+ return sec.count();
}
-
-@end