diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/base/strings/string_piece.h | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/base/strings/string_piece.h')
| -rw-r--r-- | chromium/base/strings/string_piece.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chromium/base/strings/string_piece.h b/chromium/base/strings/string_piece.h index bc24b4d1e90..f60af47177b 100644 --- a/chromium/base/strings/string_piece.h +++ b/chromium/base/strings/string_piece.h @@ -25,11 +25,12 @@ #include <stddef.h> #include <iosfwd> +#include <ostream> #include <string> #include <type_traits> #include "base/base_export.h" -#include "base/logging.h" +#include "base/check_op.h" #include "base/strings/char_traits.h" #include "base/strings/string16.h" #include "base/strings/string_piece_forward.h" @@ -148,6 +149,7 @@ template <typename STRING_TYPE> class BasicStringPiece { public: // Standard STL container boilerplate. typedef size_t size_type; + typedef typename STRING_TYPE::traits_type traits_type; typedef typename STRING_TYPE::value_type value_type; typedef const value_type* pointer; typedef const value_type& reference; @@ -162,7 +164,7 @@ template <typename STRING_TYPE> class BasicStringPiece { // We provide non-explicit singleton constructors so users can pass // in a "const char*" or a "string" wherever a "StringPiece" is // expected (likewise for char16, string16, StringPiece16). - constexpr BasicStringPiece() : ptr_(NULL), length_(0) {} + constexpr BasicStringPiece() : ptr_(nullptr), length_(0) {} // TODO(crbug.com/1049498): Construction from nullptr is not allowed for // std::basic_string_view, so remove the special handling for it. // Note: This doesn't just use STRING_TYPE::traits_type::length(), since that |