diff options
Diffstat (limited to 'absl/strings')
| -rw-r--r-- | absl/strings/str_join.h | 10 | ||||
| -rw-r--r-- | absl/strings/str_split_test.cc | 9 |
2 files changed, 8 insertions, 11 deletions
diff --git a/absl/strings/str_join.h b/absl/strings/str_join.h index 82a3cac2dcbb..47337490d0bf 100644 --- a/absl/strings/str_join.h +++ b/absl/strings/str_join.h @@ -208,11 +208,11 @@ DereferenceFormatter() { // // Joins a `std::map`, with each key-value pair separated by an equals // // sign. This pattern would also work with, say, a // // `std::vector<std::pair<>>`. -// std::map<std::string, int> m = { -// std::make_pair("a", 1), -// std::make_pair("b", 2), -// std::make_pair("c", 3)}; -// std::string s = absl::StrJoin(m, ",", strings::PairFormatter("=")); +// std::map<std::string, int> m = { +// std::make_pair("a", 1), +// std::make_pair("b", 2), +// std::make_pair("c", 3)}; +// std::string s = absl::StrJoin(m, ",", absl::PairFormatter("=")); // EXPECT_EQ("a=1,b=2,c=3", s); // // Example 7: diff --git a/absl/strings/str_split_test.cc b/absl/strings/str_split_test.cc index 22a68d0f8339..9c79d7dcd0bf 100644 --- a/absl/strings/str_split_test.cc +++ b/absl/strings/str_split_test.cc @@ -857,12 +857,10 @@ TEST(Delimiter, ByLength) { EXPECT_FALSE(IsFoundAt("abcd", four_char_delim, 0)); } -// Allocates too much memory for TSan and MSan. -#if !defined(THREAD_SANITIZER) && !defined(MEMORY_SANITIZER) TEST(Split, WorksWithLargeStrings) { - if (sizeof(size_t) > 4 && !RunningOnValgrind()) { - std::string s(1ULL << 31, 'x'); - s.push_back('-'); // 2G + 1 byte + if (sizeof(size_t) > 4) { + std::string s((uint32_t{1} << 31) + 1, 'x'); // 2G + 1 byte + s.back() = '-'; std::vector<absl::string_view> v = absl::StrSplit(s, '-'); EXPECT_EQ(2, v.size()); // The first element will contain 2G of 'x's. @@ -873,7 +871,6 @@ TEST(Split, WorksWithLargeStrings) { EXPECT_EQ("", v[1]); } } -#endif // THREAD_SANITIZER TEST(SplitInternalTest, TypeTraits) { EXPECT_FALSE(absl::strings_internal::HasMappedType<int>::value); |