Gennadiy Civil
dce63bb4f5
Merge branch 'master' into unsigned-wchar
2018-02-26 12:08:48 -05:00
Gennadiy Civil
b7316299c6
Merge pull request #1472 from AndersSundmanTobii/master
...
Removed trailing comma in enum
2018-02-26 11:27:28 -05:00
Gennadiy Civil
f735c9f6fa
Merge branch 'master' into master
2018-02-26 11:14:34 -05:00
Gennadiy Civil
39c337e416
Merge pull request #1475 from gennadiycivil/master
...
merge check - 3
2018-02-26 10:10:58 -05:00
Gennadiy Civil
5fd9cb3a67
merging unittests - 5
2018-02-26 09:51:27 -05:00
Scott Graham
7c60f81b22
Try to handle unsigned wchar_t (arm) a bit better
2018-02-23 12:28:09 -08:00
Gennadiy Civil
aac61e939e
merging unitests - check 4
2018-02-23 15:27:11 -05:00
Gennadiy Civil
366ae2a30b
Merge branch 'master' of https://github.com/google/googletest
2018-02-23 11:51:40 -05:00
Gennadiy Civil
29bfe9aeaf
Merge pull request #1474 from gennadiycivil/master
...
merging unittests - 2
2018-02-23 11:51:30 -05:00
Gennadiy Civil
026c7e4c8f
merging unitests, check
2018-02-23 11:29:35 -05:00
Gennadiy Civil
05e1ffc031
merging unittests - 2
2018-02-23 11:07:18 -05:00
Gennadiy Civil
12c0806c22
Merge pull request #1473 from gennadiycivil/master
...
merging unitests
2018-02-23 11:02:53 -05:00
Gennadiy Civil
227b345566
merging unitests
2018-02-23 10:47:11 -05:00
Gennadiy Civil
cc04b87122
Merge pull request #1471 from aleksejkozin/patch-1
...
TEST() arguments are invalid in an example
2018-02-23 10:17:05 -05:00
Anders Sundman (asum)
8d0e9cade8
Removed trailing comma in enum
2018-02-23 14:55:24 +01:00
Aleksey Kozin
2d2b94f785
Merge branch 'master' into patch-1
2018-02-23 01:38:54 +03:00
Gennadiy Civil
f53aef0177
Merge pull request #1466 from pwnall/fix-death-warn
...
Fix unused function warning on Mac OS.
2018-02-22 17:37:41 -05:00
Aleksey Kozin
3357dad60d
TEST() arguments are invalid in an example
...
Both names must be valid C++ identifiers, and they should not contain underscore (`_`)
2018-02-23 01:34:26 +03:00
Gennadiy Civil
2eec92b84d
Merge branch 'master' into fix-death-warn
2018-02-22 16:34:27 -05:00
Gennadiy Civil
b6964847b6
Merge pull request #1469 from gennadiycivil/master
...
merges
2018-02-22 16:09:17 -05:00
Gennadiy Civil
964e433c37
merges
2018-02-22 15:53:14 -05:00
Victor Costan
d22c973604
Fix unused function warning on Mac OS.
...
As of recently, Google Test fails to compile with the warning below when
used in projects with strict warning settings.
googletest/src/gtest-death-test.cc:1004:13: error: unused function 'StackGrowsDown' [-Werror,-Wunused-function]
2018-02-19 02:02:59 -08:00
Gennadiy Civil
fd25c4ab41
Merge pull request #1450 from pwnall/fix-printers
...
Fix std::iscntrl use in gtest-printers.cc
2018-02-15 17:24:19 -05:00
Gennadiy Civil
5e595f9461
Merge branch 'master' into fix-printers
2018-02-15 15:41:39 -05:00
Gennadiy Civil
80e4a3627f
Merge pull request #1459 from gennadiycivil/master
...
cleanup, merges
2018-02-13 16:04:47 -05:00
Gennadiy Civil
f0f0b115d1
Merge branch 'master' of https://github.com/google/googletest
2018-02-13 15:26:07 -05:00
Gennadiy Civil
47607b5a5e
cleanup, merges
2018-02-13 15:25:57 -05:00
Gennadiy Civil
a668361cc5
Merge pull request #1458 from gennadiycivil/master
...
cleanup, merges
2018-02-13 15:24:31 -05:00
Gennadiy Civil
375585c3a3
Merge branch 'master' into fix-printers
2018-02-13 15:00:07 -05:00
Gennadiy Civil
75c7d791aa
Merge branch 'master' of https://github.com/google/googletest
2018-02-13 14:56:31 -05:00
Gennadiy Civil
551f80ffcb
cleanup/merges
2018-02-13 14:56:05 -05:00
Gennadiy Civil
dd527171f1
Merge pull request #1457 from gennadiycivil/master
...
merging, cleaning up
2018-02-13 14:51:34 -05:00
Gennadiy Civil
729d6dc865
merging, cleaning up
2018-02-13 14:13:52 -05:00
Gennadiy Civil
30667546c1
Merge pull request #1456 from gennadiycivil/master
...
merges
2018-02-13 14:13:16 -05:00
Gennadiy Civil
a5e9795dee
Merge branch 'master' of https://github.com/google/googletest
2018-02-13 13:50:52 -05:00
Gennadiy Civil
516a39cda7
merges
2018-02-13 13:49:57 -05:00
Gennadiy Civil
d82a4d2722
Merge pull request #1454 from gennadiycivil/master
...
merges
2018-02-13 12:26:47 -05:00
Gennadiy Civil
ccc4035c99
cxxx11
2018-02-13 11:48:32 -05:00
Gennadiy Civil
70e74eb482
clang warnings
2018-02-13 11:24:09 -05:00
Gennadiy Civil
95ecbcbb86
clang warnings
2018-02-13 11:15:03 -05:00
Gennadiy Civil
f9ab8f86bb
https://travis-ci.org/google/googletest/jobs/340995238
2018-02-13 11:05:01 -05:00
Gennadiy Civil
95cd910e81
clang warning ' https://travis-ci.org/google/googletest/jobs/340987201 '
2018-02-13 10:23:42 -05:00
Gennadiy Civil
7164a54bd4
clang warning https://travis-ci.org/google/googletest/jobs/340978022
2018-02-13 10:05:43 -05:00
Gennadiy Civil
ee0e251fe3
merges
2018-02-13 09:45:12 -05:00
Gennadiy Civil
1bee0353f4
Merge pull request #1452 from gennadiycivil/master
...
moving JoinAsTuple to internal
2018-02-12 16:57:08 -05:00
Gennadiy Civil
f96b4424a6
Merge branch 'master' of https://github.com/google/googletest
2018-02-12 16:42:43 -05:00
Gennadiy Civil
d40efb1166
moving JoinAsTuple to internal
2018-02-12 16:42:12 -05:00
Victor Costan
04f97d9c86
Fix std::iscntrl use in gtest-printers.cc
...
ContainsUnprintableControlCodes() in gtest-printers.cc passes a char
argument to std::iscntrl. Although its argument is an int, std::iscntrl
produces undefined behavior if its argument is not representable as an
unsigned char. The standard library on Windows asserts that the argument
is an unsigned char, resulting in an assertion crash on debug builds.
2018-02-12 13:02:07 -08:00
Gennadiy Civil
8ab6f1655d
Merge pull request #1451 from gennadiycivil/master
...
merges
2018-02-12 14:33:35 -05:00
Gennadiy Civil
174fc3ac42
Merge branch 'master' of https://github.com/google/googletest
2018-02-12 14:08:17 -05:00
