Gennadiy Civil
2b790c5f24
reverting just to test
2018-04-19 11:14:17 -04:00
Gennadiy Civil
323fd375e0
testing
2018-04-19 10:19:59 -04:00
David Sunderland
5fd3984f10
Fix friend declaration to use GTEST_API_ decl spec.
2018-04-19 01:11:50 -04:00
David Sunderland
b490cb0400
Revert useless use of GTEST_API_ on WithoutMatchers decl.
2018-04-19 01:10:22 -04:00
David Sunderland
158783e097
Add GTEST_API_ tag to WithoutMatchers class. Hopefully that fixes the problem on MSVC?
2018-04-18 20:59:49 -04:00
David Sunderland
c24086c099
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
2d4d2d21e7
Merge branch 'parameterless' of https://github.com/dnsunderland/googletest into parameterless
2018-04-18 19:39:39 -04:00
David Sunderland
71dcdcc07c
Don't use generalized initializer list; is C++11 extension.
2018-04-18 19:37:33 -04:00
dnsunderland
e7ef46473f
Merge branch 'master' into parameterless
2018-04-18 16:32:31 -07:00
David Sunderland
cf7b25961a
Clone of unsubmitted cr/176529515. Introduce parameterless expectations.
2018-04-18 19:28:56 -04:00
Gennadiy Civil
37373005b6
more typos
2018-04-18 17:13:23 -04:00
Gennadiy Civil
55fa39c914
msvc
2018-04-18 17:03:42 -04:00
Gennadiy Civil
c9801eb77b
more typos
2018-04-18 16:43:11 -04:00
Gennadiy Civil
eeecead60a
typo
2018-04-18 15:18:03 -04:00
Gennadiy Civil
2c8a469f0e
move only types docs
2018-04-18 15:10:07 -04:00
Gennadiy Civil
dd7a276055
typo
2018-04-18 15:02:47 -04:00
Gennadiy Civil
8181a6a9ee
typo
2018-04-18 14:25:58 -04:00
Gennadiy Civil
b804421c33
http://cl/193386206
2018-04-18 14:21:28 -04:00
Gennadiy Civil
789434c3fd
merge, explicit, ( should be it)
2018-04-18 11:05:00 -04:00
Gennadiy Civil
609802ef23
193353312
2018-04-18 10:36:12 -04:00
Gennadiy Civil
cdc2f4b725
cl/193060888
2018-04-17 19:32:15 -04:00
Gennadiy Civil
7690cb75a0
http://cl/193060888
2018-04-17 16:22:35 -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
cc258bb44d
typo
2018-04-16 12:00:37 -04:00
Gennadiy Civil
9290af3a03
more msvc
2018-04-16 11:52:22 -04:00
Gennadiy Civil
47e8442193
typo
2018-04-16 11:41:36 -04:00
Gennadiy Civil
532cd75c14
msvc warnings
2018-04-16 11:32:16 -04:00
Gennadiy Civil
b15c15ac6e
merging gmock generated matchers
2018-04-16 11:18:49 -04:00
Gennadiy Civil
e240d4a180
merging, testing, this should be it
2018-04-16 10:42:08 -04:00
Gennadiy Civil
220fa3589e
merging
2018-04-16 10:34:07 -04:00
Gennadiy Civil
f2738b31b2
merging
2018-04-16 10:16:48 -04:00
Gennadiy Civil
0d71fbfef1
more pizza
2018-04-13 16:04:34 -04:00
Gennadiy Civil
e5adb95cc5
more OSX pizzas
2018-04-13 15:48:57 -04:00
Gennadiy Civil
59b7952275
osx pizzas
2018-04-13 11:49:37 -04:00
Gennadiy Civil
cd1ceb89fe
merging gmock actions test
2018-04-13 11:02:55 -04:00
Gennadiy Civil
b88d415261
merging, gmock actions test
2018-04-13 11:02:25 -04:00
Gennadiy Civil
bbb66b6d85
merging
2018-04-13 09:16:40 -04:00
Gennadiy Civil
3b75be525c
more fixing osx libstd++ bugs
2018-04-12 17:00:31 -04:00
Gennadiy Civil
1d26f6b670
fixing
2018-04-12 16:32:03 -04:00
Gennadiy Civil
278da818bb
merging, fix OSX issue
2018-04-12 15:45:21 -04:00
Gennadiy Civil
2cb8105063
merging
2018-04-12 14:46:57 -04:00
Gennadiy Civil
d6bfdebf36
merging
2018-04-12 14:00:38 -04:00
Gennadiy Civil
c5ccc8f35f
merging
2018-04-12 13:42:47 -04:00
Gennadiy Civil
b8af6195d7
msvc
2018-04-12 11:32:17 -04:00
Gennadiy Civil
acfc19b62a
revert this one
2018-04-12 10:28:02 -04:00
Gennadiy Civil
6ebe245ae7
merge, ... gmock-matchers test
2018-04-12 09:45:07 -04:00
Gennadiy Civil
06f3a861b6
Merge branch 'master' of https://github.com/google/googletest
2018-04-12 09:13:38 -04:00
Gennadiy Civil
dea55d0bf0
small cleanup
2018-04-12 09:12:02 -04:00
Victor Costan
75b1be4ad1
Remove multiple inheritance from "unintesting call" mock classes.
...
Internal CL 156157936, which was published in commit
fe402c27790ff1cc9a7e17c5d0aea4ebe7fd8a71, introduced undefined behavior
by casting a base class (internal::{Naggy,Nice,Strict}Base<MockClass>,
using the curiously recurring template pattern) pointer to a derived
class ({Naggy,Nice,Strict}Mock<MockClass>), in the base class'
constructor. At that point, the object isn't guaranteed to have taken on
the shape of the derived class, and casting is undefined behavior.
The undefined behavior was caught by Chrome's CFI build bot [1], and
prevents rolling googletest past that commit / CL.
This commit simplifies the {Naggy,Nice,Strict}Mock class hierarchy in
a way that removes the undefined behavior.
[1] https://www.chromium.org/developers/testing/control-flow-integrity
2018-04-12 00:48:30 -07:00
