From 3879bc6a4e2e322fb7ba8ab61db3c54ede6bb6a7 Mon Sep 17 00:00:00 2001
From: Bruno de Oliveira Abinader <bruno@mapbox.com>
Date: Thu, 10 Mar 2016 21:09:41 +0200
Subject: [PATCH] [core] Make vec{2,3,4} operator bool explicit

---
 include/mbgl/util/vec.hpp | 12 ++++++------
 test/util/merge_lines.cpp |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/include/mbgl/util/vec.hpp b/include/mbgl/util/vec.hpp
index a8bbd14b0..7c91ee0ad 100644
--- a/include/mbgl/util/vec.hpp
+++ b/include/mbgl/util/vec.hpp
@@ -85,12 +85,12 @@ struct vec2 {
     }
 
     template<typename U = T, typename std::enable_if<std::numeric_limits<U>::has_quiet_NaN, int>::type = 0>
-    inline operator bool() const {
+    explicit operator bool() const {
         return !std::isnan(x) && !std::isnan(y);
     }
 
     template<typename U = T, typename std::enable_if<!std::numeric_limits<U>::has_quiet_NaN, int>::type = 0>
-    inline operator bool() const {
+    explicit operator bool() const {
         return x != std::numeric_limits<T>::min() && y != std::numeric_limits<T>::min();
     }
 };
@@ -107,12 +107,12 @@ struct vec3 {
     }
 
     template<typename U = T, typename std::enable_if<std::numeric_limits<U>::has_quiet_NaN, int>::type = 0>
-    inline operator bool() const {
+    explicit operator bool() const {
         return !std::isnan(x) && !std::isnan(y) && !std::isnan(z);
     }
 
     template<typename U = T, typename std::enable_if<!std::numeric_limits<U>::has_quiet_NaN, int>::type = 0>
-    inline operator bool() const {
+    explicit operator bool() const {
         return x != std::numeric_limits<T>::min()
             && y != std::numeric_limits<T>::min()
             && z != std::numeric_limits<T>::min();
@@ -131,12 +131,12 @@ struct vec4 {
     }
 
     template<typename U = T, typename std::enable_if<std::numeric_limits<U>::has_quiet_NaN, int>::type = 0>
-    inline operator bool() const {
+    explicit operator bool() const {
         return !std::isnan(x) && !std::isnan(y) && !std::isnan(z) && !std::isnan(w);
     }
 
     template<typename U = T, typename std::enable_if<!std::numeric_limits<U>::has_quiet_NaN, int>::type = 0>
-    inline operator bool() const {
+    explicit operator bool() const {
         return x != std::numeric_limits<T>::min()
             && y != std::numeric_limits<T>::min()
             && z != std::numeric_limits<T>::min()
diff --git a/test/util/merge_lines.cpp b/test/util/merge_lines.cpp
index 90625e9e0..ed59182d7 100644
--- a/test/util/merge_lines.cpp
+++ b/test/util/merge_lines.cpp
@@ -28,7 +28,7 @@ TEST(MergeLines, SameText) {
     mbgl::util::mergeLines(input1);
 
     for (int i = 0; i < 6; i++) {
-        EXPECT_EQ(input1[i].geometry, expected1[i].geometry);
+        EXPECT_TRUE(input1[i].geometry == expected1[i].geometry);
     }
 }
 
@@ -49,7 +49,7 @@ TEST(MergeLines, BothEnds) {
     mbgl::util::mergeLines(input2);
 
     for (int i = 0; i < 3; i++) {
-        EXPECT_EQ(input2[i].geometry, expected2[i].geometry);
+        EXPECT_TRUE(input2[i].geometry == expected2[i].geometry);
     }
 }
 
@@ -70,6 +70,6 @@ TEST(MergeLines, CircularLines) {
     mbgl::util::mergeLines(input3);
 
     for (int i = 0; i < 3; i++) {
-        EXPECT_EQ(input3[i].geometry, expected3[i].geometry);
+        EXPECT_TRUE(input3[i].geometry == expected3[i].geometry);
     }
 }