summaryrefslogtreecommitdiffstats
path: root/googlemock/src
diff options
context:
space:
mode:
authorAbseil Team <absl-team@google.com>2020-07-07 15:51:37 (GMT)
committerGennadiy Rozental <rogeeff@google.com>2020-07-09 17:35:01 (GMT)
commitb9a8afcf2ee1a56f4617e253d95a10a4406f537f (patch)
tree2d9ce0837feeff98c917b78500e8c84d64d52f34 /googlemock/src
parent356f2d264a485db2fcc50ec1c672e0d37b6cb39b (diff)
downloadgoogletest-b9a8afcf2ee1a56f4617e253d95a10a4406f537f.zip
googletest-b9a8afcf2ee1a56f4617e253d95a10a4406f537f.tar.gz
googletest-b9a8afcf2ee1a56f4617e253d95a10a4406f537f.tar.bz2
Googletest export
Fix mismatch between `int` and `int32_t` in the parse function. On some platforms, those are different types. PiperOrigin-RevId: 319991862
Diffstat (limited to 'googlemock/src')
-rw-r--r--googlemock/src/gmock.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/googlemock/src/gmock.cc b/googlemock/src/gmock.cc
index 32b2a73..7bcdb0b 100644
--- a/googlemock/src/gmock.cc
+++ b/googlemock/src/gmock.cc
@@ -124,7 +124,7 @@ static bool ParseGoogleMockStringFlag(const char* str, const char* flag,
}
static bool ParseGoogleMockIntFlag(const char* str, const char* flag,
- int* value) {
+ int32_t* value) {
// Gets the value of the flag as a string.
const char* const value_str = ParseGoogleMockFlagValue(str, flag, true);