aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorvladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925>2009-10-23 00:49:33 +0000
committervladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925>2009-10-23 00:49:33 +0000
commitedba5d808c10731938a23a53daf182a297124607 (patch)
treeffc7e0fe26f0fb0576af223ba477648731e6f714 /src
parent6bfc4b2bd378940fa006bd32b9667ad4137d8f15 (diff)
downloadgoogletest-edba5d808c10731938a23a53daf182a297124607.tar.gz
googletest-edba5d808c10731938a23a53daf182a297124607.tar.bz2
googletest-edba5d808c10731938a23a53daf182a297124607.zip
Fixes linker error when used with gMock on Windows
Diffstat (limited to 'src')
-rw-r--r--src/gtest.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gtest.cc b/src/gtest.cc
index ca27b313..f269b2ab 100644
--- a/src/gtest.cc
+++ b/src/gtest.cc
@@ -4446,8 +4446,8 @@ bool ParseStringFlag(const char* str, const char* flag, String* value) {
// Determines whether a string pointed by *str has the prefix parameter as
// its prefix and advances it to point past the prefix if it does.
-bool SkipPrefix(const char* prefix, const char** str) {
- const int prefix_len = strlen(prefix);
+static bool SkipPrefix(const char* prefix, const char** str) {
+ const size_t prefix_len = strlen(prefix);
if (strncmp(*str, prefix, prefix_len) != 0)
return false;
@@ -4462,7 +4462,7 @@ bool SkipPrefix(const char* prefix, const char** str) {
// recognized, it will print its help message. Flags starting with
// GTEST_INTERNAL_PREFIX_ followed by "internal_" are considered Google Test
// internal flags and do not trigger the help message.
-bool HasGoogleTestFlagPrefix(const char* str) {
+static bool HasGoogleTestFlagPrefix(const char* str) {
return (SkipPrefix("--", &str) ||
SkipPrefix("-", &str) ||
SkipPrefix("/", &str)) &&