Gennadiy Civil
265efde9a5
Comments changes, no functionality changes.
2018-08-14 15:04:11 -04:00
Gennadiy Civil
a3c0dd0f4d
Comments changes, no functionality changes
2018-08-14 14:04:07 -04:00
Gennadiy Civil
984cba30ed
Formatting changes for automatic code management
2018-07-27 11:15:08 -04:00
Gennadiy Civil
a02af2f689
code merge
2018-07-20 11:28:58 -04:00
Gennadiy Civil
0c17888bcf
code sync
2018-07-19 12:42:39 -04:00
Scott Graham
a9653c401e
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
b539167cf0
merging,
2018-04-25 13:10:41 -04:00
Gennadiy Civil
4707c0ffd4
193353312
2018-04-18 10:36:12 -04:00
Gennadiy Civil
dff32aff97
http://cl/193060888
2018-04-17 16:12:04 -04:00
Gennadiy Civil
3f88bb1831
test-meerging
2018-04-16 15:52:47 -04:00
Gennadiy Civil
ab84d14281
Upstream cl/192179348
2018-04-11 15:24:04 -04:00
Gennadiy Civil
e55089ec11
merging gmock matchers 1
2018-04-04 14:05:00 -04:00
Gennadiy Civil
6aae206bc2
merging gmock-matchers.h 3
2018-03-26 10:36:26 -04:00
Gennadiy Civil
23187058e7
merging gmock-matchers.h 2
2018-03-26 10:16:59 -04:00
Gennadiy Civil
8ea10d3878
Upstreaming FloatingEq2Matcher,
2018-03-26 09:28:16 -04:00
Gennadiy Civil
b907c26740
Merging gmock-matchers.h -2
2018-03-23 11:42:41 -04:00
Gennadiy Civil
466a49ae30
gmock-matchers merging -2
2018-03-23 11:23:54 -04:00
Gennadiy Civil
b7c568326c
merging, gmock -1
2018-03-22 15:35:37 -04:00
Xiaoyi Zhang
576d689c19
Merge branch 'master' into variant_matcher
2018-02-27 16:03:36 -05:00
Gennadiy Civil
2bd1750ba7
gmock merging -2
2018-02-27 13:51:09 -05:00
Xiaoyi Zhang
190e2cdd0b
Add matcher for std::variant.
2018-02-27 11:36:21 -05:00
Gennadiy Civil
225e6741ac
moving JoinAsTuple to internal
2018-02-12 16:42:12 -05:00
Troy Holsapple
c8510504dd
Fixed typos
2018-02-07 22:06:00 -08:00
Gennadiy Civil
fbb48a7708
Code merges
2018-01-26 11:57:58 -05:00
David Benjamin
b3d9be5c1d
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
966b549c88
Support ref-qualified member functions in Property().
2017-08-22 16:06:26 +02:00
Hector Dearman
24054ff073
Fixed misspelling in assertion message.
...
This upstreams a Google-internal change (146491438).
2017-06-19 18:27:33 +01: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
Gennadiy Civil