tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Consistent qualifier ordering." into main am: d72f4f8770

Browse source 
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2751987

Change-Id: Id756aecc9edded993a518cdee4d42f25b119f2d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-09-15 18:14:35 +00:00 committed by Automerger Merge Worker
commit cecef1f2e6
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libc/system_properties/include/system_properties/prop_info.h
View file

@ -45,14 +45,14 @@ struct prop_info {
// Read only properties will not set anything but the bottom most bit of serial and the top byte.
// We borrow the 2nd from the top byte for extra flags, and use the bottom most bit of that for
// our first user, kLongFlag.
constexpr static uint32_t kLongFlag = 1 << 16;
static constexpr uint32_t kLongFlag = 1 << 16;
// The error message fits in part of a union with the previous 92 char property value so there
// must be room left over after the error message for the offset to the new longer property value
// and future expansion fields if needed. Note that this value cannot ever increase. The offset
// to the new longer property value appears immediately after it, so an increase of this size will
// break compatibility.
constexpr static size_t kLongLegacyErrorBufferSize = 56;
static constexpr size_t kLongLegacyErrorBufferSize = 56;
public:
atomic_uint_least32_t serial;

2
libc/system_properties/prop_info.cpp
View file

@ -30,7 +30,7 @@
#include <string.h>
constexpr static const char kLongLegacyError[] =
static constexpr const char kLongLegacyError[] =
"Must use __system_property_read_callback() to read";
static_assert(sizeof(kLongLegacyError) < prop_info::kLongLegacyErrorBufferSize,
"Error message for long properties read by legacy libc must fit within 56 chars");

4
tests/malloc_test.cpp
View file

@ -824,7 +824,7 @@ TEST(malloc, mallinfo) {
8, 32, 128, 4096, 32768, 131072, 1024000, 10240000, 20480000, 300000000
};
constexpr static size_t kMaxAllocs = 50;
static constexpr size_t kMaxAllocs = 50;
for (size_t size : sizes) {
// If some of these allocations are stuck in a thread cache, then keep
@ -867,7 +867,7 @@ TEST(malloc, mallinfo2) {
SKIP_WITH_HWASAN << "hwasan does not implement mallinfo2";
static size_t sizes[] = {8, 32, 128, 4096, 32768, 131072, 1024000, 10240000, 20480000, 300000000};
constexpr static size_t kMaxAllocs = 50;
static constexpr size_t kMaxAllocs = 50;
for (size_t size : sizes) {
// If some of these allocations are stuck in a thread cache, then keep

2
tests/stdatomic_test.cpp
View file

@ -181,7 +181,7 @@ TEST(stdatomic, atomic_fetch_and) {
// And a rudimentary test of acquire-release memory ordering:
constexpr static uint_least32_t BIG = 30'000'000ul; // Assumed even below.
static constexpr uint_least32_t BIG = 30'000'000ul; // Assumed even below.
struct three_atomics {
atomic_uint_least32_t x;

2
tests/system_properties_test.cpp
View file

@ -498,7 +498,7 @@ TEST(properties, __system_property_extra_long_read_only) {
check_with_read_callback(name, value);
}
constexpr static const char* kExtraLongLegacyError =
static constexpr const char* kExtraLongLegacyError =
"Must use __system_property_read_callback() to read";
for (const auto& property : long_properties) {
const std::string& name = property.first;