Gennadiy Civil
b1bfdf0bf4
Small formatting change
...
And then we can merge
2018-08-16 15:10:07 -04:00
Gennadiy Civil
3c4f437c24
Merge branch 'master' into master
2018-08-15 11:33:15 -07:00
Gennadiy Civil
265efde9a5
Comments changes, no functionality changes.
2018-08-14 15:04:11 -04:00
Gennadiy Civil
a3c0dd0f4d
Comments changes, no functionality changes
2018-08-14 14:04:07 -04:00
Gennadiy Civil
2421eff9f7
Merge branch 'master' into deprecate
2018-08-14 08:47:13 -07:00
tisi1988
87a37c60e3
Merge branch 'master' into master
2018-08-14 15:32:22 +02:00
Gennadiy Civil
4d9411467d
code management comments, [ci-skip], no functionality changes
2018-08-09 12:21:49 -04:00
Loo Rong Jie
24786cb498
Merge branch 'master' into deprecate
2018-08-09 20:08:44 +08:00
tisi1988
efe27ac05c
Merge branch 'master' into master
2018-08-09 10:58:22 +02:00
Gennadiy Civil
b345bf9090
Formatting changes,small cleanup, no functionality changes
2018-08-07 11:49:47 -04:00
tisi1988
e9b05a4d6a
Merge branch 'master' into master
2018-08-07 11:12:00 +02:00
Gennadiy Civil
61f949387e
Merge branch 'master' into deprecate
2018-08-03 12:05:07 -04:00
tisi1988
25e1436b08
Merge branch 'master' into master
2018-08-01 12:11:18 +02:00
Gennadiy Civil
6269264dfe
Merge branch 'master' into deprecate
2018-07-30 16:11:06 -04:00
Gennadiy Civil
f978c651ed
Merge branch 'master' into master
2018-07-30 14:01:17 -04:00
Gennadiy Civil
984cba30ed
Formatting changes for automatic code management
2018-07-27 11:15:08 -04:00
Piotr Kąkol
309e8a271e
Updated broken and outdated URLs
2018-07-25 19:19:26 +02:00
tisi1988
1ae4fdb790
Merge branch 'master' into master
2018-07-23 10:10:26 +02:00
Gennadiy Civil
fd4f7cc729
Merge branch 'master' into deprecate
2018-07-20 15:53:16 -04:00
Gennadiy Civil
a02af2f689
code merge
2018-07-20 11:28:58 -04:00
Gennadiy Civil
1f9c668a04
Merge branch 'master' into deprecate
2018-07-19 11:07:10 -04:00
Gennadiy Civil
7e73a7ae6e
Formatting and a link
2018-07-18 11:17:19 -04:00
Loo Rong Jie
3a8d744030
Disable MSVC function deprecation when using Clang
2018-07-13 21:23:28 +08:00
tisi1988
de6e079f15
Merge branch 'master' into master
2018-07-12 11:06:08 +02:00
杜修杏
03ea2fdecb
VS2005 with SP1(_MSC_VER=1400) already supports __pragma
2018-06-29 11:19:46 +08:00
tisi1988
dfddc98718
FIX: Compilation warning with GCC regarding a non-initialised member from MutexBase class.
2018-06-27 22:49:04 +02:00
Gennadiy Civil
28c91e2cea
Formatting changes
2018-05-23 11:03:31 -04:00
Fabrice de Gans-Riberi
d4b5281d11
Add Fuchsia support for death test.
2018-05-01 16:22:09 -07: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
Gennadiy Civil
b2373c6f51
Revert "merging gtest-port 1 of N"
2018-03-29 13:28:29 -04:00
Gennadiy Civil
54bb165ffd
Revert "merging gtest-port, 2"
2018-03-29 13:27:11 -04:00
Gennadiy Civil
8e0364a37b
merging gtest-port, 2
2018-03-29 09:46:13 -04:00
Gennadiy Civil
aea6fc32aa
merging gtest-port 1 of N
2018-03-27 15:19:40 -04:00
Gennadiy Civil
3df7cbe6f7
merges, gtest
2018-03-26 13:04:28 -04:00
Gennadiy Civil
0f6567954f
more merges
2018-03-22 10:56:35 -04:00
Gennadiy Civil
691e38e518
More merges
2018-03-21 16:31:31 -04:00
Gennadiy Civil
2814b4b089
merging, merging
2018-03-13 16:02:05 -04:00
Gennadiy Civil
af463c43ac
More merges, removing old dead code
2018-03-13 11:13:37 -04:00
Gennadiy Civil
cf9d6344d2
merges-port(1)
2018-03-12 11:51:44 -04:00
Gennadiy Civil
89d6f70f34
merges-8
2018-03-05 15:53:36 -05:00
Gennadiy Civil
ce61dc54a2
Merge pull request #1423 from pcc/win-libcxx2
...
Use _CPPUNWIND instead of _HAS_EXCEPTIONS with MSVC.
2018-02-27 14:00:29 -05:00
Victor Costan
84ec2e0365
Switch default death test style back to "fast".
...
Google Test has recently (02/09/2018) switched the default death test
style from "fast" to "threadsafe" in
ec7faa943d
Threadsafe death tests have been used internally for a while, and are
proven to be a better default.
However, adopting this better default can be challenging for large
projects with a significant investment in custom infrastructure built on
top of Google Test. The same custom infrastructure can make it difficult
for large projects to switch back to the old default by passing in
--gtest_death_test_style=fast.
For the reasons above, the default switch is considered too disruptive,
and this CL reverts it. This CL also introduces the
GTEST_DEFAULT_DEATH_TEST_STYLE preprocesor macro, which replaces the
hard-coded default. The macro can be defined in
gtest/internal/custom/gtest-port.h by projects that are ready to migrate
to thread-safe death tests.
2018-02-27 07:50:03 -08:00
Gennadiy Civil
d4f77c1e3a
Merge branch 'master' into win-libcxx2
2018-02-27 10:00:29 -05:00
Gennadiy Civil
a3e322b24f
cleanup, merges
2018-02-13 15:25:57 -05:00