Commit Graph

1035 Commits

Author SHA1 Message Date
misterg
4f5c01b4c9 Added googlemock tests 2017-08-09 12:15:00 -04:00
misterg
ac885f3ab2 WIP 2017-08-09 11:47:54 -04:00
misterg
ab8f2b0d09 WIP, win testing 2017-08-08 15:54:36 -04:00
misterg
e66b6bc868 WIP, win testing 2017-08-08 15:41:44 -04:00
misterg
40a909b4e5 WIP, windows testing 2017-08-08 15:37:38 -04:00
misterg
a2006b2ab0 WIP, windows testing 2017-08-08 15:34:40 -04:00
misterg
c75de0aa92 WIP, windows testing 2017-08-08 15:32:30 -04:00
misterg
8815087cfa WIP 2017-08-08 15:17:56 -04:00
misterg
aecea3842c Samples changes upstreaming 2017-08-07 13:25:03 -04:00
misterg
52a9c14c48 Samples changes upstreaming 2017-08-07 13:20:57 -04:00
misterg
aa31cb67c2 WIP 2017-08-02 15:40:14 -04:00
misterg
6615f7df11 WIP 2017-08-02 14:36:39 -04:00
misterg
b3edada290 WIP 2017-08-01 14:50:59 -04:00
misterg
f63e2a14a2 WIP 2017-08-01 14:36:29 -04:00
Gennadiy Civil
7755e5d241 Merge pull request #1167 from krizalys/fix-typo
Fixed typo
2017-07-31 16:55:33 -04:00
Gennadiy Civil
f08b1c350a Merge pull request #1165 from aninf-wo/hethi/fix-doc-links
fix links to Google C++ Style Guide
2017-07-31 13:02:53 -04:00
Christophe Vidal
623616a50a Fixed typo 2017-07-31 22:02:19 +07:00
Herbert Thielen
ec19d455bc fix links to Google C++ Style Guide 2017-07-30 17:05:48 +02:00
Gennadiy Civil
e5b88b227e Merge pull request #1137 from coryan/master
Fix table formatting.
2017-07-26 16:52:02 -04:00
Gennadiy Civil
6527ee0624 Merge pull request #1107 from lipk/patch-1
Minor grammar fix in docs.
2017-07-26 15:29:54 -04:00
Gennadiy Civil
75bb586b60 Merge pull request #1158 from junr03/fix-link
docs: fix broken link
2017-07-26 14:47:56 -04:00
Jose Nino
5c279131db docs: fix broken link 2017-07-26 10:58:05 -07:00
Gennadiy Civil
b9427ca477 Merge pull request #1143 from nyibbang/patch-1
Fixes a typo in FAQ.md
2017-07-26 13:36:50 -04:00
Gennadiy Civil
7c3496c4ae Merge pull request #1126 from junr03/fix-broken-link
docs: fix broken link from dummies guide to cook book
2017-07-26 13:27:32 -04:00
Vincent Palancher
4568374a6e Fixes a typo in FAQ.md 2017-07-05 14:12:58 +02:00
Carlos O'Ryan
0ffd8629c9 More tables that did not render correctly. 2017-07-01 22:34:51 -04:00
Carlos O'Ryan
2fcbc0c1ab Remove silly claim that C++ lacks lambdas.
The document itself uses lambdas later, all the scaffolding to
work around lack of lambdas should be considered for removal, but
that is much larger an effort than I can commit to.
2017-07-01 15:30:55 -04:00
Carlos O'Ryan
f20797bd8d Same fixes for "current" version. 2017-07-01 15:27:07 -04:00
Carlos O'Ryan
1dde1eed38 Fix typos too s/destoyed/destroyed/ 2017-07-01 15:26:42 -04:00
Carlos O'Ryan
280b22708c Fix table formatting.
The markdown was not working for a small table, fixed.
2017-07-01 09:51:45 -04:00
Billy Donahue
4bab34d208 Merge pull request #1081 from krytarowski/netbsd-1
Add NetBSD support
2017-06-23 19:35:25 -04:00
Billy Donahue
f050aff0c2 Merge pull request #1129 from Chris-Sharpe/master
Colouring in help text
2017-06-23 14:31:40 -04:00
Chris-Sharpe
19cace2873 Colouring in help text 2017-06-21 16:19:25 +01:00
Jose Nino
38ec2a1df6 docs: fix broken link from dummies guide to cook book 2017-06-19 14:27:39 -07:00
Billy Donahue
c2d90bddc6 Create gtest-internal.h 2017-06-11 18:34:04 -04:00
Billy Donahue
a44bbab9bd Merge pull request #1113 from jorgehb/patch-1
Fixing float comparison broken link
2017-06-11 18:21:29 -04:00
jorgehb
00ed9b566e Fixing float comparison broken link
Updating the link with a valid one. The old one was considered obsolete by the publisher.
2017-06-08 10:01:55 -04:00
lipk
dca9d5fc51 Remove unnecessary 'the'. 2017-05-30 17:29:32 +02:00
Billy Donahue
42bc671f47 Merge pull request #1091 from nico/wmicro
Fix -Wmicrosoft-cast warnings when using gtest with clang on Windows.
2017-05-23 11:10:42 -04:00
Billy Donahue
59c795ce08 Merge pull request #1096 from gennadiycivil/add-ability-for-custom-temdir-1093
Changes add ability to overwrite TempDir(), issue https://github.com/
2017-05-18 16:19:58 -04:00
Gennadiy Civil
76491b74de Changes add ability to overwrite TempDir(), issue https://github.com/google/googletest/issues/1093 2017-05-18 10:19:28 -04:00
Billy Donahue
7cc548dcbf Merge pull request #1089 from nico/stdstring
Use std::string and ::string explicitly in gtest and gmock code.
2017-05-16 17:00:03 -04:00
Billy Donahue
078d5d930a Merge pull request #1090 from nico/typo
Fixing typo in documentation.
2017-05-15 23:54:23 -04:00
Billy Donahue
2a5d67ccad Merge pull request #1092 from nico/comment
Gender-neutralize comments in gtest.h.
2017-05-15 21:26:10 -04:00
Nico Weber
e1466ba4fe Gender-neutralize comments in gtest.h.
This merges a Google-internal change.
2017-05-15 18:00:29 -04:00
Nico Weber
09fd5b3ebf Use std::string and ::string explicitly in gtest and gmock code.
This merges a Google-internal change (117235625).

