diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-01-09 00:22:32 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-09 00:22:32 -0500 |
| commit | 0e6da4cead72ab739171bbe98570da971c3283b6 (patch) | |
| tree | 99a678b6b6fe1c8bc76e14287a9b7026c03019b7 /googlemock/test/gmock-matchers_test.cc | |
| parent | cdedd189b22a6578e935256294175b9884e3cf17 (diff) | |
| parent | e194f52114a181cb3fb420d58d5ae2250207e828 (diff) | |
| download | googletest-0e6da4cead72ab739171bbe98570da971c3283b6.tar.gz googletest-0e6da4cead72ab739171bbe98570da971c3283b6.tar.bz2 googletest-0e6da4cead72ab739171bbe98570da971c3283b6.zip | |
Merge branch 'master' into fix-core-dump-shared
Diffstat (limited to 'googlemock/test/gmock-matchers_test.cc')
| -rw-r--r-- | googlemock/test/gmock-matchers_test.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/googlemock/test/gmock-matchers_test.cc b/googlemock/test/gmock-matchers_test.cc index 4beaec4c..5c764eb4 100644 --- a/googlemock/test/gmock-matchers_test.cc +++ b/googlemock/test/gmock-matchers_test.cc @@ -65,10 +65,6 @@ namespace testing { -namespace internal { -GTEST_API_ string JoinAsTuple(const Strings& fields); -} // namespace internal - namespace gmock_matchers_test { using std::greater; |