diff options
Diffstat (limited to 'chromium/base/strings/strcat.h')
| -rw-r--r-- | chromium/base/strings/strcat.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/chromium/base/strings/strcat.h b/chromium/base/strings/strcat.h index b7c76215ab2..5d9c38a075c 100644 --- a/chromium/base/strings/strcat.h +++ b/chromium/base/strings/strcat.h @@ -69,10 +69,11 @@ BASE_EXPORT string16 StrCat(span<const string16> pieces) WARN_UNUSED_RESULT; // Initializer list forwards to the array version. inline std::string StrCat(std::initializer_list<StringPiece> pieces) { - return StrCat(make_span(pieces.begin(), pieces.size())); + return StrCat(make_span(pieces)); } + inline string16 StrCat(std::initializer_list<StringPiece16> pieces) { - return StrCat(make_span(pieces.begin(), pieces.size())); + return StrCat(make_span(pieces)); } // StrAppend ------------------------------------------------------------------- @@ -91,13 +92,18 @@ BASE_EXPORT void StrAppend(string16* dest, span<const string16> pieces); // Initializer list forwards to the array version. inline void StrAppend(std::string* dest, std::initializer_list<StringPiece> pieces) { - return StrAppend(dest, make_span(pieces.begin(), pieces.size())); + StrAppend(dest, make_span(pieces)); } + inline void StrAppend(string16* dest, std::initializer_list<StringPiece16> pieces) { - return StrAppend(dest, make_span(pieces.begin(), pieces.size())); + StrAppend(dest, make_span(pieces)); } } // namespace base +#if defined(OS_WIN) +#include "base/strings/strcat_win.h" +#endif + #endif // BASE_STRINGS_STRCAT_H_ |