diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2018-06-07 17:26:44 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-06-19 11:06:26 +0000 |
| commit | 14db5a401f68c13bb6efe934221de095854ada01 (patch) | |
| tree | 6e29f868cb04d34a9d4dab61be733fa7ee0b2d00 | |
| parent | c9a6c8f3626d0c7650d92aecf40891295072e3a0 (diff) | |
| download | qtwebengine-chromium-14db5a401f68c13bb6efe934221de095854ada01.tar.gz | |
Drop constexpr from constructors in pdfium StringView
Otherwise ends with linker errros (gcc 6.4)
Change-Id: I168c0e68c5d586d90efcc18705d776c11f0e7f0e
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | chromium/third_party/pdfium/core/fxcrt/string_view_template.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chromium/third_party/pdfium/core/fxcrt/string_view_template.h b/chromium/third_party/pdfium/core/fxcrt/string_view_template.h index 05694cf244d..b25f9ee6f8c 100644 --- a/chromium/third_party/pdfium/core/fxcrt/string_view_template.h +++ b/chromium/third_party/pdfium/core/fxcrt/string_view_template.h @@ -42,7 +42,7 @@ class StringViewTemplate { : m_Span(reinterpret_cast<const UnsignedType*>(ptr), ptr ? FXSYS_len(ptr) : 0) {} - constexpr StringViewTemplate(const CharType* ptr, size_t len) noexcept + StringViewTemplate(const CharType* ptr, size_t len) noexcept : m_Span(reinterpret_cast<const UnsignedType*>(ptr), len) {} explicit constexpr StringViewTemplate( @@ -68,7 +68,7 @@ class StringViewTemplate { // Deliberately implicit to avoid calling on every string literal. // |ch| must be an lvalue that outlives the StringViewTemplate. // NOLINTNEXTLINE(runtime/explicit) - constexpr StringViewTemplate(CharType& ch) noexcept + StringViewTemplate(CharType& ch) noexcept : m_Span(reinterpret_cast<const UnsignedType*>(&ch), 1) {} // Any changes to |vec| invalidate the string. |