commit 3db423465dc6e177aab27f315426541714201ebe
author Peiyong Lin <lpy@google.com> Thu Aug 16 09:15:59 2018 -0700
committer Peiyong Lin <lpy@google.com> Thu Aug 16 09:15:59 2018 -0700
tree dc7dff586ab3804cc79684ed1e040fb926f14969
parent 86b78a726e4b14c9216bdcffe02e62f8e64fc147

[SurfaceFlinger] Remove unused clz.h

The built-in method clz is no longer used anywhere in SurfaceFlinger, thus
remove this file and change all usage of min/max/swap to standard methods.

BUG: 112585051
Test: Build, flash
Change-Id: Ia5b47afae1ecbbda3c60d19de62ff9c76db743a4

services/surfaceflinger/BufferStateLayer.cpp

diff --git a/services/surfaceflinger/BufferStateLayer.cpp b/services/surfaceflinger/BufferStateLayer.cpp
index 44fa760..276e0e1 100644
--- a/services/surfaceflinger/BufferStateLayer.cpp
+++ b/services/surfaceflinger/BufferStateLayer.cpp
@@ -21,7 +21,6 @@
 
 #include "BufferStateLayer.h"
 #include "RenderEngine/Image.h"
-#include "clz.h"
 
 #include <private/gui/SyncFeatures.h>
 
@@ -401,13 +400,13 @@
     uint32_t bufferHeight = s.buffer->height;
 
     if (s.transform & Transform::ROT_90) {
-        swap(bufferWidth, bufferHeight);
+        std::swap(bufferWidth, bufferHeight);
     }
 
     if (s.transformToDisplayInverse) {
         uint32_t invTransform = DisplayDevice::getPrimaryDisplayOrientationTransform();
         if (invTransform & Transform::ROT_90) {
-            swap(bufferWidth, bufferHeight);
+            std::swap(bufferWidth, bufferHeight);
         }
     }