94 Commits (8286bf223320acc7cf9c8ac776b697b807b92c26)

Author SHA1 Message Date
misterg ba974c97ac Googletest export 7 years ago
Abseil Team ffc9baeb4c Googletest export 7 years ago
misterg db405ff8c3 Googletest export 7 years ago
misterg 936dae4efe Googletest export 7 years ago
Romain Geissler 93b05da26c Fix gcc misleading indentation again. 7 years ago
misterg a5cc7aa3fe Googletest export 7 years ago
misterg 2cc008538c Googletest export 7 years ago
Gennadiy Civil 9ad739833e
Update gmock-matchers.h 7 years ago
Abseil Team 65d03530e6 Googletest export 7 years ago
Abseil Team a0e62d9f1a No longer require a functor passed to ResultOf matcher to define `result_of` type. 7 years ago
misterg df428ec118 googletest export 7 years ago
Abseil Team ca87cc72e2 googletest export 7 years ago
Gennadiy Civil 265efde9a5 Comments changes, no functionality changes. 7 years ago
Gennadiy Civil a3c0dd0f4d Comments changes, no functionality changes 7 years ago
Gennadiy Civil f225735222 Code formatting changes, clean up, no functionality changes 7 years ago
Gennadiy Civil c203bee245 formatting custom/README.md 7 years ago
Gennadiy Civil 9060e19c87 formatting for new READMEs 7 years ago
Gennadiy Civil 63baab8924 Move instructions into custom/README files 7 years ago
Gennadiy Civil 18c940d13a comment cleanup 7 years ago
Gennadiy Civil 984cba30ed Formatting changes for automatic code management 7 years ago
Gennadiy Civil a02af2f689 code merge 7 years ago
杜修杏 2eb4396007 Replace "…" with "..."(three dots) to fix warning C4819 in Visual Studio 7 years ago
Gennadiy Civil 0c17888bcf code sync 7 years ago
Gennadiy Civil 7e73a7ae6e Formatting and a link 7 years ago
duxiuxing 65a49a73f0 Fix warning C4819: The file contains a character that cannot be represented in the current code page (936). Save the file in Unicode format to prevent data loss 7 years ago
Masaru Tsuchiyama 4bcc9b9807 This closes #1595: fix compiler error with Visual Studio 2017 on Win10 JP. 7 years ago
Scott Graham a9653c401e Fix gmock not building when -fno-rtti 7 years ago
Gennadiy Civil b539167cf0 merging, 7 years ago
David Sunderland 2d3024f5bd Fix friend declaration to use GTEST_API_ decl spec. 7 years ago
David Sunderland b2f97ab317 Revert useless use of GTEST_API_ on WithoutMatchers decl. 7 years ago
David Sunderland 1c79ad7a56 Add GTEST_API_ tag to WithoutMatchers class. Hopefully that fixes the problem on MSVC? 7 years ago
David Sunderland d5725da968 Mark new GetWithoutMatchers method as part of the exported API, to address MSVC linker errors. 7 years ago
David Sunderland f437f8ca0d Clone of unsubmitted cr/176529515. Introduce parameterless expectations. 7 years ago
Gennadiy Civil 4707c0ffd4 193353312 7 years ago
Gennadiy Civil dff32aff97 http://cl/193060888 7 years ago
Gennadiy Civil 3f88bb1831 test-meerging 7 years ago
Gennadiy Civil bd2a1aed03 merging gmock generated matchers 7 years ago
Gennadiy Civil a79851f2c2 merging 7 years ago
Gennadiy Civil fa658e0cc0 merging 7 years ago
Gennadiy Civil e77deb29a6 small cleanup 7 years ago
Victor Costan 1324e2d706 Remove multiple inheritance from "unintesting call" mock classes. 7 years ago
Gennadiy Civil 8654c1ca10 merging 7 years ago
Gennadiy Civil ab84d14281 Upstream cl/192179348 7 years ago
Gennadiy Civil 5cd213ea5e ..and this should be it 7 years ago
Gennadiy Civil e1071eb949 RE-Doing the merge, this time with gcc on mac in the PR so I can catch errors before merging the PR 7 years ago
Gennadiy Civil ca54b67303
Revert "gmock actions 2" 7 years ago
Gennadiy Civil f5871009e6 yet more 7 years ago
Gennadiy Civil e0b3c269c2 continued 7 years ago
Victor Costan 51f8ad47df Sync gmock-generated-nice-strict.h.pump with gmock-generated-nice-strict.h. 7 years ago
Gennadiy Civil 701e1e5dc1 linkage, fixing MSVC 7 years ago