merges-2

2018-03-05 13:28:13 -05:00
parent a518bd5cf2
commit dbf63e38a4
2 changed files with 14 additions and 4 deletions
--- 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().