Commit Graph

66 Commits

Author SHA1 Message Date
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