commit 6f60115eedb8dff980ac3ba0098a2ae278d98733
author Herb Derby <herb@google.com> Tue Oct 18 09:23:23 2022 -0400
committer SkCQ <skcq-be@skia-corp.google.com.iam.gserviceaccount.com> Tue Oct 18 16:48:27 2022 +0000
tree 712d813ad0097c81fb0ee2b2c6f86f5989bce7ca
parent b934b9d63b3f6fc35d4ba9c267c84db06cb8e4c3

Simplify SkTArray move()

Switch from using template enable_if to use 'if constexpr' making
the code clearer.

Change-Id: Ifa97cf99c38d4a195dcb439f0aadf8a3e2eedf13
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/592738
Commit-Queue: Herb Derby <herb@google.com>
Reviewed-by: John Stiles <johnstiles@google.com>

include/private/SkTArray.h

diff --git a/include/private/SkTArray.h b/include/private/SkTArray.h
index 9672b84..7eeceea 100644
--- a/include/private/SkTArray.h
+++ b/include/private/SkTArray.h
@@ -549,23 +549,25 @@
         }
     }
 
-    template <bool E = MEM_MOVE> std::enable_if_t<E, void> move(int dst, int src) {
-        memcpy(static_cast<void*>(&fItemArray[dst]),
-               static_cast<void*>(&fItemArray[src]),
-               sizeof(T));
-    }
-    template <bool E = MEM_MOVE> std::enable_if_t<E, void> move(void* dst) {
-        sk_careful_memcpy(dst, fItemArray, fCount * sizeof(T));
+    void move(int dst, int src) {
+        if constexpr (MEM_MOVE) {
+            memcpy(static_cast<void*>(&fItemArray[dst]),
+                   static_cast<void*>(&fItemArray[src]),
+                   sizeof(T));
+        } else {
+            new (&fItemArray[dst]) T(std::move(fItemArray[src]));
+            fItemArray[src].~T();
+        }
     }
 
-    template <bool E = MEM_MOVE> std::enable_if_t<!E, void> move(int dst, int src) {
-        new (&fItemArray[dst]) T(std::move(fItemArray[src]));
-        fItemArray[src].~T();
-    }
-    template <bool E = MEM_MOVE> std::enable_if_t<!E, void> move(void* dst) {
-        for (int i = 0; i < this->count(); ++i) {
-            new (static_cast<char*>(dst) + sizeof(T) * (size_t)i) T(std::move(fItemArray[i]));
-            fItemArray[i].~T();
+    void move(void* dst) {
+        if constexpr (MEM_MOVE) {
+            sk_careful_memcpy(dst, fItemArray, fCount * sizeof(T));
+        } else {
+            for (int i = 0; i < this->count(); ++i) {
+                new (static_cast<char*>(dst) + sizeof(T) * (size_t)i) T(std::move(fItemArray[i]));
+                fItemArray[i].~T();
+            }
         }
     }