98 Commits

Author SHA1 Message Date
Gennadiy Civil
135bd480e0 Small formatting change
And then we can merge
2018-08-16 15:10:07 -04:00
Gennadiy Civil
9b5ca3834a Merge branch 'master' into master 2018-08-15 11:33:15 -07:00
Gennadiy Civil
f0bcc9b875 Comments changes, no functionality changes. 2018-08-14 15:04:11 -04:00
Gennadiy Civil
bdc777e251 Comments changes, no functionality changes 2018-08-14 14:04:07 -04:00
Gennadiy Civil
23c6b5b54e Merge branch 'master' into deprecate 2018-08-14 08:47:13 -07:00
tisi1988
cf1d6b7516 Merge branch 'master' into master 2018-08-14 15:32:22 +02:00
Gennadiy Civil
b0ccde3526 code management comments, [ci-skip], no functionality changes 2018-08-09 12:21:49 -04:00
Loo Rong Jie
5201142b92 Merge branch 'master' into deprecate 2018-08-09 20:08:44 +08:00
tisi1988
32172f46fd Merge branch 'master' into master 2018-08-09 10:58:22 +02:00
Gennadiy Civil
c59e574e3f Formatting changes,small cleanup, no functionality changes 2018-08-07 11:49:47 -04:00
tisi1988
0c0670d08e Merge branch 'master' into master 2018-08-07 11:12:00 +02:00
Gennadiy Civil
5c4a9af533 Merge branch 'master' into deprecate 2018-08-03 12:05:07 -04:00
tisi1988
f416fb5c70 Merge branch 'master' into master 2018-08-01 12:11:18 +02:00
Gennadiy Civil
5e99cf9f73 Merge branch 'master' into deprecate 2018-07-30 16:11:06 -04:00
Gennadiy Civil
4cd6829191 Merge branch 'master' into master 2018-07-30 14:01:17 -04:00
Gennadiy Civil
821944fa56 Formatting changes for automatic code management 2018-07-27 11:15:08 -04:00
Piotr Kąkol
65e7d50e3e Updated broken and outdated URLs 2018-07-25 19:19:26 +02:00
tisi1988
18179ea5bf Merge branch 'master' into master 2018-07-23 10:10:26 +02:00
Gennadiy Civil
bded1ac252 Merge branch 'master' into deprecate 2018-07-20 15:53:16 -04:00
Gennadiy Civil
68683d415c code merge 2018-07-20 11:28:58 -04:00
Gennadiy Civil
1adf96fefb Merge branch 'master' into deprecate 2018-07-19 11:07:10 -04:00
Gennadiy Civil
974129ca2a Formatting and a link 2018-07-18 11:17:19 -04:00
Loo Rong Jie
3e978aa4bc Disable MSVC function deprecation when using Clang 2018-07-13 21:23:28 +08:00
tisi1988
4604172e18 Merge branch 'master' into master 2018-07-12 11:06:08 +02:00
杜修杏
4ab7eeaf7d VS2005 with SP1(_MSC_VER=1400) already supports __pragma 2018-06-29 11:19:46 +08:00
tisi1988
eb63f37d60 FIX: Compilation warning with GCC regarding a non-initialised member from MutexBase class. 2018-06-27 22:49:04 +02:00
Gennadiy Civil
5bf664a82c Formatting changes 2018-05-23 11:03:31 -04:00
Fabrice de Gans-Riberi
03ac61b08b Add Fuchsia support for death test. 2018-05-01 16:22:09 -07: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
Gennadiy Civil
73996ca508 Revert "merging gtest-port 1 of N" 2018-03-29 13:28:29 -04:00
Gennadiy Civil
148ec8fb4e Revert "merging gtest-port, 2" 2018-03-29 13:27:11 -04:00
Gennadiy Civil
be841c6ed1 merging gtest-port, 2 2018-03-29 09:46:13 -04:00
Gennadiy Civil
a81411ca4d merging gtest-port 1 of N 2018-03-27 15:19:40 -04:00
Gennadiy Civil
b7e7102bb3 merges, gtest 2018-03-26 13:04:28 -04:00
Gennadiy Civil
8dcfeca51f more merges 2018-03-22 10:56:35 -04:00
Gennadiy Civil
bc73e93ea5 More merges 2018-03-21 16:31:31 -04:00
Gennadiy Civil
5c87ce09b5 merging, merging 2018-03-13 16:02:05 -04:00
Gennadiy Civil
92be48af66 More merges, removing old dead code 2018-03-13 11:13:37 -04:00
Gennadiy Civil
2cb5677ab7 merges-port(1) 2018-03-12 11:51:44 -04:00
Gennadiy Civil
7ee36bdbea merges-8 2018-03-05 15:53:36 -05:00
Gennadiy Civil
80cd2a3c67 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
8921d82a1c 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
37cc7fb79a Merge branch 'master' into win-libcxx2 2018-02-27 10:00:29 -05:00
Gennadiy Civil
47607b5a5e cleanup, merges 2018-02-13 15:25:57 -05:00