Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS

2017-10-04 21:03:47 +02:00
parent 98024ad202 7b6561c56e
commit ceee80c383
20 changed files with 22 additions and 22 deletions
--- a/googletest/include/gtest/internal/gtest-port.h
+++ b/googletest/include/gtest/internal/gtest-port.h
@@ -740,7 +740,7 @@ using ::std::tuple_size;
 #   define _TR1_FUNCTIONAL 1
 #   include <tr1/tuple>
 #   undef _TR1_FUNCTIONAL  // Allows the user to #include
-                        // <tr1/functional> if he chooses to.
+                        // <tr1/functional> if they choose to.
 #  else
 #   include <tr1/tuple>  // NOLINT
 #  endif  // !GTEST_HAS_RTTI && GTEST_GCC_VER_ < 40302