diff options
| author | Herbert Thielen <thielen@hs-worms.de> | 2017-10-04 19:03:47 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-04 19:03:47 (GMT) |
| commit | ceee80c383d6f34af1a4e0fbb464f3f144cded68 (patch) | |
| tree | acddac2058e907f3db9bafe616b38e156becb51d /googletest/include/gtest/internal | |
| parent | 98024ad2027387680fd4af72b70c14667850b09c (diff) | |
| parent | 7b6561c56e353100aca8458d7bc49c4e0119bae8 (diff) | |
| download | googletest-ceee80c383d6f34af1a4e0fbb464f3f144cded68.zip googletest-ceee80c383d6f34af1a4e0fbb464f3f144cded68.tar.gz googletest-ceee80c383d6f34af1a4e0fbb464f3f144cded68.tar.bz2 | |
Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS
Diffstat (limited to 'googletest/include/gtest/internal')
| -rw-r--r-- | googletest/include/gtest/internal/gtest-port.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h index 4395cbb..f303e23 100644 --- 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 |