Merge commit '50d3e596bbe89c95615f96eb71f6bc5be737a1db' into Basilisk-releasev2018.07.18

# Conflicts:
#	browser/app/profile/firefox.js
#	browser/components/preferences/jar.mn

1 files changed, 8 insertions, 24 deletions

diff --git a/gfx/angle/src/libANGLE/Version.inl b/gfx/angle/src/libANGLE/Version.inl
index 495209720..427f6ca17 100755
--- a/gfx/angle/src/libANGLE/Version.inl
+++ b/gfx/angle/src/libANGLE/Version.inl
@@ -6,54 +6,38 @@
 
 // Version.inl: Encapsulation of a GL version.
 
-#include <tuple>
-
 namespace gl
 {
 
-constexpr Version::Version()
+inline Version::Version()
     : Version(0, 0)
 {
 }
 
-// Avoid conflicts with linux system defines
-#undef major
-#undef minor
-
-constexpr Version::Version(GLuint major_, GLuint minor_)
-    : major(major_),
-      minor(minor_)
+inline Version::Version(GLuint major_, GLuint minor_)
 {
+    major = major_;
+    minor = minor_;
 }
 
 inline bool operator==(const Version &a, const Version &b)
 {
-    return std::tie(a.major, a.minor) == std::tie(b.major, b.minor);
+    return a.major == b.major && a.minor == b.minor;
 }
 
 inline bool operator!=(const Version &a, const Version &b)
 {
-    return std::tie(a.major, a.minor) != std::tie(b.major, b.minor);
+    return !(a == b);
 }
 
 inline bool operator>=(const Version &a, const Version &b)
 {
-    return std::tie(a.major, a.minor) >= std::tie(b.major, b.minor);
-}
-
-inline bool operator<=(const Version &a, const Version &b)
-{
-    return std::tie(a.major, a.minor) <= std::tie(b.major, b.minor);
+    return a.major > b.major || (a.major == b.major && a.minor >= b.minor);
 }
 
 inline bool operator<(const Version &a, const Version &b)
 {
-    return std::tie(a.major, a.minor) < std::tie(b.major, b.minor);
-}
-
-inline bool operator>(const Version &a, const Version &b)
-{
-    return std::tie(a.major, a.minor) > std::tie(b.major, b.minor);
+    return !(a >= b);
 }
 
 }