openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "DO NOT MERGE - Merge QQ1A.200105.003 into stage-aosp-master" into stage-aosp-master

This commit is contained in:
TreeHugger Robot 2020-01-03 17:50:03 +00:00 committed by Android (Google) Code Review
parent 63422602d3 b091f4d40b
commit 4ff59c0e4e
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libutils/include/utils/Flattenable.h
View File

@ -52,7 +52,12 @@ public:
template<size_t N>
static size_t align(void*& buffer) {
return align<N>( const_cast<void const*&>(buffer) );
static_assert(!(N & (N - 1)), "Can only align to a power of 2.");
void* b = buffer;
buffer = reinterpret_cast<void*>((uintptr_t(buffer) + (N-1)) & ~(N-1));
size_t delta = size_t(uintptr_t(buffer) - uintptr_t(b));
memset(b, 0, delta);
return delta;
}
static void advance(void*& buffer, size_t& size, size_t offset) {