Homec4science
Authored by Gennadiy Civil <misterg@google.com> on Apr 25 2018, 19:16.

Description

merged

Details

Event Timeline

Gennadiy Civil <misterg@google.com> committed R9484:9af3793103ca: merged (authored by Gennadiy Civil <misterg@google.com>).Apr 25 2018, 19:16

Merged Changes

CommitAuthorDetailsCommitted
a6f06bf2fd3bGennadiy Civil/GitHub
Merge pull request #1582 from dnsunderland/parameterless 
Apr 20 2018
884bcdaf182dGennadiy Civil/GitHub
Merge branch 'master' into parameterless 
Apr 20 2018
2d3024f5bdc4David Sunderland
Fix friend declaration to use GTEST_API_ decl spec. 
Apr 19 2018
b2f97ab3179fDavid Sunderland
Revert useless use of GTEST_API_ on WithoutMatchers decl. 
Apr 19 2018
1c79ad7a56deDavid Sunderland
Add GTEST_API_ tag to WithoutMatchers class. Hopefully that fixes the problem… 
Apr 19 2018
d5725da96894David Sunderland
Mark new GetWithoutMatchers method as part of the exported API, to address MSVC… 
Apr 19 2018
7878b27dddeeDavid Sunderland
Merge branch 'parameterless' of https://github.com/dnsunderland/googletest into… 
Apr 19 2018
f6551f2d4538David Sunderland
Don't use generalized initializer list; is C++11 extension. 
Apr 19 2018
08cb06b19759dnsunderland/GitHub
Merge branch 'master' into parameterless 
Apr 19 2018
f437f8ca0d4dDavid Sunderland
Clone of unsubmitted cr/176529515. Introduce parameterless expectations. 
Apr 19 2018