Gennadiy Civil
af463c43ac
More merges, removing old dead code
2018-03-13 11:13:37 -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
Gennadiy Civil
f8fbe1c821
Merge branch 'master' into unsigned-wchar
2018-03-01 11:18:17 -05: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
Scott Graham
567b40eeb1
Try to handle unsigned wchar_t (arm) a bit better
2018-02-23 12:28:09 -08: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
Romain Geissler
20e2de7d8b
Remove gcc 6 misleading indentations.
2017-10-25 17:53:01 +02:00
Jonathan Wakely
b70cf1a663
Use gender-neutral pronouns in comments and docs
2017-09-27 13:31:13 +01:00
Herbert Thielen
e033d8c73d
change links from former code.google.com to current github repository
2017-08-31 18:12:17 +02:00
Alyssa Wilk
c00373320d
Merge branch 'refs/heads/master' into flag-default
2017-08-28 16:10:12 -04:00
Roman Perepelitsa
966b549c88
Support ref-qualified member functions in Property().
2017-08-22 16:06:26 +02:00
Alyssa Wilk
6e1970e237
Adding a flag option to change the default mock type
2017-08-10 09:41:09 -04:00
Gennadiy Civil
461713fec4
Merge pull request #1123 from chromy/upstream-141765019
...
Fix typo in gmock-actions.h
2017-08-08 16:17:52 -04:00
Hector Dearman
41ad243d93
Fix typo in gmock-actions.h
...
This upstreams a Google-internal change (141765019).
2017-06-19 18:43:55 +01: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
Mark Mentovai
a0435dc687
googlemock: Support C++11 language with pre-C++11 library
...
This guards use of <type_traits> and its features with
GTEST_HAS_STD_TYPE_TRAITS_, and std::function with
GTEST_HAS_STD_FUNCTION_.
2015-10-12 17:59:11 -04:00
Billy Donahue
affb09edf0
move googlemock files into googlemock/ subdir
2015-08-25 17:47:18 -04:00
