From 974716eca7bc370aced6b28aa3177fa9b3588daf Mon Sep 17 00:00:00 2001
From: Chris Loer <chris.loer@gmail.com>
Date: Wed, 21 Feb 2018 16:04:36 -0800
Subject: [core] Modify TransitionOptions conversion code to appease GCC6
 sanitization.

---
 src/mbgl/style/conversion/transition_options.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'src/mbgl/style/conversion')

diff --git a/src/mbgl/style/conversion/transition_options.cpp b/src/mbgl/style/conversion/transition_options.cpp
index 8a60c5bfd8..97f0c0eddf 100644
--- a/src/mbgl/style/conversion/transition_options.cpp
+++ b/src/mbgl/style/conversion/transition_options.cpp
@@ -10,29 +10,29 @@ optional<TransitionOptions> Converter<TransitionOptions>::operator()(const Conve
         return {};
     }
 
-    TransitionOptions result;
-
-    auto duration = objectMember(value, "duration");
-    if (duration) {
-        auto number = toNumber(*duration);
+    auto objectDuration = objectMember(value, "duration");
+    optional<Duration> duration;
+    if (objectDuration) {
+        auto number = toNumber(*objectDuration);
         if (!number) {
             error = { "duration must be a number" };
             return {};
         }
-        result.duration = { std::chrono::milliseconds(int64_t(*number)) };
+        duration = Duration(std::chrono::milliseconds(int64_t(*number)));
     }
 
-    auto delay = objectMember(value, "delay");
-    if (delay) {
-        auto number = toNumber(*delay);
+    auto objectDelay = objectMember(value, "delay");
+    optional<Duration> delay;
+    if (objectDelay) {
+        auto number = toNumber(*objectDelay);
         if (!number) {
             error = { "delay must be a number" };
             return {};
         }
-        result.delay = { std::chrono::milliseconds(int64_t(*number)) };
+        delay = Duration(std::chrono::milliseconds(int64_t(*number)));
     }
 
-    return result;
+    return TransitionOptions{duration, delay};
 }
 
 } // namespace conversion
-- 
cgit v1.2.1