diff options
| author | Bernhard Bauer <sheepmaster@gmail.com> | 2018-03-12 18:15:35 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-12 18:15:35 +0000 |
| commit | fc437ef4b2c0a0302a6b0771c334ca51dc1ccf7d (patch) | |
| tree | 0718a372bf66172bf4d3415eca6eb5d1f96b41fa /googlemock/src/gmock.cc | |
| parent | 7b70413e0ca57b3e48d7655f342122f159f52b31 (diff) | |
| parent | abc6e943e0878af67b91fa8a646edf717195c80c (diff) | |
| download | googletest-fc437ef4b2c0a0302a6b0771c334ca51dc1ccf7d.tar.gz googletest-fc437ef4b2c0a0302a6b0771c334ca51dc1ccf7d.tar.bz2 googletest-fc437ef4b2c0a0302a6b0771c334ca51dc1ccf7d.zip | |
Merge branch 'master' into upstream_188748737
Diffstat (limited to 'googlemock/src/gmock.cc')
| -rw-r--r-- | googlemock/src/gmock.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/googlemock/src/gmock.cc b/googlemock/src/gmock.cc index 3c370510..2308168b 100644 --- a/googlemock/src/gmock.cc +++ b/googlemock/src/gmock.cc @@ -136,8 +136,8 @@ static bool ParseGoogleMockIntFlag(const char* str, const char* flag, if (value_str == NULL) return false; // Sets *value to the value of the flag. - *value = atoi(value_str); - return true; + return ParseInt32(Message() << "The value of flag --" << flag, + value_str, value); } // The internal implementation of InitGoogleMock(). |