summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Varga <pvarga@inf.u-szeged.hu>2018-06-05 09:40:34 +0200
committerPeter Varga <pvarga@inf.u-szeged.hu>2018-06-06 14:32:34 +0000
commitb65ee9e7dc40f9aa71af5a77b5cefc4e9d882e82 (patch)
tree3e5feaabf4ba2f0213eb83c721aa9b4ec76394d1
parentb0a174dcfc0916b26d5a49b40755181468b85cee (diff)
downloadqtwebengine-chromium-b65ee9e7dc40f9aa71af5a77b5cefc4e9d882e82.tar.gz
Workaround for linker error on macOS after 67-based
The linker error is: Undefined symbols for architecture x86_64: "fxcrt::StringViewTemplate<char>::operator=(fxcrt::StringViewTemplate<char> const&)", referenced from: (anonymous namespace)::SplitQualifiedName(fxcrt::StringViewTemplate<char> const&, fxcrt::StringViewTemplate<char>*, fxcrt::StringViewTemplate<char>*) in libfxcrt.a(cxml_element.o) (anonymous namespace)::ReplaceAbbr(CPDF_Object*) in libfpdfapi.a(cpdf_streamconte) CPDF_ToUnicodeMap::Load(CPDF_Stream*) in libfpdfapi.a(cpdf_tounicodema) ld: symbol(s) not found for architecture x86_64 clang: error: linker command failed with exit code 1 (use -v to see invocation) The symbol seems to be dropped by clang, probably because it is unused in bytestring.cpp. As a workaround, instantiate the template where it is used. Change-Id: I45601f28b95f17e6135ebbe3a4582ba93f6f4985 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rw-r--r--chromium/third_party/pdfium/core/fxcrt/xml/cxml_element.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/chromium/third_party/pdfium/core/fxcrt/xml/cxml_element.cpp b/chromium/third_party/pdfium/core/fxcrt/xml/cxml_element.cpp
index 1d42e8eac3a..8abd32d143c 100644
--- a/chromium/third_party/pdfium/core/fxcrt/xml/cxml_element.cpp
+++ b/chromium/third_party/pdfium/core/fxcrt/xml/cxml_element.cpp
@@ -9,6 +9,8 @@
#include "core/fxcrt/xml/cxml_content.h"
#include "core/fxcrt/xml/cxml_parser.h"
+template class fxcrt::StringViewTemplate<char>;
+
namespace {
void SplitQualifiedName(const ByteStringView& bsFullName,