commit e3a40ea488c7cfa396d5901255719a6ddab791d4
author Ben Wagner <bungeman@google.com> Wed Aug 19 15:49:37 2015 -0400
committer Ben Wagner <bungeman@google.com> Wed Aug 19 17:21:17 2015 -0400
tree 96e9573df87e61ef366206485f53240251ca5599
parent e264f9a51ef2158df345c3c4b19dd6098e959141

Use static_assert instead of SK_COMPILE_ASSERT.

Now that static_assert is allowed, there is no need to use a non-
standard compile time assertion.

Change-Id: I0b294efcf494983f8241e9d5a2c476e2f2a9fff0

libs/hwui/SkiaCanvas.cpp

diff --git a/libs/hwui/SkiaCanvas.cpp b/libs/hwui/SkiaCanvas.cpp
index c122d99..646401c 100644
--- a/libs/hwui/SkiaCanvas.cpp
+++ b/libs/hwui/SkiaCanvas.cpp
@@ -702,7 +702,7 @@
     SkPaint paintCopy(paint);
     paintCopy.setTextAlign(SkPaint::kLeft_Align);
 
-    SK_COMPILE_ASSERT(sizeof(SkPoint) == sizeof(float)*2, SkPoint_is_no_longer_2_floats);
+    static_assert(sizeof(SkPoint) == sizeof(float)*2, "SkPoint is no longer two floats");
     mCanvas->drawPosText(text, count << 1, reinterpret_cast<const SkPoint*>(positions), paintCopy);
 }