Gennadiy Civil
9f2c3d4cac
Code merges
2018-01-30 17:34:22 -05:00
Gennadiy Civil
6a913cadb6
Merge pull request #1434 from gennadiycivil/master
...
Ability to optionally depend on Abseil plus upstream of 183716547
2018-01-30 13:53:48 -05:00
Gennadiy Civil
735ae77a8f
Ability to optionally depend on Abseil plus upstream of 183716547
2018-01-30 11:42:03 -05:00
Gennadiy Civil
a9d9277584
Merge pull request #1430 from gennadiycivil/master
...
Adding tests to googlemock bazel
2018-01-29 09:35:22 -05:00
Gennadiy Civil
8a3cd4124e
Adding tests to googlemock bazel
2018-01-26 16:30:57 -05:00
Gennadiy Civil
baa26e0aab
Merge pull request #1429 from gennadiycivil/master
...
Code merges
2018-01-26 12:22:48 -05:00
Gennadiy Civil
7e5d65a589
Merge branch 'master' of https://github.com/google/googletest
2018-01-26 11:58:17 -05:00
Gennadiy Civil
05c81235a1
Code merges
2018-01-26 11:57:58 -05:00
Gennadiy Civil
f287af772e
Merge pull request #1428 from lidaobing/patch-2
...
Update Documentation.md
2018-01-26 10:50:22 -05:00
Gennadiy Civil
f9cb555edb
Merge pull request #1426 from stefanosoffia/fix_test_build_gcc7_2_0
...
Fix test build issue with GCC7.2 (with -Wno-error=)
2018-01-26 10:48:44 -05:00
LI Daobing
38205c4554
Update Documentation.md
2018-01-26 15:36:57 +08:00
Stefano Soffia
c669fb4384
Fix test build issue with GCC7.2.
2018-01-25 23:19:57 +01:00
Peter Collingbourne
bf92c203ea
Use _CPPUNWIND instead of _HAS_EXCEPTIONS with MSVC.
...
_HAS_EXCEPTIONS is specific to the MSVC STL and defining it to 0 causes
problems with libc++, so libc++ users may leave it undefined. This can
cause GTEST_HAS_EXCEPTIONS to be defined incorrectly if the user has
disabled exceptions via the compiler, which can lead to build errors.
_CPPUNWIND is a builtin macro provided by the compiler so it should
work with both STLs.
2018-01-25 14:15:43 -08:00
Peter Collingbourne
69205e815e
Pass -EHs-c- to disable exceptions with MSVC.
2018-01-25 14:15:43 -08:00
Gennadiy Civil
442bb38ff8
Update README.md
2018-01-25 10:12:56 -05:00
Gennadiy Civil
4184660d4a
Remove Visual Studio 10,11,12 from build matrix
2018-01-25 09:58:51 -05:00
Gennadiy Civil
f1d32a3606
Merge pull request #1421 from gennadiycivil/master
...
upstream cl 182543808
2018-01-24 16:31:29 -05:00
Gennadiy Civil
52f02b8a99
placating gcc and its overzeauls size comparison warnings
2018-01-24 16:06:08 -05:00
Gennadiy Civil
b79f9b94d5
Merge branch 'master' of https://github.com/google/googletest
2018-01-24 14:59:43 -05:00
Gennadiy Civil
a76cf562d6
Merge pull request #1418 from gennadiycivil/master
...
Many code merge/upstream changes
2018-01-24 14:57:08 -05:00
Gennadiy Civil
6da2cd7c70
upstream cl 182543808
2018-01-24 13:04:36 -05:00
Gennadiy Civil
9bee111e03
Merge branch 'master' of https://github.com/google/googletest
2018-01-24 12:36:05 -05:00
Gennadiy Civil
c8ffb81dbc
revert, lets get this compiled
2018-01-24 12:14:16 -05:00
Gennadiy Civil
72f0ea2a0a
Merge pull request #1410 from pcc/win-libcxx
...
Check whether _MSC_VER is defined when detecting presence of cxxabi.h…
2018-01-24 12:07:16 -05:00
Gennadiy Civil
bfd2406f79
Many code merge/upstream changes
2018-01-23 12:33:54 -05:00
Gennadiy Civil
370cdcdcba
Merge branch 'master' into win-libcxx
2018-01-23 12:32:44 -05:00
Gennadiy Civil
97ebc2a1e8
Merge pull request #1417 from gennadiycivil/master
...
merges, cl/155419551 and others
2018-01-23 12:32:00 -05:00
Gennadiy Civil
38258f1099
Merge branch 'master' of https://github.com/google/googletest
2018-01-23 10:16:38 -05:00
Gennadiy Civil
84fcb3339a
Merging, upstream http://cl/182836545
2018-01-23 10:15:28 -05:00
Gennadiy Civil
d54b4ce548
more code merge
2018-01-22 15:28:55 -05:00
Gennadiy Civil
325bdd33f3
merges, cl/155419551 and other
2018-01-22 15:20:19 -05:00
Gennadiy Civil
b5cf07f262
Merge pull request #1415 from gennadiycivil/master
...
code merge
2018-01-22 15:18:03 -05:00
Gennadiy Civil
c2c9847d5a
more merging
2018-01-22 14:43:51 -05:00
Gennadiy Civil
3cd811bb4a
merging
2018-01-22 14:14:05 -05:00
Gennadiy Civil
0e18369f97
code merge
2018-01-22 11:47:30 -05:00
Gennadiy Civil
00023d9fa8
Merge pull request #1401 from eidosmontreal/support_xboxone
...
Added support for WINAPI_PARTITION_TV_TITLE to support XboxOne applications
2018-01-19 11:59:36 -05:00
Gennadiy Civil
7e2564f4cf
Merge branch 'master' into support_xboxone
2018-01-18 17:42:34 -05:00
Gennadiy Civil
f2c8ff56a9
Merge branch 'master' into win-libcxx
2018-01-18 17:41:36 -05:00
Gennadiy Civil
ad25d31c03
Merge pull request #1412 from gennadiycivil/master
...
Adding python tests to Bazel build file.
2018-01-18 14:52:37 -05:00
Gennadiy Civil
67915e6edb
Adding python tests to Bazel build file.
2018-01-18 14:32:31 -05:00
Gennadiy Civil
017dd4d37d
Merge pull request #1407 from ted-xp/master
...
Expose ScopedTrace utility in public interface
2018-01-18 09:47:22 -05:00
Fedor Trushkin
60922662fe
Use fully qualified in examples
2018-01-18 10:38:25 +01:00
Fedor Trushkin
920639122c
Document ScopedTrace utility
2018-01-18 10:34:05 +01:00
Peter Collingbourne
4185169167
Check whether _MSC_VER is defined when detecting presence of cxxabi.h under libc++.
...
If _MSC_VER is defined, it means that we are using the Microsoft
ABI, so cxxabi.h (which is associated with the Itanium ABI) will not
be available.
2018-01-17 20:29:10 -08:00
Fedor Trushkin
4e1156e10c
Expose ScopedTrace utility in public interface
2018-01-17 16:41:59 +01:00
Gennadiy Civil
ffcabbd844
Merge pull request #1402 from gennadiycivil/master
...
Code merging
2018-01-15 18:48:35 -05:00
Gennadiy Civil
81b270392c
Reverting some changes, need to make the merge compile
2018-01-15 18:16:11 -05:00
Gennadiy Civil
01e9531d3e
Reverting some changes, need to make the merge compile
2018-01-15 17:39:33 -05:00
Gennadiy Civil
9faac7603b
Reverting some changes, need to make the merge compile
2018-01-15 17:36:45 -05:00
Gennadiy Civil
a4e5067656
Reverting some changes, need to make the merge compile
2018-01-15 17:34:46 -05:00