diff options
| -rw-r--r-- | core/fxcrt/fx_memory.cpp | 2 | ||||
| -rw-r--r-- | third_party/base/debug/alias.cc | 2 | ||||
| -rw-r--r-- | third_party/base/debug/alias.h | 8 |
3 files changed, 8 insertions, 4 deletions
diff --git a/core/fxcrt/fx_memory.cpp b/core/fxcrt/fx_memory.cpp index 4c7b36855c..c0ca7a02df 100644 --- a/core/fxcrt/fx_memory.cpp +++ b/core/fxcrt/fx_memory.cpp @@ -49,7 +49,7 @@ NEVER_INLINE void FX_OutOfMemoryTerminate() { // Convince the linker this should not be folded with similar functions using // Identical Code Folding. static int make_this_function_aliased = 0xbd; - base::debug::Alias(&make_this_function_aliased); + pdfium::base::debug::Alias(&make_this_function_aliased); // Termimate cleanly if we can, else crash at a specific address (0xbd). abort(); diff --git a/third_party/base/debug/alias.cc b/third_party/base/debug/alias.cc index 3ab554fe48..6ee2ee9752 100644 --- a/third_party/base/debug/alias.cc +++ b/third_party/base/debug/alias.cc @@ -6,6 +6,7 @@ #include "build/build_config.h" +namespace pdfium { namespace base { namespace debug { @@ -26,3 +27,4 @@ void Alias(const void* var) { } // namespace debug } // namespace base +} // namespace pdfium diff --git a/third_party/base/debug/alias.h b/third_party/base/debug/alias.h index 4d02e7af74..4fac6667b3 100644 --- a/third_party/base/debug/alias.h +++ b/third_party/base/debug/alias.h @@ -2,9 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BASE_DEBUG_ALIAS_H_ -#define BASE_DEBUG_ALIAS_H_ +#ifndef PDFIUM_THIRD_PARTY_BASE_DEBUG_ALIAS_H_ +#define PDFIUM_THIRD_PARTY_BASE_DEBUG_ALIAS_H_ +namespace pdfium { namespace base { namespace debug { @@ -28,5 +29,6 @@ void Alias(const void* var); } // namespace debug } // namespace base +} // namespace pdfium -#endif // BASE_DEBUG_ALIAS_H_ +#endif // PDFIUM_THIRD_PARTY_BASE_DEBUG_ALIAS_H_ |