From 6c7de165d1c82684359ccb630bb5f83263fa5ebc Mon Sep 17 00:00:00 2001 From: Abseil Team Date: Wed, 20 Jun 2018 06:25:23 -0700 Subject: Project import generated by Copybara. GitOrigin-RevId: d89dba27e35462d7457121b978fd79214205e686 Change-Id: I0eae80578a93a580820bc90d42e6b42faf7fde0a --- absl/debugging/failure_signal_handler.cc | 2 ++ absl/debugging/failure_signal_handler.h | 2 ++ absl/debugging/internal/address_is_readable.cc | 4 ++++ absl/debugging/internal/address_is_readable.h | 2 ++ absl/debugging/internal/demangle.cc | 2 ++ absl/debugging/internal/demangle.h | 2 ++ absl/debugging/internal/demangle_test.cc | 2 ++ absl/debugging/internal/elf_mem_image.cc | 2 ++ absl/debugging/internal/elf_mem_image.h | 2 ++ absl/debugging/internal/examine_stack.cc | 2 ++ absl/debugging/internal/examine_stack.h | 2 ++ absl/debugging/internal/stack_consumption.cc | 2 ++ absl/debugging/internal/stack_consumption.h | 2 ++ absl/debugging/internal/stack_consumption_test.cc | 2 ++ absl/debugging/internal/stacktrace_aarch64-inl.inc | 2 ++ absl/debugging/internal/stacktrace_arm-inl.inc | 2 ++ absl/debugging/internal/stacktrace_generic-inl.inc | 2 ++ absl/debugging/internal/stacktrace_powerpc-inl.inc | 2 ++ absl/debugging/internal/stacktrace_unimplemented-inl.inc | 2 ++ absl/debugging/internal/stacktrace_win32-inl.inc | 2 ++ absl/debugging/internal/stacktrace_x86-inl.inc | 2 ++ absl/debugging/internal/symbolize.h | 4 ++++ absl/debugging/internal/vdso_support.cc | 2 ++ absl/debugging/internal/vdso_support.h | 2 ++ absl/debugging/leak_check.cc | 4 ++++ absl/debugging/leak_check.h | 2 ++ absl/debugging/stacktrace.cc | 2 ++ absl/debugging/stacktrace.h | 2 ++ absl/debugging/symbolize.h | 2 ++ absl/debugging/symbolize_elf.inc | 2 ++ absl/debugging/symbolize_unimplemented.inc | 2 ++ absl/debugging/symbolize_win32.inc | 2 ++ 32 files changed, 70 insertions(+) (limited to 'absl/debugging') diff --git a/absl/debugging/failure_signal_handler.cc b/absl/debugging/failure_signal_handler.cc index 4c131fe0..b2035148 100644 --- a/absl/debugging/failure_signal_handler.cc +++ b/absl/debugging/failure_signal_handler.cc @@ -47,6 +47,7 @@ #endif namespace absl { +inline namespace lts_2018_06_20 { ABSL_CONST_INIT static FailureSignalHandlerOptions fsh_options; @@ -353,4 +354,5 @@ void InstallFailureSignalHandler(const FailureSignalHandlerOptions& options) { } } +} // inline namespace lts_2018_06_20 } // namespace absl diff --git a/absl/debugging/failure_signal_handler.h b/absl/debugging/failure_signal_handler.h index c57954e5..fb4de102 100644 --- a/absl/debugging/failure_signal_handler.h +++ b/absl/debugging/failure_signal_handler.h @@ -45,6 +45,7 @@ #define ABSL_DEBUGGING_FAILURE_SIGNAL_HANDLER_H_ namespace absl { +inline namespace lts_2018_06_20 { // FailureSignalHandlerOptions // @@ -112,6 +113,7 @@ namespace debugging_internal { const char* FailureSignalToString(int signo); } // namespace debugging_internal +} // inline namespace lts_2018_06_20 } // namespace absl #endif // ABSL_DEBUGGING_FAILURE_SIGNAL_HANDLER_H_ diff --git a/absl/debugging/internal/address_is_readable.cc b/absl/debugging/internal/address_is_readable.cc index 7455aa0b..6282bd6a 100644 --- a/absl/debugging/internal/address_is_readable.cc +++ b/absl/debugging/internal/address_is_readable.cc @@ -20,12 +20,14 @@ #if !defined(__linux__) || defined(__ANDROID__) namespace absl { +inline namespace lts_2018_06_20 { namespace debugging_internal { // On platforms other than Linux, just return true. bool AddressIsReadable(const void* /* addr */) { return true; } } // namespace debugging_internal +} // inline namespace lts_2018_06_20 } // namespace absl #else @@ -40,6 +42,7 @@ bool AddressIsReadable(const void* /* addr */) { return true; } #include "absl/base/internal/raw_logging.h" namespace absl { +inline namespace lts_2018_06_20 { namespace debugging_internal { // Pack a pid and two file descriptors into a 64-bit word, @@ -128,6 +131,7 @@ bool AddressIsReadable(const void *addr) { } } // namespace debugging_internal +} // inline namespace lts_2018_06_20 } // namespace absl #endif diff --git a/absl/debugging/internal/address_is_readable.h b/absl/debugging/internal/address_is_readable.h index 9d480300..7e58ce55 100644 --- a/absl/debugging/internal/address_is_readable.h +++ b/absl/debugging/internal/address_is_readable.h @@ -17,6 +17,7 @@ #define ABSL_DEBUGGING_INTERNAL_ADDRESS_IS_READABLE_H_ namespace absl { +inline namespace lts_2018_06_20 { namespace debugging_internal { // Return whether the byte at *addr is readable, without faulting. @@ -24,6 +25,7 @@ namespace debugging_internal { bool AddressIsReadable(const void *addr); } // namespace debugging_internal +} // inline namespace lts_2018_06_20 } // namespace absl #endif // ABSL_DEBUGGING_INTERNAL_ADDRESS_IS_READABLE_H_ diff --git a/absl/debugging/internal/demangle.cc b/absl/debugging/internal/demangle.cc index c9ca2f3b..15b7c7c3 100644 --- a/absl/debugging/internal/demangle.cc +++ b/absl/debugging/internal/demangle.cc @@ -24,6 +24,7 @@ #include namespace absl { +inline namespace lts_2018_06_20 { namespace debugging_internal { typedef struct { @@ -1859,4 +1860,5 @@ bool Demangle(const char *mangled, char *out, int out_size) { } } // namespace debugging_internal +} // inline namespace lts_2018_06_20 } // namespace absl diff --git a/absl/debugging/internal/demangle.h b/absl/debugging/internal/demangle.h index 2e75564e..7faa5a2f 100644 --- a/absl/debugging/internal/demangle.h +++ b/absl/debugging/internal/demangle.h @@ -54,6 +54,7 @@ #define ABSL_DEBUGGING_INTERNAL_DEMANGLE_H_ namespace absl { +inline namespace lts_2018_06_20 { namespace debugging_internal { // Demangle `mangled`. On success, return true and write the @@ -62,6 +63,7 @@ namespace debugging_internal { bool Demangle(const char *mangled, char *out, int out_size); } // namespace debugging_internal +} // inline namespace lts_2018_06_20 } // namespace absl #endif // ABSL_DEBUGGING_INTERNAL_DEMANGLE_H_ diff --git a/absl/debugging/internal/demangle_test.cc b/absl/debugging/internal/demangle_test.cc index b9d9008f..5ff64a37 100644 --- a/absl/debugging/internal/demangle_test.cc +++ b/absl/debugging/internal/demangle_test.cc @@ -23,6 +23,7 @@ #include "absl/memory/memory.h" namespace absl { +inline namespace lts_2018_06_20 { namespace debugging_internal { namespace { @@ -188,4 +189,5 @@ TEST(DemangleRegression, DeeplyNestedArrayType) { } // namespace } // namespace debugging_internal +} // inline namespace lts_2018_06_20 } // namespace absl diff --git a/absl/debugging/internal/elf_mem_image.cc b/absl/debugging/internal/elf_mem_image.cc index 3f747e7f..a2bea919 100644 --- a/absl/debugging/internal/elf_mem_image.cc +++ b/absl/debugging/internal/elf_mem_image.cc @@ -38,6 +38,7 @@ #define VERSYM_VERSION 0x7fff namespace absl { +inline namespace lts_2018_06_20 { namespace debugging_internal { namespace { @@ -375,6 +376,7 @@ void ElfMemImage::SymbolIterator::Update(int increment) { } } // namespace debugging_internal +} // inline namespace lts_2018_06_20 } // namespace absl #endif // ABSL_HAVE_ELF_MEM_IMAGE diff --git a/absl/debugging/internal/elf_mem_image.h b/absl/debugging/internal/elf_mem_image.h index 3b577268..ea4f5f0c 100644 --- a/absl/debugging/internal/elf_mem_image.h +++ b/absl/debugging/internal/elf_mem_image.h @@ -39,6 +39,7 @@ #include // for ElfW namespace absl { +inline namespace lts_2018_06_20 { namespace debugging_internal { // An in-memory ELF image (may not exist on disk). @@ -123,6 +124,7 @@ class ElfMemImage { }; } // namespace debugging_internal +} // inline namespace lts_2018_06_20 } // namespace absl #endif // ABSL_HAVE_ELF_MEM_IMAGE diff --git a/absl/debugging/internal/examine_stack.cc b/absl/debugging/internal/examine_stack.cc index 8434709f..1a2b7a42 100644 --- a/absl/debugging/internal/examine_stack.cc +++ b/absl/debugging/internal/examine_stack.cc @@ -30,6 +30,7 @@ #include "absl/debugging/symbolize.h" namespace absl { +inline namespace lts_2018_06_20 { namespace debugging_internal { // Returns the program counter from signal context, nullptr if @@ -146,4 +147,5 @@ void DumpPCAndFrameSizesAndStackTrace( } } // namespace debugging_internal +} // inline namespace lts_2018_06_20 } // namespace absl diff --git a/absl/debugging/internal/examine_stack.h b/absl/debugging/internal/examine_stack.h index a16c03b2..a51a8b35 100644 --- a/absl/debugging/internal/examine_stack.h +++ b/absl/debugging/internal/examine_stack.h @@ -18,6 +18,7 @@ #define ABSL_DEBUGGING_INTERNAL_EXAMINE_STACK_H_ namespace absl { +inline namespace lts_2018_06_20 { namespace debugging_internal { // Returns the program counter from signal context, or nullptr if @@ -33,6 +34,7 @@ void DumpPCAndFrameSizesAndStackTrace( void (*writerfn)(const char*, void*), void* writerfn_arg); } // namespace debugging_internal +} // inline namespace lts_2018_06_20 } // namespace absl #endif // ABSL_DEBUGGING_INTERNAL_EXAMINE_STACK_H_ diff --git a/absl/debugging/internal/stack_consumption.cc b/absl/debugging/internal/stack_consumption.cc index 2b3b972e..8724007d 100644 --- a/absl/debugging/internal/stack_consumption.cc +++ b/absl/debugging/internal/stack_consumption.cc @@ -27,6 +27,7 @@ #include "absl/base/internal/raw_logging.h" namespace absl { +inline namespace lts_2018_06_20 { namespace debugging_internal { namespace { @@ -167,6 +168,7 @@ int GetSignalHandlerStackConsumption(void (*signal_handler)(int)) { } } // namespace debugging_internal +} // inline namespace lts_2018_06_20 } // namespace absl #endif // ABSL_INTERNAL_HAVE_DEBUGGING_STACK_CONSUMPTION diff --git a/absl/debugging/internal/stack_consumption.h b/absl/debugging/internal/stack_consumption.h index 4c5fa0f0..584a4aa9 100644 --- a/absl/debugging/internal/stack_consumption.h +++ b/absl/debugging/internal/stack_consumption.h @@ -27,6 +27,7 @@ #define ABSL_INTERNAL_HAVE_DEBUGGING_STACK_CONSUMPTION 1 namespace absl { +inline namespace lts_2018_06_20 { namespace debugging_internal { // Returns the stack consumption in bytes for the code exercised by @@ -38,6 +39,7 @@ namespace debugging_internal { int GetSignalHandlerStackConsumption(void (*signal_handler)(int)); } // namespace debugging_internal +} // inline namespace lts_2018_06_20 } // namespace absl #endif // ABSL_INTERNAL_HAVE_DEBUGGING_STACK_CONSUMPTION diff --git a/absl/debugging/internal/stack_consumption_test.cc b/absl/debugging/internal/stack_consumption_test.cc index 5ce3846e..4f1351b3 100644 --- a/absl/debugging/internal/stack_consumption_test.cc +++ b/absl/debugging/internal/stack_consumption_test.cc @@ -23,6 +23,7 @@ #include "absl/base/internal/raw_logging.h" namespace absl { +inline namespace lts_2018_06_20 { namespace debugging_internal { namespace { @@ -43,6 +44,7 @@ TEST(SignalHandlerStackConsumptionTest, MeasuresStackConsumption) { } // namespace } // namespace debugging_internal +} // inline namespace lts_2018_06_20 } // namespace absl #endif // ABSL_INTERNAL_HAVE_DEBUGGING_STACK_CONSUMPTION diff --git a/absl/debugging/internal/stacktrace_aarch64-inl.inc b/absl/debugging/internal/stacktrace_aarch64-inl.inc index 7ed6b3eb..0e3fda57 100644 --- a/absl/debugging/internal/stacktrace_aarch64-inl.inc +++ b/absl/debugging/internal/stacktrace_aarch64-inl.inc @@ -180,11 +180,13 @@ static int UnwindImpl(void** result, int* sizes, int max_depth, int skip_count, } namespace absl { +inline namespace lts_2018_06_20 { namespace debugging_internal { bool StackTraceWorksForTest() { return true; } } // namespace debugging_internal +} // inline namespace lts_2018_06_20 } // namespace absl #endif // ABSL_DEBUGGING_INTERNAL_STACKTRACE_AARCH64_INL_H_ diff --git a/absl/debugging/internal/stacktrace_arm-inl.inc b/absl/debugging/internal/stacktrace_arm-inl.inc index c8408337..ef76782c 100644 --- a/absl/debugging/internal/stacktrace_arm-inl.inc +++ b/absl/debugging/internal/stacktrace_arm-inl.inc @@ -113,11 +113,13 @@ static int UnwindImpl(void** result, int* sizes, int max_depth, int skip_count, } namespace absl { +inline namespace lts_2018_06_20 { namespace debugging_internal { bool StackTraceWorksForTest() { return false; } } // namespace debugging_internal +} // inline namespace lts_2018_06_20 } // namespace absl #endif // ABSL_DEBUGGING_INTERNAL_STACKTRACE_ARM_INL_H_ diff --git a/absl/debugging/internal/stacktrace_generic-inl.inc b/absl/debugging/internal/stacktrace_generic-inl.inc index 2c9ca410..5d7492a4 100644 --- a/absl/debugging/internal/stacktrace_generic-inl.inc +++ b/absl/debugging/internal/stacktrace_generic-inl.inc @@ -49,11 +49,13 @@ static int UnwindImpl(void** result, int* sizes, int max_depth, int skip_count, } namespace absl { +inline namespace lts_2018_06_20 { namespace debugging_internal { bool StackTraceWorksForTest() { return true; } } // namespace debugging_internal +} // inline namespace lts_2018_06_20 } // namespace absl #endif // ABSL_DEBUGGING_INTERNAL_STACKTRACE_GENERIC_INL_H_ diff --git a/absl/debugging/internal/stacktrace_powerpc-inl.inc b/absl/debugging/internal/stacktrace_powerpc-inl.inc index 297bdadf..86ac8534 100644 --- a/absl/debugging/internal/stacktrace_powerpc-inl.inc +++ b/absl/debugging/internal/stacktrace_powerpc-inl.inc @@ -233,11 +233,13 @@ static int UnwindImpl(void** result, int* sizes, int max_depth, int skip_count, } namespace absl { +inline namespace lts_2018_06_20 { namespace debugging_internal { bool StackTraceWorksForTest() { return true; } } // namespace debugging_internal +} // inline namespace lts_2018_06_20 } // namespace absl #endif // ABSL_DEBUGGING_INTERNAL_STACKTRACE_POWERPC_INL_H_ diff --git a/absl/debugging/internal/stacktrace_unimplemented-inl.inc b/absl/debugging/internal/stacktrace_unimplemented-inl.inc index e256fdd4..8c3ed4d7 100644 --- a/absl/debugging/internal/stacktrace_unimplemented-inl.inc +++ b/absl/debugging/internal/stacktrace_unimplemented-inl.inc @@ -12,11 +12,13 @@ static int UnwindImpl(void** /* result */, int* /* sizes */, } namespace absl { +inline namespace lts_2018_06_20 { namespace debugging_internal { bool StackTraceWorksForTest() { return false; } } // namespace debugging_internal +} // inline namespace lts_2018_06_20 } // namespace absl #endif // ABSL_DEBUGGING_INTERNAL_STACKTRACE_UNIMPLEMENTED_INL_H_ diff --git a/absl/debugging/internal/stacktrace_win32-inl.inc b/absl/debugging/internal/stacktrace_win32-inl.inc index a8f8a56a..ceca299d 100644 --- a/absl/debugging/internal/stacktrace_win32-inl.inc +++ b/absl/debugging/internal/stacktrace_win32-inl.inc @@ -73,11 +73,13 @@ static int UnwindImpl(void** result, int* sizes, int max_depth, int skip_count, } namespace absl { +inline namespace lts_2018_06_20 { namespace debugging_internal { bool StackTraceWorksForTest() { return false; } } // namespace debugging_internal +} // inline namespace lts_2018_06_20 } // namespace absl #endif // ABSL_DEBUGGING_INTERNAL_STACKTRACE_WIN32_INL_H_ diff --git a/absl/debugging/internal/stacktrace_x86-inl.inc b/absl/debugging/internal/stacktrace_x86-inl.inc index ac85b920..13afce7b 100644 --- a/absl/debugging/internal/stacktrace_x86-inl.inc +++ b/absl/debugging/internal/stacktrace_x86-inl.inc @@ -327,11 +327,13 @@ static int UnwindImpl(void **result, int *sizes, int max_depth, int skip_count, } namespace absl { +inline namespace lts_2018_06_20 { namespace debugging_internal { bool StackTraceWorksForTest() { return true; } } // namespace debugging_internal +} // inline namespace lts_2018_06_20 } // namespace absl #endif // ABSL_DEBUGGING_INTERNAL_STACKTRACE_X86_INL_INC_ diff --git a/absl/debugging/internal/symbolize.h b/absl/debugging/internal/symbolize.h index 8d926fec..fd10a637 100644 --- a/absl/debugging/internal/symbolize.h +++ b/absl/debugging/internal/symbolize.h @@ -34,6 +34,7 @@ #include namespace absl { +inline namespace lts_2018_06_20 { namespace debugging_internal { // Iterates over all sections, invoking callback on each with the section name @@ -52,11 +53,13 @@ bool GetSectionHeaderByName(int fd, const char *name, size_t name_len, ElfW(Shdr) *out); } // namespace debugging_internal +} // inline namespace lts_2018_06_20 } // namespace absl #endif // ABSL_INTERNAL_HAVE_ELF_SYMBOLIZE namespace absl { +inline namespace lts_2018_06_20 { namespace debugging_internal { struct SymbolDecoratorArgs { @@ -118,6 +121,7 @@ bool GetFileMappingHint(const void** start, const char** filename); } // namespace debugging_internal +} // inline namespace lts_2018_06_20 } // namespace absl #endif // ABSL_DEBUGGING_INTERNAL_SYMBOLIZE_H_ diff --git a/absl/debugging/internal/vdso_support.cc b/absl/debugging/internal/vdso_support.cc index 44ec7c02..fd1fb05e 100644 --- a/absl/debugging/internal/vdso_support.cc +++ b/absl/debugging/internal/vdso_support.cc @@ -38,6 +38,7 @@ #endif namespace absl { +inline namespace lts_2018_06_20 { namespace debugging_internal { ABSL_CONST_INIT @@ -187,6 +188,7 @@ static class VDSOInitHelper { } vdso_init_helper; } // namespace debugging_internal +} // inline namespace lts_2018_06_20 } // namespace absl #endif // ABSL_HAVE_VDSO_SUPPORT diff --git a/absl/debugging/internal/vdso_support.h b/absl/debugging/internal/vdso_support.h index 8002c740..7fdd7527 100644 --- a/absl/debugging/internal/vdso_support.h +++ b/absl/debugging/internal/vdso_support.h @@ -53,6 +53,7 @@ #endif namespace absl { +inline namespace lts_2018_06_20 { namespace debugging_internal { // NOTE: this class may be used from within tcmalloc, and can not @@ -149,6 +150,7 @@ class VDSOSupport { int GetCPU(); } // namespace debugging_internal +} // inline namespace lts_2018_06_20 } // namespace absl #endif // ABSL_HAVE_ELF_MEM_IMAGE diff --git a/absl/debugging/leak_check.cc b/absl/debugging/leak_check.cc index e01e5f8c..7eaaf495 100644 --- a/absl/debugging/leak_check.cc +++ b/absl/debugging/leak_check.cc @@ -20,12 +20,14 @@ #ifndef LEAK_SANITIZER namespace absl { +inline namespace lts_2018_06_20 { bool HaveLeakSanitizer() { return false; } void DoIgnoreLeak(const void*) { } void RegisterLivePointers(const void*, size_t) { } void UnRegisterLivePointers(const void*, size_t) { } LeakCheckDisabler::LeakCheckDisabler() { } LeakCheckDisabler::~LeakCheckDisabler() { } +} // inline namespace lts_2018_06_20 } // namespace absl #else @@ -33,6 +35,7 @@ LeakCheckDisabler::~LeakCheckDisabler() { } #include namespace absl { +inline namespace lts_2018_06_20 { bool HaveLeakSanitizer() { return true; } void DoIgnoreLeak(const void* ptr) { __lsan_ignore_object(ptr); } void RegisterLivePointers(const void* ptr, size_t size) { @@ -43,6 +46,7 @@ void UnRegisterLivePointers(const void* ptr, size_t size) { } LeakCheckDisabler::LeakCheckDisabler() { __lsan_disable(); } LeakCheckDisabler::~LeakCheckDisabler() { __lsan_enable(); } +} // inline namespace lts_2018_06_20 } // namespace absl #endif // LEAK_SANITIZER diff --git a/absl/debugging/leak_check.h b/absl/debugging/leak_check.h index c930684e..ddded2ae 100644 --- a/absl/debugging/leak_check.h +++ b/absl/debugging/leak_check.h @@ -33,6 +33,7 @@ #include namespace absl { +inline namespace lts_2018_06_20 { // HaveLeakSanitizer() // @@ -104,6 +105,7 @@ void RegisterLivePointers(const void* ptr, size_t size); // `RegisterLivePointers()`, enabling leak checking of those pointers. void UnRegisterLivePointers(const void* ptr, size_t size); +} // inline namespace lts_2018_06_20 } // namespace absl #endif // ABSL_DEBUGGING_LEAK_CHECK_H_ diff --git a/absl/debugging/stacktrace.cc b/absl/debugging/stacktrace.cc index 61fee619..55edad83 100644 --- a/absl/debugging/stacktrace.cc +++ b/absl/debugging/stacktrace.cc @@ -56,6 +56,7 @@ #endif namespace absl { +inline namespace lts_2018_06_20 { namespace { typedef int (*Unwinder)(void**, int*, int, int, const void*, int*); @@ -130,4 +131,5 @@ int DefaultStackUnwinder(void** pcs, int* sizes, int depth, int skip, return n; } +} // inline namespace lts_2018_06_20 } // namespace absl diff --git a/absl/debugging/stacktrace.h b/absl/debugging/stacktrace.h index 8b831e26..a6213cf4 100644 --- a/absl/debugging/stacktrace.h +++ b/absl/debugging/stacktrace.h @@ -32,6 +32,7 @@ #define ABSL_DEBUGGING_STACKTRACE_H_ namespace absl { +inline namespace lts_2018_06_20 { // GetStackFrames() // @@ -220,6 +221,7 @@ namespace debugging_internal { // working. extern bool StackTraceWorksForTest(); } // namespace debugging_internal +} // inline namespace lts_2018_06_20 } // namespace absl #endif // ABSL_DEBUGGING_STACKTRACE_H_ diff --git a/absl/debugging/symbolize.h b/absl/debugging/symbolize.h index 24e6e647..6198b1fd 100644 --- a/absl/debugging/symbolize.h +++ b/absl/debugging/symbolize.h @@ -55,6 +55,7 @@ #include "absl/debugging/internal/symbolize.h" namespace absl { +inline namespace lts_2018_06_20 { // InitializeSymbolizer() // @@ -92,6 +93,7 @@ void InitializeSymbolizer(const char* argv0); // } bool Symbolize(const void *pc, char *out, int out_size); +} // inline namespace lts_2018_06_20 } // namespace absl #endif // ABSL_DEBUGGING_SYMBOLIZE_H_ diff --git a/absl/debugging/symbolize_elf.inc b/absl/debugging/symbolize_elf.inc index e21439ce..b8dc23b7 100644 --- a/absl/debugging/symbolize_elf.inc +++ b/absl/debugging/symbolize_elf.inc @@ -76,6 +76,7 @@ #include "absl/debugging/internal/vdso_support.h" namespace absl { +inline namespace lts_2018_06_20 { // Value of argv[0]. Used by MaybeInitializeObjFile(). static char *argv0_value = nullptr; @@ -1470,4 +1471,5 @@ bool Symbolize(const void *pc, char *out, int out_size) { return ok; } +} // inline namespace lts_2018_06_20 } // namespace absl diff --git a/absl/debugging/symbolize_unimplemented.inc b/absl/debugging/symbolize_unimplemented.inc index 2a3f4acb..26dec0fb 100644 --- a/absl/debugging/symbolize_unimplemented.inc +++ b/absl/debugging/symbolize_unimplemented.inc @@ -17,6 +17,7 @@ #include "absl/base/internal/raw_logging.h" namespace absl { +inline namespace lts_2018_06_20 { namespace debugging_internal { @@ -32,4 +33,5 @@ bool RegisterFileMappingHint(const void *, const void *, uint64_t, const char *) void InitializeSymbolizer(const char*) {} bool Symbolize(const void *, char *, int) { return false; } +} // inline namespace lts_2018_06_20 } // namespace absl diff --git a/absl/debugging/symbolize_win32.inc b/absl/debugging/symbolize_win32.inc index e3fff74d..549b995a 100644 --- a/absl/debugging/symbolize_win32.inc +++ b/absl/debugging/symbolize_win32.inc @@ -25,6 +25,7 @@ #include "absl/base/internal/raw_logging.h" namespace absl { +inline namespace lts_2018_06_20 { static HANDLE process = NULL; @@ -71,4 +72,5 @@ bool Symbolize(const void *pc, char *out, int out_size) { return true; } +} // inline namespace lts_2018_06_20 } // namespace absl -- cgit v1.2.3