diff options
| -rw-r--r-- | googlemock/test/gmock-generated-matchers_test.cc | 4 | ||||
| -rw-r--r-- | googletest/src/gtest-filepath.cc | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/googlemock/test/gmock-generated-matchers_test.cc b/googlemock/test/gmock-generated-matchers_test.cc index d79cef99..eb47f2b0 100644 --- a/googlemock/test/gmock-generated-matchers_test.cc +++ b/googlemock/test/gmock-generated-matchers_test.cc @@ -1164,8 +1164,8 @@ TEST(AnyOfArrayTest, BasicForms) { EXPECT_THAT(0, Not(AnyOfArray(ar, 0))); EXPECT_THAT(1, AnyOfArray(ar, 1)); EXPECT_THAT(2, Not(AnyOfArray(ar, 1))); - EXPECT_THAT(3, AnyOfArray(ar + 1, 3)); - EXPECT_THAT(4, Not(AnyOfArray(ar + 1, 3))); + EXPECT_THAT(3, AnyOfArray(ar + 1, 2)); + EXPECT_THAT(4, Not(AnyOfArray(ar + 1, 2))); // Array // int ar0[0]; Not usable int ar1[1] = {1}; diff --git a/googletest/src/gtest-filepath.cc b/googletest/src/gtest-filepath.cc index 4f233e8f..499ec587 100644 --- a/googletest/src/gtest-filepath.cc +++ b/googletest/src/gtest-filepath.cc @@ -92,7 +92,8 @@ static bool IsPathSeparator(char c) { // Returns the current working directory, or "" if unsuccessful. FilePath FilePath::GetCurrentDir() { -#if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_WINDOWS_PHONE || GTEST_OS_WINDOWS_RT || ARDUINO +#if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_WINDOWS_PHONE || \ + GTEST_OS_WINDOWS_RT || ARDUINO // Windows CE and Arduino don't have a current directory, so we just return // something reasonable. return FilePath(kCurrentDirectoryString); |