summaryrefslogtreecommitdiffstats
path: root/googletest/include/gtest/gtest-printers.h
Commit message (Collapse)AuthorAgeFilesLines
...
* cleanup/mergesGennadiy Civil2018-02-131-1/+1
|
* Merges and also adding new bazel build modeGennadiy Civil2018-01-311-1/+2
|
* Code mergesGennadiy Civil2018-01-301-15/+57
|
* Ability to optionally depend on Abseil plus upstream of 183716547Gennadiy Civil2018-01-301-0/+28
|
* Merge branch 'master' into uintptrGennadiy Civil2018-01-021-9/+13
|\
| * Swap reinterpret_cast for static_caststkhapugin@chromium.org2017-09-191-2/+2
| | | | | | | | Swap reinterpret_cast for static_cast
| * add a castStepan Khapugin2017-09-051-1/+2
| |
| * Infinite Loop when calling a mock function that takes ↵drgler2017-08-091-8/+11
| | | | | | | | boost::filesystem::path as parameter #521: Add is_same type trait and prevent infinite loops for recursive containers
* | Pass MSVC's C4826 warning.David Benjamin2017-08-071-7/+2
|/ | | | | | | | MSVC has an optional warning which flags when 32-bit pointers get cast into a 64-bit value. This is a little overaggressive I think, but to ease compiling in projects with aggressive warnings, fix this by just casting to const void * directly. Modern GCCs seem to compile it just fine.
* Merge pull request #1091 from nico/wmicroBilly Donahue2017-05-231-38/+51
|\ | | | | Fix -Wmicrosoft-cast warnings when using gtest with clang on Windows.
| * Fix -Wmicrosoft-cast warnings when using gtest with clang on Windows.Nico Weber2017-05-151-38/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Use std::string and ::string explicitly in gtest and gmock code.Nico Weber2017-05-151-5/+5
|/ | | | | | | | | 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.
* Move everything in googletest into googletest/googletestBilly Donahue2015-08-251-0/+993
OpenPOWER on IntegriCloud