commit c9707e179f1000e0ee0f8dbdc45e00306908606d
author Elliott Hughes <enh@google.com> Tue Aug 18 18:01:44 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Aug 18 18:01:44 2020 +0000
tree 654b785d6932d09551a2d57a19c139000151e95c
parent 8dd3c3543f820cd70da8990a612491bbb5ff760e
parent 5c35a813e99cd926513e598028e487f5b9b8341a

Merge "Use static_assert directly." am: b219f6ed05 am: a271dfa663 am: e06371e73c am: 26cea48af8 am: 5c35a813e9

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1402757

Change-Id: I537b5084a5463599f7ec28fc356048a107622093

libs/binder/Parcel.cpp

diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp
index 8fd59ba..14ab60f 100644
--- a/libs/binder/Parcel.cpp
+++ b/libs/binder/Parcel.cpp
@@ -41,7 +41,6 @@
 #include <binder/TextOutput.h>
 
 #include <cutils/ashmem.h>
-#include <utils/Debug.h>
 #include <utils/Flattenable.h>
 #include <utils/Log.h>
 #include <utils/misc.h>
@@ -1526,7 +1525,7 @@
 
 template<class T>
 status_t Parcel::readAligned(T *pArg) const {
-    COMPILE_TIME_ASSERT_FUNCTION_SCOPE(PAD_SIZE_UNSAFE(sizeof(T)) == sizeof(T));
+    static_assert(PAD_SIZE_UNSAFE(sizeof(T)) == sizeof(T));
 
     if ((mDataPos+sizeof(T)) <= mDataSize) {
         if (mObjectsSize > 0) {
@@ -1559,7 +1558,7 @@
 
 template<class T>
 status_t Parcel::writeAligned(T val) {
-    COMPILE_TIME_ASSERT_FUNCTION_SCOPE(PAD_SIZE_UNSAFE(sizeof(T)) == sizeof(T));
+    static_assert(PAD_SIZE_UNSAFE(sizeof(T)) == sizeof(T));
 
     if ((mDataPos+sizeof(val)) <= mDataCapacity) {
 restart_write: