Gennadiy Civil
821944fa56
Formatting changes for automatic code management
2018-07-27 11:15:08 -04:00
Gennadiy Civil
68683d415c
code merge
2018-07-20 11:28:58 -04:00
Gennadiy Civil
21a1dae1b5
code sync
2018-07-19 12:42:39 -04:00
Scott Graham
7550a4c571
Fix gmock not building when -fno-rtti
...
Fixes issue #1554 . This is internal cl/195020996.
2018-05-02 11:14:39 -07:00
Gennadiy Civil
edaeb8bc88
merging,
2018-04-25 13:10:41 -04:00
Gennadiy Civil
609802ef23
193353312
2018-04-18 10:36:12 -04:00
Gennadiy Civil
4308455071
http://cl/193060888
2018-04-17 16:12:04 -04:00
Gennadiy Civil
43341314bd
test-meerging
2018-04-16 15:52:47 -04:00
Gennadiy Civil
41c224c80c
Upstream cl/192179348
2018-04-11 15:24:04 -04:00
Gennadiy Civil
bd0ae14317
merging gmock matchers 1
2018-04-04 14:05:00 -04:00
Gennadiy Civil
7c7ab001c1
merging gmock-matchers.h 3
2018-03-26 10:36:26 -04:00
Gennadiy Civil
0eff246cb1
merging gmock-matchers.h 2
2018-03-26 10:16:59 -04:00
Gennadiy Civil
20d30a8614
Upstreaming FloatingEq2Matcher,
2018-03-26 09:28:16 -04:00
Gennadiy Civil
401b056442
Merging gmock-matchers.h -2
2018-03-23 11:42:41 -04:00
Gennadiy Civil
c4727169c2
gmock-matchers merging -2
2018-03-23 11:23:54 -04:00
Gennadiy Civil
7b1726ef5c
merging, gmock -1
2018-03-22 15:35:37 -04:00
Xiaoyi Zhang
94075ff9c0
Merge branch 'master' into variant_matcher
2018-02-27 16:03:36 -05:00
Gennadiy Civil
bcc0a1afa1
gmock merging -2
2018-02-27 13:51:09 -05:00
Xiaoyi Zhang
fe8a4bec1b
Add matcher for std::variant.
2018-02-27 11:36:21 -05:00
Gennadiy Civil
d40efb1166
moving JoinAsTuple to internal
2018-02-12 16:42:12 -05:00
Troy Holsapple
a2866dfdf5
Fixed typos
2018-02-07 22:06:00 -08:00
Gennadiy Civil
05c81235a1
Code merges
2018-01-26 11:57:58 -05:00
David Benjamin
57561c06f0
Pass the -Wmissing-declarations warning.
...
This makes it easier to use GTest in projects that build with the
-Wmissing-declarations warning. This fixes the warning in headers and
source files, though not GTest's own tests as it is rather noisy there.
2018-01-03 14:50:22 -05:00
Roman Perepelitsa
75a9eed0f5
Support ref-qualified member functions in Property().
2017-08-22 16:06:26 +02:00
Hector Dearman
e7cfb0940a
Fixed misspelling in assertion message.
...
This upstreams a Google-internal change (146491438).
2017-06-19 18:27:33 +01: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
