Commit Graph

2009 Commits

Author SHA1 Message Date
Gennadiy Civil
5aee6d7cba Merge pull request #1603 from Steelskin/unused-variable-fuchsia
Remove unused variable in Fuchsia.
2018-05-22 06:31:53 -07:00
Gennadiy Civil
562c7fe59a Merge branch 'master' into unused-variable-fuchsia 2018-05-22 06:01:05 -07:00
Gennadiy Civil
56d0b8bd63 Merge pull request #1591 from sgraham/disabled-rtti
Fix gmock not building when -fno-rtti
2018-05-22 06:00:40 -07:00
Gennadiy Civil
841309c17e Merge branch 'master' into disabled-rtti 2018-05-22 05:34:05 -07:00
Gennadiy Civil
a3d993010a Merge pull request #1601 from jdennett/StdLibVersioning
Std lib versioning
2018-05-22 05:32:53 -07:00
James Dennett
c1868fabc1 Downgrade to C++98.
Some projects cannot handle C++11 yet.
2018-05-21 12:27:52 -07:00
James Dennett
be24b04932 Downgrade to C++98 code.
Some users are not ready for C++11 yet.
2018-05-21 10:59:24 -07:00
James Dennett
3c6deade28 Merge branch 'master' into StdLibVersioning 2018-05-21 10:57:01 -07:00
Fabrice de Gans-Riberi
a8d39f2fdb Remove unused variable in Fuchsia. 2018-05-11 10:38:48 -07:00
Scott Graham
bb95db65b2 Merge branch 'master' into disabled-rtti 2018-05-11 09:57:44 -07:00
Gennadiy Civil
aebc369dd9 Merge pull request #1597 from jaeheonlee/master
Fix a bug with ad_hoc_test_result() functions of UnitTest and TestCase classes
2018-05-11 09:05:24 -04:00
James Dennett
3e05d6d9fc Add support for versioned standard libraries.
This canonicalizes demangled names by omitting a nested inline namespace within namespace std if the name of the nested namespace begins with a double underscore.  This improves compatibility with libc++.
2018-05-10 22:39:19 -07:00
James Dennett
9db0945bc3 Update generated code. 2018-05-10 22:36:50 -07:00
James Dennett
819e651cea Add unit test for CanonicalizeForStdLibVersioning. 2018-05-10 22:33:29 -07:00
Jae Heon Lee
a9a14502f4 Use NULL instead of nullptr, for pre-C++11 builds. 2018-05-09 13:03:57 -07:00
Jae Heon Lee
dace0609bf Fix the bug where ad_hoc_test_result() functions of UnitTest and TestCase objects would return failures registered at TestCase and UnitTest scopes, respectively. 2018-05-07 14:09:37 -07:00
Gennadiy Civil
d7bf63d150 Merge pull request #1593 from Steelskin/fuchsia_death_test
Add death test support for Fuchsia.
2018-05-07 14:43:09 -04:00
Fabrice de Gans-Riberi
8ddbf2b894 Remove magic number 2018-05-03 13:57:51 -07:00
Fabrice de Gans-Riberi
15b94d8bf3 Style fix 2018-05-03 13:44:42 -07:00
Fabrice de Gans-Riberi
d8d7d68db5 Fix comments 2018-05-03 13:42:31 -07:00
Fabrice de Gans-Riberi
9806d532e8 Fix more stuff and get tests to pass 2018-05-03 12:06:45 -07:00
Fabrice de Gans-Riberi
c40505cc8c Get all the things to work. 2018-05-02 14:57:56 -07: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
Fabrice de Gans-Riberi
a2e6afcda7 Fix stuff 2018-05-01 18:43:55 -07:00
Fabrice de Gans-Riberi
03ac61b08b Add Fuchsia support for death test. 2018-05-01 16:22:09 -07:00
Gennadiy Civil
3fd52d30f9 Merge pull request #1589 from sgraham/rtti-build
Add no-exception and no-rtti to build matrix
2018-05-01 13:07:29 -04:00
Scott Graham
a437920a83 Add no-exception and no-rtti to build matrix 2018-05-01 09:34:13 -07:00
Gennadiy Civil
ad9cd4f203 Merge pull request #1588 from gennadiycivil/master
mostly 193547722
2018-04-25 13:28:20 -04:00
Gennadiy Civil
63e8124d63 merged 2018-04-25 13:16:19 -04:00
Gennadiy Civil
edaeb8bc88 merging, 2018-04-25 13:10:41 -04:00
Gennadiy Civil
1aa41b0718 Merge pull request #1582 from dnsunderland/parameterless
Introduce parameterless expectations
2018-04-19 18:44:01 -04:00
Gennadiy Civil
179c305b03 Merge branch 'master' into parameterless 2018-04-19 18:35:17 -04:00
Gennadiy Civil
a00be2afc6 Merge pull request #1580 from gennadiycivil/master
merging
2018-04-19 11:57:52 -04:00
Gennadiy Civil
8c56e0c06f reverting, test 2018-04-19 11:28:46 -04:00
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