686 Commits

Author SHA1 Message Date
Gennadiy Civil
5bf664a82c Formatting changes 2018-05-23 11:03:31 -04:00
Gennadiy Civil
562c7fe59a Merge branch 'master' into unused-variable-fuchsia 2018-05-22 06:01:05 -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
Tanzinul Islam
7d7abbc2a4 Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116 2018-05-13 11:42:21 +01:00
Fabrice de Gans-Riberi
a8d39f2fdb Remove unused variable in Fuchsia. 2018-05-11 10:38:48 -07: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
Tanzinul Islam
3d306aadbb Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116 2018-05-05 19:53:33 +01: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
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
c0ffe6ed80 merging 2018-04-11 13:20:36 -04:00
Gennadiy Civil
2acb60eb5b merging 2018-04-10 16:34:21 -04:00
Gennadiy Civil
fed44cc0c2 merging 2018-04-10 16:22:50 -04:00
Gennadiy Civil
346f1f5734 merge 2018-04-10 16:10:34 -04:00
Gennadiy Civil
ec1df5b40f RE-Doing the merge, this time with gcc on mac in the PR so I can catch errors before merging the PR 2018-04-10 15:57:16 -04:00
Gennadiy Civil
3f59eb6a59 Revert "gmock actions 2" 2018-04-09 22:10:12 -04:00
Gennadiy Civil
4bc5a055bc this should be it 2018-04-09 16:13:45 -04:00
Gennadiy Civil
f9c57f3d48 yet more 2018-04-09 16:04:48 -04:00
Gennadiy Civil
d1a6cb501e formatting 2018-04-09 15:50:19 -04:00
Gennadiy Civil
b3d7edff1e more 2018-04-09 15:33:56 -04:00
Gennadiy Civil
e18a9f2562 more warnings 2018-04-06 11:26:12 -04:00
Gennadiy Civil
e8fb5a3fdc more MSVC warnings 2018-04-06 11:17:45 -04:00
Henry Fredrick Schreiner
fd9d5d7b5b Clean up cache non-advanced variable for subproject 2018-04-05 13:40:26 +02:00
Gennadiy Civil
c02289588b Merge branch 'master' into fix_locale_win 2018-04-04 13:58:55 -04:00
fo40225
be6dfba167 fix build break on locale windows 2018-04-04 23:16:16 +08:00
Gennadiy Civil
a36f3d1e6a Tweaking https://github.com/google/googletest/pull/1523 to exclude nacl 2018-04-04 11:06:09 -04:00
Gennadiy Civil
34e82f9eb5 Merge branch 'master' into int3 2018-04-03 16:31:59 -04:00
Gennadiy Civil
bd6296d44c Merge branch 'master' into int3 2018-04-03 16:27:32 -04:00
Gennadiy Civil
fdc03e450a Upstreaming, cl 191344765 2018-04-03 16:14:35 -04:00
Gennadiy Civil
06f96276f6 Merge branch 'master' into int3 2018-04-03 11:44:23 -04:00
Gennadiy Civil
f7e1b4f330 merging port, cont. 191443078 2018-04-03 11:38:30 -04:00
Gennadiy Civil
ffcd94d903 merging, cont - 2 2018-04-03 11:23:54 -04:00
Gennadiy Civil
5539444c20 merging gtest-port.h , 191439094 2018-04-03 11:06:20 -04:00
Gennadiy Civil
4534287cb6 merging, just comments format 2018-04-03 09:56:23 -04:00
Gennadiy Civil
98f4d5db7a testing, merge 2018-04-03 09:45:49 -04:00
Gennadiy Civil
c300e3085b Testing, gtest-port.h merge 2018-04-03 09:31:10 -04:00
Gennadiy Civil
b4d1bd371d merging gtest-port.h, again - 1 2018-04-02 14:22:24 -04:00
Tanzinul Islam
b81886229d Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116 2018-04-01 13:43:57 +01:00
Roland Leißa
8f7e029803 Merge branch 'master' into int3 2018-03-30 03:16:20 +02:00
Gennadiy Civil
73996ca508 Revert "merging gtest-port 1 of N" 2018-03-29 13:28:29 -04:00