Gennadiy Civil
|
884bcdaf18
|
Merge branch 'master' into parameterless
|
2018-04-19 18:35:17 -04:00 |
|
Gennadiy Civil
|
1114a0202a
|
Merge pull request #1580 from gennadiycivil/master
merging
|
2018-04-19 11:57:52 -04:00 |
|
Gennadiy Civil
|
bb7a018348
|
reverting, test
|
2018-04-19 11:28:46 -04:00 |
|
Gennadiy Civil
|
7b4ee66f5f
|
reverting just to test
|
2018-04-19 11:14:17 -04:00 |
|
Gennadiy Civil
|
62a7c140a7
|
testing
|
2018-04-19 10:19:59 -04: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
|
7878b27ddd
|
Merge branch 'parameterless' of https://github.com/dnsunderland/googletest into parameterless
|
2018-04-18 19:39:39 -04:00 |
|
David Sunderland
|
f6551f2d45
|
Don't use generalized initializer list; is C++11 extension.
|
2018-04-18 19:37:33 -04:00 |
|
dnsunderland
|
08cb06b197
|
Merge branch 'master' into parameterless
|
2018-04-18 16:32:31 -07:00 |
|
David Sunderland
|
f437f8ca0d
|
Clone of unsubmitted cr/176529515. Introduce parameterless expectations.
|
2018-04-18 19:28:56 -04:00 |
|
Gennadiy Civil
|
f312435032
|
more typos
|
2018-04-18 17:13:23 -04:00 |
|
Gennadiy Civil
|
a0fd742639
|
msvc
|
2018-04-18 17:03:42 -04:00 |
|
Gennadiy Civil
|
b00e281078
|
more typos
|
2018-04-18 16:43:11 -04:00 |
|
Gennadiy Civil
|
881ee307a7
|
typo
|
2018-04-18 15:18:03 -04:00 |
|
Gennadiy Civil
|
10e8ec2714
|
move only types docs
|
2018-04-18 15:10:07 -04:00 |
|
Gennadiy Civil
|
4d554c391b
|
typo
|
2018-04-18 15:02:47 -04:00 |
|
Gennadiy Civil
|
b4cbf531e9
|
typo
|
2018-04-18 14:25:58 -04:00 |
|
Gennadiy Civil
|
78d73814fa
|
http://cl/193386206
|
2018-04-18 14:21:28 -04:00 |
|
Gennadiy Civil
|
a48b95ef81
|
Merge branch 'master' of github.com:google/googletest
|
2018-04-18 11:05:12 -04:00 |
|
Gennadiy Civil
|
c56ba73a23
|
merge, explicit, ( should be it)
|
2018-04-18 11:05:00 -04:00 |
|
Gennadiy Civil
|
4bd8c4638a
|
Merge pull request #1579 from gennadiycivil/master
193353312
|
2018-04-18 10:57:04 -04:00 |
|
Gennadiy Civil
|
88311784e4
|
Merge branch 'master' of github.com:google/googletest
|
2018-04-18 10:36:24 -04:00 |
|
Gennadiy Civil
|
4707c0ffd4
|
193353312
|
2018-04-18 10:36:12 -04:00 |
|
Gennadiy Civil
|
4035d6ecc0
|
Merge pull request #1577 from gennadiycivil/master
merging gmock generated matchers
|
2018-04-17 19:44:13 -04:00 |
|
Gennadiy Civil
|
80d6e26a9c
|
cl/193060888
|
2018-04-17 19:32:15 -04:00 |
|
Gennadiy Civil
|
5dccf6b79e
|
http://cl/193060888
|
2018-04-17 16:22:35 -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
|
ec425d7160
|
typo
|
2018-04-16 12:00:37 -04:00 |
|
Gennadiy Civil
|
e4ab316c85
|
more msvc
|
2018-04-16 11:52:22 -04:00 |
|
Gennadiy Civil
|
1944bc0f51
|
typo
|
2018-04-16 11:41:36 -04:00 |
|
Gennadiy Civil
|
e9eff488f9
|
msvc warnings
|
2018-04-16 11:32:16 -04:00 |
|
Gennadiy Civil
|
bd2a1aed03
|
merging gmock generated matchers
|
2018-04-16 11:18:49 -04:00 |
|
Gennadiy Civil
|
1f605414cc
|
Merge pull request #1576 from gennadiycivil/master
merging
|
2018-04-16 11:02:12 -04:00 |
|
Gennadiy Civil
|
9fba103156
|
merging, testing, this should be it
|
2018-04-16 10:42:08 -04:00 |
|
Gennadiy Civil
|
1c6e68cf6c
|
merging
|
2018-04-16 10:34:07 -04:00 |
|
Gennadiy Civil
|
26c10dc7e6
|
merging
|
2018-04-16 10:16:48 -04:00 |
|
Gennadiy Civil
|
247ded3236
|
Merge pull request #1571 from gennadiycivil/master
merging, gmock actions test
|
2018-04-14 19:24:19 -04:00 |
|
Gennadiy Civil
|
d84eb86df5
|
more pizza
|
2018-04-13 16:04:34 -04:00 |
|
Gennadiy Civil
|
f45728a5ac
|
more OSX pizzas
|
2018-04-13 15:48:57 -04:00 |
|
Gennadiy Civil
|
b74a1af00f
|
osx pizzas
|
2018-04-13 11:49:37 -04:00 |
|
Gennadiy Civil
|
f9bd6180de
|
merging gmock actions test
|
2018-04-13 11:02:55 -04:00 |
|
Gennadiy Civil
|
0bfa823785
|
merging, gmock actions test
|
2018-04-13 11:02:25 -04:00 |
|
Gennadiy Civil
|
38de61d73b
|
Merge pull request #1569 from gennadiycivil/master
merging
|
2018-04-13 09:41:33 -04:00 |
|
Gennadiy Civil
|
6d31084797
|
Merge branch 'master' of https://github.com/google/googletest
|
2018-04-13 09:16:56 -04:00 |
|
Gennadiy Civil
|
2dc576ec55
|
merging
|
2018-04-13 09:16:40 -04:00 |
|
Gennadiy Civil
|
0957cce368
|
Merge pull request #1568 from gennadiycivil/master
merging
|
2018-04-12 18:56:57 -04:00 |
|