intermediate changes

ref:c67faec740b4d59ed47c6dfdc7076c904650af60

1 files changed, 19 insertions, 19 deletions

diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/internal/elf_mem_image.cc b/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/internal/elf_mem_image.cc
index ba4bbc3855..1df9cca1b6 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/internal/elf_mem_image.cc
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/internal/elf_mem_image.cc
@@ -17,7 +17,7 @@
 
 #include "y_absl/debugging/internal/elf_mem_image.h"
 
-#ifdef ABSL_HAVE_ELF_MEM_IMAGE  // defined in elf_mem_image.h
+#ifdef Y_ABSL_HAVE_ELF_MEM_IMAGE  // defined in elf_mem_image.h
 
 #include <string.h>
 #include <cassert>
@@ -39,7 +39,7 @@
 #define VERSYM_VERSION 0x7fff
 
 namespace y_absl {
-ABSL_NAMESPACE_BEGIN
+Y_ABSL_NAMESPACE_BEGIN
 namespace debugging_internal {
 
 namespace {
@@ -55,11 +55,11 @@ int ElfType(const ElfW(Sym) *symbol) { return ELF64_ST_TYPE(symbol->st_info); }
 #else
 const int kElfClass = -1;
 int ElfBind(const ElfW(Sym) *) {
-  ABSL_RAW_LOG(FATAL, "Unexpected word size");
+  Y_ABSL_RAW_LOG(FATAL, "Unexpected word size");
   return 0;
 }
 int ElfType(const ElfW(Sym) *) {
-  ABSL_RAW_LOG(FATAL, "Unexpected word size");
+  Y_ABSL_RAW_LOG(FATAL, "Unexpected word size");
   return 0;
 }
 #endif
@@ -82,7 +82,7 @@ const T *GetTableElement(const ElfW(Ehdr) * ehdr, ElfW(Off) table_offset,
 const int ElfMemImage::kInvalidBaseSentinel = 0;
 
 ElfMemImage::ElfMemImage(const void *base) {
-  ABSL_RAW_CHECK(base != kInvalidBase, "bad pointer");
+  Y_ABSL_RAW_CHECK(base != kInvalidBase, "bad pointer");
   Init(base);
 }
 
@@ -95,17 +95,17 @@ int ElfMemImage::GetNumSymbols() const {
 }
 
 const ElfW(Sym) *ElfMemImage::GetDynsym(int index) const {
-  ABSL_RAW_CHECK(index < GetNumSymbols(), "index out of range");
+  Y_ABSL_RAW_CHECK(index < GetNumSymbols(), "index out of range");
   return dynsym_ + index;
 }
 
 const ElfW(Versym) *ElfMemImage::GetVersym(int index) const {
-  ABSL_RAW_CHECK(index < GetNumSymbols(), "index out of range");
+  Y_ABSL_RAW_CHECK(index < GetNumSymbols(), "index out of range");
   return versym_ + index;
 }
 
 const ElfW(Phdr) *ElfMemImage::GetPhdr(int index) const {
-  ABSL_RAW_CHECK(index < ehdr_->e_phnum, "index out of range");
+  Y_ABSL_RAW_CHECK(index < ehdr_->e_phnum, "index out of range");
   return GetTableElement<ElfW(Phdr)>(ehdr_,
                                      ehdr_->e_phoff,
                                      ehdr_->e_phentsize,
@@ -113,7 +113,7 @@ const ElfW(Phdr) *ElfMemImage::GetPhdr(int index) const {
 }
 
 const char *ElfMemImage::GetDynstr(ElfW(Word) offset) const {
-  ABSL_RAW_CHECK(offset < strsize_, "offset out of range");
+  Y_ABSL_RAW_CHECK(offset < strsize_, "offset out of range");
   return dynstr_ + offset;
 }
 
@@ -122,12 +122,12 @@ const void *ElfMemImage::GetSymAddr(const ElfW(Sym) *sym) const {
     // Symbol corresponds to "special" (e.g. SHN_ABS) section.
     return reinterpret_cast<const void *>(sym->st_value);
   }
-  ABSL_RAW_CHECK(link_base_ < sym->st_value, "symbol out of range");
+  Y_ABSL_RAW_CHECK(link_base_ < sym->st_value, "symbol out of range");
   return GetTableElement<char>(ehdr_, 0, 1, sym->st_value - link_base_);
 }
 
 const ElfW(Verdef) *ElfMemImage::GetVerdef(int index) const {
-  ABSL_RAW_CHECK(0 <= index && static_cast<size_t>(index) <= verdefnum_,
+  Y_ABSL_RAW_CHECK(0 <= index && static_cast<size_t>(index) <= verdefnum_,
                  "index out of range");
   const ElfW(Verdef) *version_definition = verdef_;
   while (version_definition->vd_ndx < index && version_definition->vd_next) {
@@ -146,7 +146,7 @@ const ElfW(Verdaux) *ElfMemImage::GetVerdefAux(
 }
 
 const char *ElfMemImage::GetVerstr(ElfW(Word) offset) const {
-  ABSL_RAW_CHECK(offset < strsize_, "offset out of range");
+  Y_ABSL_RAW_CHECK(offset < strsize_, "offset out of range");
   return dynstr_ + offset;
 }
 
@@ -176,14 +176,14 @@ void ElfMemImage::Init(const void *base) {
   }
   switch (base_as_char[EI_DATA]) {
     case ELFDATA2LSB: {
-#ifndef ABSL_IS_LITTLE_ENDIAN
+#ifndef Y_ABSL_IS_LITTLE_ENDIAN
       assert(false);
       return;
 #endif
       break;
     }
     case ELFDATA2MSB: {
-#ifndef ABSL_IS_BIG_ENDIAN
+#ifndef Y_ABSL_IS_BIG_ENDIAN
       assert(false);
       return;
 #endif
@@ -338,7 +338,7 @@ ElfMemImage::SymbolIterator ElfMemImage::end() const {
 
 void ElfMemImage::SymbolIterator::Update(int increment) {
   const ElfMemImage *image = reinterpret_cast<const ElfMemImage *>(image_);
-  ABSL_RAW_CHECK(image->IsPresent() || increment == 0, "");
+  Y_ABSL_RAW_CHECK(image->IsPresent() || increment == 0, "");
   if (!image->IsPresent()) {
     return;
   }
@@ -349,7 +349,7 @@ void ElfMemImage::SymbolIterator::Update(int increment) {
   }
   const ElfW(Sym)    *symbol = image->GetDynsym(index_);
   const ElfW(Versym) *version_symbol = image->GetVersym(index_);
-  ABSL_RAW_CHECK(symbol && version_symbol, "");
+  Y_ABSL_RAW_CHECK(symbol && version_symbol, "");
   const char *const symbol_name = image->GetDynstr(symbol->st_name);
   const ElfW(Versym) version_index = version_symbol[0] & VERSYM_VERSION;
   const ElfW(Verdef) *version_definition = nullptr;
@@ -364,7 +364,7 @@ void ElfMemImage::SymbolIterator::Update(int increment) {
   if (version_definition) {
     // I am expecting 1 or 2 auxiliary entries: 1 for the version itself,
     // optional 2nd if the version has a parent.
-    ABSL_RAW_CHECK(
+    Y_ABSL_RAW_CHECK(
         version_definition->vd_cnt == 1 || version_definition->vd_cnt == 2,
         "wrong number of entries");
     const ElfW(Verdaux) *version_aux = image->GetVerdefAux(version_definition);
@@ -377,7 +377,7 @@ void ElfMemImage::SymbolIterator::Update(int increment) {
 }
 
 }  // namespace debugging_internal
-ABSL_NAMESPACE_END
+Y_ABSL_NAMESPACE_END
 }  // namespace y_absl
 
-#endif  // ABSL_HAVE_ELF_MEM_IMAGE
+#endif  // Y_ABSL_HAVE_ELF_MEM_IMAGE