Gennadiy Civil
2d136e5ec4
Merge branch 'master' into fuchsia-launchpad-removal
2018-06-04 18:00:20 +02:00
Gennadiy Civil
f66ab00704
Upstream, cl/199129756
...
Add printer for std::nullptr_t, addressing https://github.com/google/googletest/issues/1616
2018-06-04 10:45:56 -04:00
Fabrice de Gans-Riberi
93e267a999
Clean up
2018-05-31 11:21:01 -07:00
Fabrice de Gans-Riberi
0a6edf3ca7
Remvoe launchpad dependency from Fuchsia.
2018-05-30 18:17:35 -07:00
Gennadiy Civil
28c91e2cea
Formatting changes
2018-05-23 11:03:31 -04:00
Gennadiy Civil
32c84be0fc
Merge branch 'master' into unused-variable-fuchsia
2018-05-22 06:01:05 -07:00
James Dennett
49ecebd1f2
Downgrade to C++98.
...
Some projects cannot handle C++11 yet.
2018-05-21 12:27:52 -07:00
James Dennett
ec2c911b33
Downgrade to C++98 code.
...
Some users are not ready for C++11 yet.
2018-05-21 10:59:24 -07:00
James Dennett
89286a4cdf
Merge branch 'master' into StdLibVersioning
2018-05-21 10:57:01 -07:00
Fabrice de Gans-Riberi
f91bf75cf9
Remove unused variable in Fuchsia.
2018-05-11 10:38:48 -07:00
James Dennett
54e331b88b
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
fc66ae45fc
Update generated code.
2018-05-10 22:36:50 -07:00
James Dennett
b8fa4d2754
Add unit test for CanonicalizeForStdLibVersioning.
2018-05-10 22:33:29 -07:00
Jae Heon Lee
18abd8f512
Use NULL instead of nullptr, for pre-C++11 builds.
2018-05-09 13:03:57 -07:00
Jae Heon Lee
ec5ad0f869
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
Fabrice de Gans-Riberi
960149f913
Remove magic number
2018-05-03 13:57:51 -07:00
Fabrice de Gans-Riberi
242f0f623c
Style fix
2018-05-03 13:44:42 -07:00
Fabrice de Gans-Riberi
8497540f39
Fix comments
2018-05-03 13:42:31 -07:00
Fabrice de Gans-Riberi
13af91faff
Fix more stuff and get tests to pass
2018-05-03 12:06:45 -07:00
Fabrice de Gans-Riberi
96c3c422ad
Get all the things to work.
2018-05-02 14:57:56 -07:00
Fabrice de Gans-Riberi
b6cb5c3e40
Fix stuff
2018-05-01 18:43:55 -07:00
Fabrice de Gans-Riberi
d4b5281d11
Add Fuchsia support for death test.
2018-05-01 16:22:09 -07:00
Gennadiy Civil
c13ab6003b
merging
2018-04-11 13:20:36 -04:00
Gennadiy Civil
6f9db26159
merging
2018-04-10 16:34:21 -04:00
Gennadiy Civil
9bc82ce725
merging
2018-04-10 16:22:50 -04:00
Gennadiy Civil
39c58da187
merge
2018-04-10 16:10:34 -04:00
Gennadiy Civil
e1071eb949
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
ca54b67303
Revert "gmock actions 2"
2018-04-09 22:10:12 -04:00
Gennadiy Civil
c1d4c34233
this should be it
2018-04-09 16:13:45 -04:00
Gennadiy Civil
f5871009e6
yet more
2018-04-09 16:04:48 -04:00
Gennadiy Civil
05b5a53898
formatting
2018-04-09 15:50:19 -04:00
Gennadiy Civil
57d6e824b4
more
2018-04-09 15:33:56 -04:00
Gennadiy Civil
cb13dc759c
more warnings
2018-04-06 11:26:12 -04:00
Gennadiy Civil
d9f3611a22
more MSVC warnings
2018-04-06 11:17:45 -04:00
Gennadiy Civil
fbe3c94533
Merge branch 'master' into fix_locale_win
2018-04-04 13:58:55 -04:00
fo40225
a0c27bd8a5
fix build break on locale windows
2018-04-04 23:16:16 +08:00
Gennadiy Civil
1776ed8c1e
Tweaking https://github.com/google/googletest/pull/1523 to exclude nacl
2018-04-04 11:06:09 -04:00
Gennadiy Civil
98687b7847
Merge branch 'master' into int3
2018-04-03 16:31:59 -04:00
Gennadiy Civil
18be012457
Merge branch 'master' into int3
2018-04-03 16:27:32 -04:00
Gennadiy Civil
d52aaee8eb
Upstreaming, cl 191344765
2018-04-03 16:14:35 -04:00
Gennadiy Civil
27507429cb
Merge branch 'master' into int3
2018-04-03 11:44:23 -04:00
Gennadiy Civil
a2dd136578
merging port, cont. 191443078
2018-04-03 11:38:30 -04:00
Gennadiy Civil
aa349acb07
merging, cont - 2
2018-04-03 11:23:54 -04:00
Gennadiy Civil
2cedd5b9c1
merging gtest-port.h , 191439094
2018-04-03 11:06:20 -04:00
Gennadiy Civil
04d1e56bd2
merging, just comments format
2018-04-03 09:56:23 -04:00
Gennadiy Civil
5beb452bbe
testing, merge
2018-04-03 09:45:49 -04:00
Gennadiy Civil
df5a48da03
Testing, gtest-port.h merge
2018-04-03 09:31:10 -04:00
Gennadiy Civil
87a4cdddd0
merging gtest-port.h, again - 1
2018-04-02 14:22:24 -04:00
Roland Leißa
b1d18b85bd
Merge branch 'master' into int3
2018-03-30 03:16:20 +02:00
Gennadiy Civil
b2373c6f51
Revert "merging gtest-port 1 of N"
2018-03-29 13:28:29 -04:00