Commit Graph

1033 Commits

Author SHA1 Message Date
Gennadiy Civil
32ede4d41d Merge pull request #782 from Manozco/709-cmake-policy-project-version
Issue 709: Fix Cmake policy 0048
2017-08-02 17:06:45 -04:00
Gennadiy Civil
b3226d86bc Merge pull request #764 from flyd1005/wip-fix-typo
remove duplicated words
2017-08-02 17:04:33 -04:00
Gennadiy Civil
844e7f6bb6 Merge pull request #962 from klimkin/klimkin-patch-typo
Fix a typo
2017-08-02 16:55:50 -04:00
Gennadiy Civil
73883c5b05 Merge pull request #998 from dawikur/patch-1
Replace html entities with their equivalents
2017-08-02 16:47:31 -04:00
Gennadiy Civil
2386922e9d Merge pull request #968 from nicolacavallini/link_typed_test_docs
added link to sample 6 in the  documentation of typed test
2017-08-02 16:45:13 -04:00
Gennadiy Civil
3a773465de Merge pull request #1147 from pbos/gtest_parallel_link
Add gtest-parallel to open-source projects.
2017-08-01 14:53:18 -04:00
Gennadiy Civil
11db38986e Merge pull request #1167 from krizalys/fix-typo
Fixed typo
2017-07-31 16:55:33 -04:00
Gennadiy Civil
e276aa712d 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
76f3a0b4fe Fixed typo 2017-07-31 22:02:19 +07:00
Herbert Thielen
a659ce57f6 fix links to Google C++ Style Guide 2017-07-30 17:05:48 +02:00
Gennadiy Civil
7d602f7ea7 Merge pull request #1137 from coryan/master
Fix table formatting.
2017-07-26 16:52:02 -04:00
Gennadiy Civil
ea068d7aa1 Merge pull request #1107 from lipk/patch-1
Minor grammar fix in docs.
2017-07-26 15:29:54 -04:00
Gennadiy Civil
59773c9163 Merge pull request #1158 from junr03/fix-link
docs: fix broken link
2017-07-26 14:47:56 -04:00
Jose Nino
faa7dfd449 docs: fix broken link 2017-07-26 10:58:05 -07:00
Gennadiy Civil
1a70472893 Merge pull request #1143 from nyibbang/patch-1
Fixes a typo in FAQ.md
2017-07-26 13:36:50 -04:00
Gennadiy Civil
fd23ea7057 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
Peter Boström
6168d0db23 Add gtest-parallel to open-source projects. 2017-07-11 13:23:01 -07:00
Vincent Palancher
f010e26afe Fixes a typo in FAQ.md 2017-07-05 14:12:58 +02:00
Carlos O'Ryan
22cc7b5bc0 More tables that did not render correctly. 2017-07-01 22:34:51 -04:00
Carlos O'Ryan
a01a3117e9 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
1a04a39892 Same fixes for "current" version. 2017-07-01 15:27:07 -04:00
Carlos O'Ryan
5d9ffdd40c Fix typos too s/destoyed/destroyed/ 2017-07-01 15:26:42 -04:00
Carlos O'Ryan
a6fcdfbbc1 Fix table formatting.
The markdown was not working for a small table, fixed.
2017-07-01 09:51:45 -04:00
Billy Donahue
843fe11a0e Merge pull request #1081 from krytarowski/netbsd-1
Add NetBSD support
2017-06-23 19:35:25 -04:00
Billy Donahue
5d513430f1 Merge pull request #1129 from Chris-Sharpe/master
Colouring in help text
2017-06-23 14:31:40 -04:00
Chris-Sharpe
17c823fe70 Colouring in help text 2017-06-21 16:19:25 +01:00
Jose Nino
15d9b4a459 docs: fix broken link from dummies guide to cook book 2017-06-19 14:27:39 -07:00
Billy Donahue
b73cfb5887 Create gtest-internal.h 2017-06-11 18:34:04 -04:00
Billy Donahue
c9016b894c Merge pull request #1113 from jorgehb/patch-1
Fixing float comparison broken link
2017-06-11 18:21:29 -04:00
jorgehb
db948d695a 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
ff0be060c1 Remove unnecessary 'the'. 2017-05-30 17:29:32 +02:00
Billy Donahue
5fd8b4782a 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
1d9861300d 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
73a155fe54 Changes add ability to overwrite TempDir(), issue https://github.com/google/googletest/issues/1093 2017-05-18 10:19:28 -04:00
Billy Donahue
8afd5d19be 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
a1f6b6cdab Merge pull request #1090 from nico/typo
Fixing typo in documentation.
2017-05-15 23:54:23 -04:00
Billy Donahue
21fdcc02ed Merge pull request #1092 from nico/comment
Gender-neutralize comments in gtest.h.
2017-05-15 21:26:10 -04:00
Nico Weber
9ea4f468e5 Gender-neutralize comments in gtest.h.
This merges a Google-internal change.
2017-05-15 18:00:29 -04:00
Nico Weber
3ec8d72fc1 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
62d2a519ed 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
8fc77c3504 Fixing typo in documentation.
This upstreams a Google-internal change.
2017-05-15 17:12:19 -04:00
Billy Donahue
5f11a1cfd6 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
7927e99b3e 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
Billy Donahue
8005a0be06 Merge pull request #965 from davidben/format-attr
Annotate ColoredPrintf with the format attribute and fix bugs.
2017-05-07 01:07:16 -04:00
Kamil Rytarowski
76042375b1 Add NetBSD support
NetBSD is a modern UNIX-like Operating System.

Enable GTEST_HAS_PTHREAD and GTEST_HAS_DEATH_TEST on NetBSD.
2017-05-06 04:18:58 +02:00
Victor Costan
ca56e42c44 Pick up GTEST_API_ definition in gtest/internal/custom/gtest-port.h.
This makes it possible for a port to define the specifier used for
exported symbols without having to change Google Test.
2017-05-04 10:19:47 -07:00
Billy Donahue
c374b339d5 Merge pull request #1034 from dankegel/master
Minimal changes to fix build failures on Microsoft Visual Studio 2015
2017-05-02 14:53:21 -04:00
Billy Donahue
98acbfd080 Merge pull request #1077 from gennadiycivil/make-temp-dir-public-issue-1076
Changes to make TempDir() public
2017-05-02 14:52:05 -04:00
Gennadiy Civil
a446e0fbe1 Changes to make TempDir() public
Fixes #1076.
2017-05-02 14:16:11 -04:00
Dan Kegel
1f92ec6cfd Minimal changes to fix build failures on Microsoft Visual Studio 2015
Fixes the following errors:

hash_map(17): error C2338: <hash_map> is deprecated and will be REMOVED. Please use <unordered_map>. You can define _SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS to acknowledge that you have received this warning. [googlemock\gtest\gtest-printers_test.vcxproj]
hash_set(17): error C2338: <hash_set> is deprecated and will be REMOVED. Please use <unordered_set>. You can define _SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS to acknowledge that you have received this warning. [googlemock\gtest\gtest-printers_test.vcxproj]
googletest\test\gtest_catch_exceptions_test_.cc(152): error C2220: warning treated as error - no 'object' file generated
googletest\test\gtest_catch_exceptions_test_.cc(152): warning C4297: 'CxxExceptionInDestructorTest::~CxxExceptionInDestructorTest': function assumed not to throw an exception but does
  googletest\test\gtest_catch_exceptions_test_.cc(152): note: destructor or deallocator has a (possibly implicit) non-throwing exception specification

There were already some checks for _MSC_VER in the code, so this commit
continues in that vein.
2017-03-01 18:40:48 -08:00