diff options
| author | Peter Varga <pvarga@inf.u-szeged.hu> | 2019-01-02 12:59:38 +0100 |
|---|---|---|
| committer | Peter Varga <pvarga@inf.u-szeged.hu> | 2019-01-10 10:07:52 +0000 |
| commit | 9aa80f767bcf0792f449f3e9fca81970384ce8a0 (patch) | |
| tree | f1a5ad6e9575467d3b78dbb91fdebff2624fe0ff | |
| parent | b3a4dd9ee40b959f56165d02fb87084712005c1d (diff) | |
| download | qtwebengine-chromium-9aa80f767bcf0792f449f3e9fca81970384ce8a0.tar.gz | |
Fix jumbo build with GCC
Always inline BasicStringPiece constructor to avoid linker errors with
GCC 8.2.
Task-number: QTBUG-71689
Change-Id: Ib573b035c19fa1e359935e83277ec9e174998bf8
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | chromium/base/strings/string_piece.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/chromium/base/strings/string_piece.h b/chromium/base/strings/string_piece.h index 775ea7cf001..e451412135c 100644 --- a/chromium/base/strings/string_piece.h +++ b/chromium/base/strings/string_piece.h @@ -181,7 +181,11 @@ template <typename STRING_TYPE> class BasicStringPiece { // std::basic_string_view, so remove the special handling for it. // Note: This doesn't just use STRING_TYPE::traits_type::length(), since that // isn't constexpr until C++17. +#if defined(COMPILER_GCC) + constexpr BasicStringPiece(const value_type* str) __attribute__((always_inline)) +#else constexpr BasicStringPiece(const value_type* str) +#endif : ptr_(str), length_(!str ? 0 : CharTraits<value_type>::length(str)) {} BasicStringPiece(const STRING_TYPE& str) : ptr_(str.data()), length_(str.size()) {} |