diff options
| author | Gennadiy Civil <misterg@google.com> | 2019-04-18 09:44:23 -0400 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2019-04-18 09:44:24 -0400 |
| commit | a0d60bed4d0ea17c7130cda16776b9bc8a929d7b (patch) | |
| tree | b04bb7a474c3b1b61e23896402b4510307657812 /googletest/include | |
| parent | 9f893b99598b1f0725dc8b92037f0d9f53095b90 (diff) | |
| parent | 3829b84e9927a2a77a7634a8e7b010cc57095e1b (diff) | |
| download | googletest-a0d60bed4d0ea17c7130cda16776b9bc8a929d7b.tar.gz googletest-a0d60bed4d0ea17c7130cda16776b9bc8a929d7b.zip | |
Merge pull request #2170 from ngie-eign:issue-2146-ver2
PiperOrigin-RevId: 244069956
Diffstat (limited to 'googletest/include')
| -rw-r--r-- | googletest/include/gtest/internal/gtest-internal.h | 2 | ||||
| -rw-r--r-- | googletest/include/gtest/internal/gtest-string.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/googletest/include/gtest/internal/gtest-internal.h b/googletest/include/gtest/internal/gtest-internal.h index d16586c3..49887170 100644 --- a/googletest/include/gtest/internal/gtest-internal.h +++ b/googletest/include/gtest/internal/gtest-internal.h @@ -700,7 +700,7 @@ class TypeParameterizedTest { // list. MakeAndRegisterTestInfo( (std::string(prefix) + (prefix[0] == '\0' ? "" : "/") + case_name + - "/" + type_names[index]) + "/" + type_names[static_cast<size_t>(index)]) .c_str(), StripTrailingSpaces(GetPrefixUntilComma(test_names)).c_str(), GetTypeName<Type>().c_str(), diff --git a/googletest/include/gtest/internal/gtest-string.h b/googletest/include/gtest/internal/gtest-string.h index 4c9b6262..884b1e16 100644 --- a/googletest/include/gtest/internal/gtest-string.h +++ b/googletest/include/gtest/internal/gtest-string.h @@ -150,6 +150,9 @@ class GTEST_API_ String { // Formats an int value as "%X". static std::string FormatHexInt(int value); + // Formats an int value as "%X". + static std::string FormatHexUInt32(UInt32 value); + // Formats a byte as "%02X". static std::string FormatByte(unsigned char value); |
