duxiuxing
5b19054b02
Merge branch 'master' into googletest_for_asam
2018-07-19 18:38:20 +08:00
Gennadiy Civil
7e73a7ae6e
Formatting and a link
2018-07-18 11:17:19 -04:00
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
2018-07-17 15:46:47 +08:00
David Sunderland
2d3024f5bd
Fix friend declaration to use GTEST_API_ decl spec.
2018-04-19 01:11:50 -04:00
David Sunderland
b2f97ab317
Revert useless use of GTEST_API_ on WithoutMatchers decl.
2018-04-19 01:10:22 -04:00
David Sunderland
1c79ad7a56
Add GTEST_API_ tag to WithoutMatchers class. Hopefully that fixes the problem on MSVC?
2018-04-18 20:59:49 -04:00
David Sunderland
d5725da968
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
f437f8ca0d
Clone of unsubmitted cr/176529515. Introduce parameterless expectations.
2018-04-18 19:28:56 -04:00
Gennadiy Civil
5cd213ea5e
..and this should be it
2018-04-11 10:10:24 -04:00
Gennadiy Civil
39c58da187
merge
2018-04-10 16:10:34 -04:00
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
2018-04-10 15:57:16 -04:00
Gennadiy Civil
ca54b67303
Revert "gmock actions 2"
2018-04-09 22:10:12 -04:00
Gennadiy Civil
f5871009e6
yet more
2018-04-09 16:04:48 -04:00
Gennadiy Civil
701e1e5dc1
linkage, fixing MSVC
2018-04-06 16:43:35 -04:00
Gennadiy Civil
c75b76e20a
warnings
2018-04-06 11:00:13 -04:00
Gennadiy Civil
04e31881fc
cont - 2
2018-04-06 10:52:49 -04:00
Gennadiy Civil
32ac949254
cont
2018-04-06 10:43:11 -04:00
Gennadiy Civil
1831ac9361
more warnings
2018-04-06 10:35:09 -04:00
Gennadiy Civil
eb3e4aac2e
deal with MSVC warn, cont 1
2018-04-06 10:24:49 -04:00
Gennadiy Civil
50c0bcd7e3
Cont. deal with MCVS warnings
2018-04-06 10:15:00 -04:00
Gennadiy Civil
b5c87fbcb6
Deal with MCVS warnings
2018-04-06 10:01:40 -04:00
Gennadiy Civil
a518bd5cf2
Merge branch 'master' of https://github.com/google/googletest
2018-03-05 12:26:24 -05:00
Gennadiy Civil
0d5e01ad7b
Merges-1
2018-03-05 12:26:15 -05:00
Scott Graham
567b40eeb1
Try to handle unsigned wchar_t (arm) a bit better
2018-02-23 12:28:09 -08:00
Gennadiy Civil
fbb48a7708
Code merges
2018-01-26 11:57:58 -05:00
Nico Weber
09fd5b3ebf
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
