diff options
| author | Lei Zhang <thestig@chromium.org> | 2018-07-10 01:30:44 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-07-10 01:30:44 +0000 |
| commit | c9297e896c697b5bb9c3b9e66791a834f5552170 (patch) | |
| tree | 07cbc8ee88c68f015a17cebd979ef4952088cb7f /third_party | |
| parent | 43f6bc80a29fdf326729903e9f323850e9553c69 (diff) | |
| download | pdfium-c9297e896c697b5bb9c3b9e66791a834f5552170.tar.xz | |
Fix duplicate symbols in Chromium builds.
Commit 43f6bc80 copied over Chromium's base/debug/alias.cc, but that
confuses Windows builds and Linux jumbo builds in Chromium.
To fix this, wrap PDFium's copy in the pdfium namespace.
BUG=chromium:860850
TBR=dsinclair@chromium.org
Change-Id: I1ceec28b9ce6c2893bf030a5b6564dce6d6ec376
Reviewed-on: https://pdfium-review.googlesource.com/37430
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/base/debug/alias.cc | 2 | ||||
| -rw-r--r-- | third_party/base/debug/alias.h | 8 |
2 files changed, 7 insertions, 3 deletions
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_ |