Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c9707e17 authored by Elliott Hughes's avatar Elliott Hughes Committed by Automerger Merge Worker
Browse files

Merge "Use static_assert directly." am: b219f6ed am: a271dfa6 am:... 

Merge "Use static_assert directly." am: b219f6ed am: a271dfa6 am: e06371e7 am: 26cea48a am: 5c35a813

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

Change-Id: I537b5084a5463599f7ec28fc356048a107622093
parents 8dd3c354 5c35a813

libs/binder/Parcel.cpp

+2 −3
Original line number Diff line number Diff line
@@ -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 @@ const void* Parcel::readInplace(size_t len) const 


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 @@ T Parcel::readAligned() const { 


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: