From d84ac5179c96628c34b87b7086cfb63d7a281427 Mon Sep 17 00:00:00 2001 From: simonb Date: Wed, 24 Jun 2015 10:01:11 -0700 Subject: [PATCH] crazy linker: small fix for c++ style. Rename relocation packing flag constants from MACRO-style to kCamelCase. Cosmetic only, no functional effect. BUG=385553 Review URL: https://codereview.chromium.org/1203103002 Cr-Commit-Position: refs/heads/master@{#335939} --- third_party/android_crazy_linker/README.chromium | 2 ++ .../src/src/crazy_linker_elf_relocations.cpp | 16 ++++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/third_party/android_crazy_linker/README.chromium b/third_party/android_crazy_linker/README.chromium index 6880c889e4bf..4def4036bea5 100644 --- a/third_party/android_crazy_linker/README.chromium +++ b/third_party/android_crazy_linker/README.chromium @@ -82,3 +82,5 @@ Local Modifications: - Implement a stub __cxa_demangle to avoid linking to LLVM's implementation. +- Change relocation packing constant names for C++ style (cosmetic only). + diff --git a/third_party/android_crazy_linker/src/src/crazy_linker_elf_relocations.cpp b/third_party/android_crazy_linker/src/src/crazy_linker_elf_relocations.cpp index 5691ed383a76..9f6d82626dbb 100644 --- a/third_party/android_crazy_linker/src/src/crazy_linker_elf_relocations.cpp +++ b/third_party/android_crazy_linker/src/src/crazy_linker_elf_relocations.cpp @@ -419,25 +419,25 @@ class AndroidPackedRelocationGroupFlags { explicit AndroidPackedRelocationGroupFlags(size_t flags) : flags_(flags) { } bool is_relocation_grouped_by_info() const { - return hasFlag(RELOCATION_GROUPED_BY_INFO_FLAG); + return hasFlag(kRelocationGroupedByInfoFlag); } bool is_relocation_grouped_by_offset_delta() const { - return hasFlag(RELOCATION_GROUPED_BY_OFFSET_DELTA_FLAG); + return hasFlag(kRelocationGroupedByOffsetDeltaFlag); } bool is_relocation_grouped_by_addend() const { - return hasFlag(RELOCATION_GROUPED_BY_ADDEND_FLAG); + return hasFlag(kRelocationGroupedByAddendFlag); } bool is_relocation_group_has_addend() const { - return hasFlag(RELOCATION_GROUP_HAS_ADDEND_FLAG); + return hasFlag(kRelocationGroupHasAddendFlag); } private: bool hasFlag(size_t flag) const { return (flags_ & flag) != 0; } - static const size_t RELOCATION_GROUPED_BY_INFO_FLAG = 1 << 0; - static const size_t RELOCATION_GROUPED_BY_OFFSET_DELTA_FLAG = 1 << 1; - static const size_t RELOCATION_GROUPED_BY_ADDEND_FLAG = 1 << 2; - static const size_t RELOCATION_GROUP_HAS_ADDEND_FLAG = 1 << 3; + static const size_t kRelocationGroupedByInfoFlag = 1 << 0; + static const size_t kRelocationGroupedByOffsetDeltaFlag = 1 << 1; + static const size_t kRelocationGroupedByAddendFlag = 1 << 2; + static const size_t kRelocationGroupHasAddendFlag = 1 << 3; const size_t flags_; }; -- 2.11.4.GIT