Original CL description:
This CL was created manually in about an hour with sed, a Python script
to find all the places unqualified 'string' was mentioned, and some help
from Emacs to add the "std::" qualifications, plus a few manual tweaks.
2017-05-15 17:53:04 -04:00
Nico Weber
b2cbbec04c Fix -Wmicrosoft-cast warnings when using gtest with clang on Windows.
This upstreams a Google-internal change.

Original CL description:
The C++ standard says that function pointers are not implicitly
convertible to object pointers. Visual Studio disregards that and allows
implicit conversion between function pointers and object points, and
enough code relies on this that clang follows suit in
Microsoft-compatibility mode.

However, clang emits a -Wmicrosoft-cast warning when such a conversion
is done:

E:\b\c\b\win_clang\src\sandbox\win\src\sync_dispatcher.cc(42,7):
    warning: implicit conversion between pointer-to-function and
             pointer-to-object is a Microsoft extension [-Wmicrosoft-cast]

This change fixes this warning in gtest, while hopefully not changing
any behavior. The change does two things:

1. It replaces the if in DefaultPrintTo with SFINAE
2. In C++11 mode, it uses enable_if<is_function<>> instead of
   ImplicitlyConvertible<T*, const void*> to check if the
   explicit cast is needed.

With this change, functions will use the branch with the reintpret_casts
with Visual Studio and clang/win, and clang no longer needs to warn
that it implicitly converts a function pointer to a void pointer.
2017-05-15 17:21:25 -04:00
Nico Weber
6c0c8a7ea5 Fixing typo in documentation.
This upstreams a Google-internal change.
2017-05-15 17:12:19 -04:00
Billy Donahue
294f72bc77 Merge pull request #725 from donhuff/xcode-headers
Add missing headers to Xcode framework target.
2017-05-15 11:44:37 -04:00
Billy Donahue
8c7f93feda Merge pull request #1078 from pwnall/gtest_api_port
Pick up GTEST_API_ definition in gtest/internal/custom/gtest-port.h.
2017-05-10 22:10:01 -04:00