Merge "Fix misc-macro-parentheses warnings in bionic."
This commit is contained in:
commit
36ad0207d6
|
@ -20,8 +20,7 @@
|
||||||
|
|
||||||
#include <benchmark/benchmark.h>
|
#include <benchmark/benchmark.h>
|
||||||
|
|
||||||
#define KB 1024
|
constexpr auto KB = 1024;
|
||||||
#define MB 1024*KB
|
|
||||||
|
|
||||||
#define AT_COMMON_SIZES \
|
#define AT_COMMON_SIZES \
|
||||||
Arg(1)->Arg(2)->Arg(3)->Arg(4)->Arg(8)->Arg(16)->Arg(32)->Arg(64)->Arg(512)-> \
|
Arg(1)->Arg(2)->Arg(3)->Arg(4)->Arg(8)->Arg(16)->Arg(32)->Arg(64)->Arg(512)-> \
|
||||||
|
|
|
@ -19,8 +19,7 @@
|
||||||
|
|
||||||
#include <benchmark/benchmark.h>
|
#include <benchmark/benchmark.h>
|
||||||
|
|
||||||
#define KB 1024
|
constexpr auto KB = 1024;
|
||||||
#define MB 1024*KB
|
|
||||||
|
|
||||||
#define AT_COMMON_SIZES \
|
#define AT_COMMON_SIZES \
|
||||||
Arg(8)->Arg(64)->Arg(512)->Arg(1*KB)->Arg(8*KB)->Arg(16*KB)->Arg(32*KB)->Arg(64*KB)
|
Arg(8)->Arg(64)->Arg(512)->Arg(1*KB)->Arg(8*KB)->Arg(16*KB)->Arg(32*KB)->Arg(64*KB)
|
||||||
|
|
|
@ -176,14 +176,14 @@ android_namespace_t* android_create_namespace(const char* name,
|
||||||
{ name_offset, \
|
{ name_offset, \
|
||||||
reinterpret_cast<Elf32_Addr>(value), \
|
reinterpret_cast<Elf32_Addr>(value), \
|
||||||
/* st_size */ 0, \
|
/* st_size */ 0, \
|
||||||
(shndx == 0) ? 0 : (STB_GLOBAL << 4), \
|
((shndx) == 0) ? 0 : (STB_GLOBAL << 4), \
|
||||||
/* st_other */ 0, \
|
/* st_other */ 0, \
|
||||||
shndx, \
|
shndx, \
|
||||||
}
|
}
|
||||||
|
|
||||||
#define ELF64_SYM_INITIALIZER(name_offset, value, shndx) \
|
#define ELF64_SYM_INITIALIZER(name_offset, value, shndx) \
|
||||||
{ name_offset, \
|
{ name_offset, \
|
||||||
(shndx == 0) ? 0 : (STB_GLOBAL << 4), \
|
((shndx) == 0) ? 0 : (STB_GLOBAL << 4), \
|
||||||
/* st_other */ 0, \
|
/* st_other */ 0, \
|
||||||
shndx, \
|
shndx, \
|
||||||
reinterpret_cast<Elf64_Addr>(value), \
|
reinterpret_cast<Elf64_Addr>(value), \
|
||||||
|
|
Loading…
Reference in New Issue