diff options
| author | Conor Burgess <Burgess.Conor@gmail.com> | 2018-08-17 17:15:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-17 17:15:32 +0100 |
| commit | 687964c84f798ce331fc60f6b8f212410ef46b3c (patch) | |
| tree | 20ed743afd555c46b91361cf864c76643f1d89b2 /googlemock/src/gmock.cc | |
| parent | f11a8f9131584cf4009eca8af8a66e920c1b7391 (diff) | |
| parent | 02a8ca87735601466d8c564344f9be493da84708 (diff) | |
| download | googletest-687964c84f798ce331fc60f6b8f212410ef46b3c.tar.gz googletest-687964c84f798ce331fc60f6b8f212410ef46b3c.tar.bz2 googletest-687964c84f798ce331fc60f6b8f212410ef46b3c.zip | |
Merge branch 'master' into fix-argc
Diffstat (limited to 'googlemock/src/gmock.cc')
| -rw-r--r-- | googlemock/src/gmock.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/googlemock/src/gmock.cc b/googlemock/src/gmock.cc index 3c370510..36356c93 100644 --- a/googlemock/src/gmock.cc +++ b/googlemock/src/gmock.cc @@ -26,15 +26,14 @@ // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) + #include "gmock/gmock.h" #include "gmock/internal/gmock-port.h" namespace testing { -// TODO(wan@google.com): support using environment variables to +// FIXME: support using environment variables to // control the flag values, like what Google Test does. GMOCK_DEFINE_bool_(catch_leaked_mocks, true, @@ -136,8 +135,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(). |