commit 1ac547483837cc7f650b4ccac226dc973994ffb4
author Mike Klein <mtklein@google.com> Wed May 20 08:35:26 2020 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed May 20 14:38:16 2020 +0000
tree 61e52384fe8c45044fd0c3a73fd88c2908aae8dd
parent 40b4de2dbdc689338d33163c4077458d9b5a4a41

split up ==/!= for C++20

Change-Id: Iddced1112600bd2692e5004ff5ed07fb540331d7
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/290847
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>

src/core/SkVM.h

diff --git a/src/core/SkVM.h b/src/core/SkVM.h
index 697337e..9ae8f2e 100644
--- a/src/core/SkVM.h
+++ b/src/core/SkVM.h
@@ -871,11 +871,13 @@
     static inline I32 max(I32 x, I32a y) { return x->max(x,y); }
     static inline I32 max(int x, I32  y) { return y->max(x,y); }
 
-    static inline I32 operator==(I32 x, I32a y) { return x->eq(x,y); }
-    static inline I32 operator==(int x, I32  y) { return y->eq(x,y); }
+    static inline I32 operator==(I32 x, I32 y) { return x->eq(x,y); }
+    static inline I32 operator==(I32 x, int y) { return x->eq(x,y); }
+    static inline I32 operator==(int x, I32 y) { return y->eq(x,y); }
 
-    static inline I32 operator!=(I32 x, I32a y) { return x->neq(x,y); }
-    static inline I32 operator!=(int x, I32  y) { return y->neq(x,y); }
+    static inline I32 operator!=(I32 x, I32 y) { return x->neq(x,y); }
+    static inline I32 operator!=(I32 x, int y) { return x->neq(x,y); }
+    static inline I32 operator!=(int x, I32 y) { return y->neq(x,y); }
 
     static inline I32 operator< (I32 x, I32a y) { return x->lt(x,y); }
     static inline I32 operator< (int x, I32  y) { return y->lt(x,y); }
@@ -908,11 +910,13 @@
     static inline F32 max(F32   x, F32a y) { return x->max(x,y); }
     static inline F32 max(float x, F32  y) { return y->max(x,y); }
 
-    static inline I32 operator==(F32   x, F32a y) { return x->eq(x,y); }
-    static inline I32 operator==(float x, F32  y) { return y->eq(x,y); }
+    static inline I32 operator==(F32   x, F32   y) { return x->eq(x,y); }
+    static inline I32 operator==(F32   x, float y) { return x->eq(x,y); }
+    static inline I32 operator==(float x, F32   y) { return y->eq(x,y); }
 
-    static inline I32 operator!=(F32   x, F32a y) { return x->neq(x,y); }
-    static inline I32 operator!=(float x, F32  y) { return y->neq(x,y); }
+    static inline I32 operator!=(F32   x, F32   y) { return x->neq(x,y); }
+    static inline I32 operator!=(F32   x, float y) { return x->neq(x,y); }
+    static inline I32 operator!=(float x, F32   y) { return y->neq(x,y); }
 
     static inline I32 operator< (F32   x, F32a y) { return x->lt(x,y); }
     static inline I32 operator< (float x, F32  y) { return y->lt(x,y); }