Commit Graph

37 Commits

Author SHA1 Message Date
Abseil Team
63ad9ec911 Googletest export
Remove linked_ptr and use std::shared_ptr instead

PiperOrigin-RevId: 218618184
2018-10-26 14:19:59 -04:00
misterg
55c37984f7 Googletest export
Remove linked_ptr and use std::shared_ptr instead

PiperOrigin-RevId: 218571466
2018-10-26 14:19:51 -04:00
Abseil Team
dd4e36663c Unconditionally use std::tuple.
Remove all mention of TR1 tuple and our own implementation of tuple.

PiperOrigin-RevId: 216395043
2018-10-09 16:25:58 -04:00
Gennadiy Civil
f0bcc9b875 Comments changes, no functionality changes. 2018-08-14 15:04:11 -04:00
Gennadiy Civil
bdc777e251 Comments changes, no functionality changes 2018-08-14 14:04:07 -04:00
Gennadiy Civil
b0f2daec87 formatting custom/README.md 2018-08-13 22:45:53 -04:00
Gennadiy Civil
5bdf9c5f70 formatting for new READMEs 2018-08-13 16:23:17 -04:00
Gennadiy Civil
14e8a3161d Move instructions into custom/README files 2018-08-13 14:31:56 -04:00
Gennadiy Civil
d61ffe1c3f comment cleanup 2018-08-13 13:17:38 -04:00
Gennadiy Civil
821944fa56 Formatting changes for automatic code management 2018-07-27 11:15:08 -04:00
duxiuxing
20f9427c4a Merge branch 'master' into googletest_for_asam 2018-07-19 18:38:20 +08:00
Gennadiy Civil
974129ca2a Formatting and a link 2018-07-18 11:17:19 -04:00
duxiuxing
9e02b51c70 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 2018-07-17 15:46:47 +08:00
David Sunderland
5fd3984f10 Fix friend declaration to use GTEST_API_ decl spec. 2018-04-19 01:11:50 -04:00
David Sunderland
b490cb0400 Revert useless use of GTEST_API_ on WithoutMatchers decl. 2018-04-19 01:10:22 -04:00
David Sunderland
158783e097 Add GTEST_API_ tag to WithoutMatchers class. Hopefully that fixes the problem on MSVC? 2018-04-18 20:59:49 -04:00
David Sunderland
c24086c099 Mark new GetWithoutMatchers method as part of the exported API, to address MSVC linker errors. 2018-04-18 20:25:31 -04:00
David Sunderland
cf7b25961a Clone of unsubmitted cr/176529515. Introduce parameterless expectations. 2018-04-18 19:28:56 -04:00
Gennadiy Civil
797c6f1be1 ..and this should be it 2018-04-11 10:10:24 -04:00
Gennadiy Civil
346f1f5734 merge 2018-04-10 16:10:34 -04:00
Gennadiy Civil
ec1df5b40f RE-Doing the merge, this time with gcc on mac in the PR so I can catch errors before merging the PR 2018-04-10 15:57:16 -04:00
Gennadiy Civil
3f59eb6a59 Revert "gmock actions 2" 2018-04-09 22:10:12 -04:00
Gennadiy Civil
f9c57f3d48 yet more 2018-04-09 16:04:48 -04:00
Gennadiy Civil
fb63da38e7 linkage, fixing MSVC 2018-04-06 16:43:35 -04:00
Gennadiy Civil
6573981317 warnings 2018-04-06 11:00:13 -04:00
Gennadiy Civil
1e454bdbcc cont - 2 2018-04-06 10:52:49 -04:00
Gennadiy Civil
907d5d1a7a cont 2018-04-06 10:43:11 -04:00
Gennadiy Civil
55451e85bb more warnings 2018-04-06 10:35:09 -04:00
Gennadiy Civil
a603ff235a deal with MSVC warn, cont 1 2018-04-06 10:24:49 -04:00
Gennadiy Civil
aa397015ee Cont. deal with MCVS warnings 2018-04-06 10:15:00 -04:00
Gennadiy Civil
cb430d1205 Deal with MCVS warnings 2018-04-06 10:01:40 -04:00
Gennadiy Civil
0a27876dd3 Merge branch 'master' of https://github.com/google/googletest 2018-03-05 12:26:24 -05:00
Gennadiy Civil
78797f38ef Merges-1 2018-03-05 12:26:15 -05:00
Scott Graham
7c60f81b22 Try to handle unsigned wchar_t (arm) a bit better 2018-02-23 12:28:09 -08:00
Gennadiy Civil
05c81235a1 Code merges 2018-01-26 11:57:58 -05:00
Nico Weber
3ec8d72fc1 Use std::string and ::string explicitly in gtest and gmock code.
This merges a Google-internal change (117235625).

Original CL description:
This CL was created manually in about an hour with sed, a Python script
to find all the places unqualified 'string' was mentioned, and some help
from Emacs to add the "std::" qualifications, plus a few manual tweaks.
2017-05-15 17:53:04 -04:00
Billy Donahue
affb09edf0 move googlemock files into googlemock/ subdir 2015-08-25 17:47:18 -04:00