diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2017-03-21 11:55:02 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-03-21 12:04:20 -0700 |
commit | e488ca702e8f822ba6297a2f3c933ee22ca6ce42 (patch) | |
tree | 2efe93d84722f37a61b83155510a3da444fc171b /platform/darwin/src/NSDate+MGLAdditions.h | |
parent | 1f8910de186f35216791a17a683a55f01031ec81 (diff) | |
parent | e0fe42d8321d19a4a9cb46edac9fbdb035e70a0c (diff) | |
download | qtlocation-mapboxgl-e488ca702e8f822ba6297a2f3c933ee22ca6ce42.tar.gz |
Merge branch 'release-ios-v3.5.0-android-v5.0.0'
Diffstat (limited to 'platform/darwin/src/NSDate+MGLAdditions.h')
-rw-r--r-- | platform/darwin/src/NSDate+MGLAdditions.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/platform/darwin/src/NSDate+MGLAdditions.h b/platform/darwin/src/NSDate+MGLAdditions.h index 820d1bd9e2..1da03fda62 100644 --- a/platform/darwin/src/NSDate+MGLAdditions.h +++ b/platform/darwin/src/NSDate+MGLAdditions.h @@ -1,13 +1,17 @@ #import <Foundation/Foundation.h> +#import "MGLFoundation.h" #include <mbgl/util/chrono.hpp> -@interface NSDate (MGLAdditions) +NS_ASSUME_NONNULL_BEGIN + /// Converts from a duration in seconds to a duration object usable in mbgl. -mbgl::Duration MGLDurationInSecondsFromTimeInterval(NSTimeInterval duration); +MGL_EXPORT +mbgl::Duration MGLDurationFromTimeInterval(NSTimeInterval duration); /// Converts from an mbgl duration object to a duration in seconds. -NSTimeInterval MGLTimeIntervalFromDurationInSeconds(mbgl::Duration duration); +MGL_EXPORT +NSTimeInterval MGLTimeIntervalFromDuration(mbgl::Duration duration); -@end +NS_ASSUME_NONNULL_END |