summaryrefslogtreecommitdiffstats
path: root/googlemock/include
Commit message (Collapse)AuthorAgeFilesLines
* Export Test - Do Not MergeAbseil Team2019-12-133-175/+40
| | | | | | | | Use C++11 variadic templates for ActionHelper in gmock-generated-actions.h. Make ActionHelper use variadic templates to generate Perform static member function specializations instead of using pump.py syntax. PiperOrigin-RevId: 284988441
* Merge pull request #2595 from kuzkry:remove-workaround_msvc-warning-4355Matt Calabrese2019-12-131-8/+0
|\ | | | | | | PiperOrigin-RevId: 284234675
| * remove MSVC workaround: warning 4355refs/pull/2595/headKrystian Kuzniarek2019-11-221-8/+0
| |
* | Merge pull request #2594 from ↵Mark Barolak2019-12-051-17/+4
|\ \ | | | | | | | | | | | | | | | kuzkry:remove-workaround_msvc-unneeded-const-dropping PiperOrigin-RevId: 283979494
| * | remove MSVC workaround: cease const droppingrefs/pull/2594/headKrystian Kuzniarek2019-11-221-14/+3
| |/
* | Merge pull request #2583 from ChristophStrehle:masterGennadiy Rozental2019-11-271-1/+2
|\ \ | | | | | | | | | PiperOrigin-RevId: 282817206
| * | Fix compile break for Microsoft Visual Studio 2017 v141refs/pull/2583/headChristoph Strehle2019-11-211-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | This is a workaround, for those who have to compile with v141 build tools, for a bug in msvc that the compiler can't compile the WithArgsAction. see the following link for more details: https://developercommunityapi.westus.cloudapp.azure.com/content/problem/420339/googlemocks-withargs-doesnt-compile-with-permissiv.html
* | | Merge pull request #2597 from ↵Gennadiy Rozental2019-11-261-49/+36
|\ \ \ | | | | | | | | | | | | | | | | | | | | kuzkry:remove-workaround_Nokia-Sybian-SafeMatcherCastImpl PiperOrigin-RevId: 282581402
| * | | remove Nokia's Symbian compiler workaround: SafeMatcherCastImplrefs/pull/2597/headKrystian Kuzniarek2019-11-221-49/+36
| | | |
| * | | consistency fix for SafeMatcherCastImpl member functionsKrystian Kuzniarek2019-11-221-1/+1
| | |/ | |/|
* | | Googletest exportAbseil Team2019-11-223-9/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use standard C++11 integer types in gtest-port.h. Remove testing::internal::{Int,Uint}{32,64} in favor of types guaranteed to be in <cstdint> since C++11. Tests for built-in integer type coverage are switched from {Int,Uint}64 to [unsigned] long long, which is guaranteed by C++11 to exist and be at least 64-bit wide. PiperOrigin-RevId: 281565263
* | | Googletest exportAbseil Team2019-11-192-2/+2
| |/ |/| | | | | | | | | Update stale comments to point to proper location. PiperOrigin-RevId: 281157036
* | fix a typorefs/pull/2547/headKrystian Kuzniarek2019-11-021-1/+1
|/
* Merge pull request #2533 from thejcannon:noexcept_specvslashg2019-11-011-20/+22
|\ | | | | | | PiperOrigin-RevId: 277924721
| * Revert "Merge pull request #2498 from thejcannon:noexcept_spec"refs/pull/2533/headJoshua Cannon2019-10-231-20/+22
| | | | | | | | | | This reverts commit ba513d2c9525a7c986c115ed5d603f2cf17c6016, reversing changes made to a3ca5b9e0bf9abc3bc639684966085c4d3182578.
* | Googletest exportAbseil Team2019-10-311-4/+4
| | | | | | | | | | | | Change variable name to match comment. PiperOrigin-RevId: 277713621
* | Googletest exportAbseil Team2019-10-311-2/+1
| | | | | | | | | | | | Tolerate std::string's explicit copy construction from std::string_view. PiperOrigin-RevId: 277583394
* | Googletest exportAbseil Team2019-10-291-1/+3
| | | | | | | | | | | | | | | | Avoid temporary matcher instances. They are unnecessary and can be relatively more expensive than the rest of the algorithm. PiperOrigin-RevId: 277084853
* | Merge pull request #2527 from ↵vslashg2019-10-291-0/+4
|\ \ | | | | | | | | | | | | | | | PiotrNycz:gmock_prevent_return_ref_to_store_temporaries_2 PiperOrigin-RevId: 277061341
| * | Prevent using ReturnRef on reference to temporaryPiotr Nycz2019-10-221-0/+4
| | | | | | | | | | | | Fixed issue: 2471
* | | Googletest exportAbseil Team2019-10-231-0/+47
| |/ |/| | | | | | | | | Add a matcher `testing::ReturnRoundRobin` which, on each call, returns the next element in the sequence, restarting at the beginning once it has reached the end. PiperOrigin-RevId: 276312136
* | Merge pull request #2514 from thejcannon:msvc_macro_issuevslashg2019-10-231-77/+31
|\ \ | | | | | | | | | PiperOrigin-RevId: 276134684
| * | Avoid recursive macrosrefs/pull/2514/headJoshua Cannon2019-10-111-22/+28
| | |
| * | Removing extraneous parenthesisJoshua Cannon2019-10-111-1/+1
| | |
| * | Evaluate and cat NARG in different macrosJoshua Cannon2019-10-111-8/+8
| | |
| * | Fix preprocessor testsJoshua Cannon2019-10-111-3/+1
| | |
| * | Workaround MSVC VA_ARGS weirdnessJoshua Cannon2019-10-111-66/+19
| | |
* | | Googletest exportAbseil Team2019-10-222-66/+28
| | | | | | | | | | | | | | | | | | | | | | | | Remove bool_constant in favor of std::integral_constant<bool, ...>; The one non-trivial use of bool_constant has been changed to have significantly fewer template specializations. PiperOrigin-RevId: 275842490
* | | Googletest exportAbseil Team2019-10-221-2/+24
| |/ |/| | | | | | | | | Rolling forward IsNan() matcher with fixes in test for -Wconversion issues. Use std::nanf and std::nanl where appropriate. PiperOrigin-RevId: 275523003
* | Googletest exportmisterg2019-10-181-24/+2
| | | | | | | | | | | | Added IsNan matcher PiperOrigin-RevId: 275473218
* | Googletest exportAbseil Team2019-10-181-4/+25
| | | | | | | | | | | | | | | | Addressing https://github.com/google/googletest/issues/2502 Add MOCK_METHOD support for returning function pointers. PiperOrigin-RevId: 275323671
* | Googletest exportAbseil Team2019-10-171-2/+24
| | | | | | | | | | | | Added IsNan matcher PiperOrigin-RevId: 275278634
* | Add more override keywordsrefs/pull/2507/headRobert Luberda2019-10-114-62/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Mark more functions with "override" keyword, just like it was done in commit 2460f97152c. This should prevent compiler from complaining while compiling both user code, and the googletest code itself with the -Wsuggest-override option turned on; with the exception of: * calls to new MOCK_METHOD() in test/gmock-function-mocker_test.cc * calls to old MOCK_METHODx()/MOCK_CONST_METHODx() in other unit test files. Closes #2493
* | Merge pull request #2498 from thejcannon:noexcept_specGennadiy Civil2019-10-111-22/+20
|\ \ | | | | | | | | | PiperOrigin-RevId: 274155281
* \ \ Merge pull request #2498 from thejcannon:noexcept_specGennadiy Civil2019-10-111-20/+22
|\ \ \ | |/ / | | | | | | PiperOrigin-RevId: 274097989
| * | Fix spacingJoshua Cannon2019-10-071-3/+3
| | |
| * | Use the verbatim noexcept spec in MOCKED_METHODJoshua Cannon2019-10-071-10/+14
| |/
* | Googletest exportAbseil Team2019-10-111-2/+1
| | | | | | | | | | | | | | Fix the O(n^2) number of instantiations in ElemFromList. It is now O(n). It still has O(1) instantiation depth. PiperOrigin-RevId: 273980821
* | Merge pull request #2448 from kuzkry:bad-googletest-exportGennadiy Civil2019-10-102-4/+2
|\ \ | |/ |/| | | PiperOrigin-RevId: 273585026
| * square away the stuff that hasn't been merged in a manual reviewKrystian Kuzniarek2019-09-162-4/+2
| | | | | | | | | | This fixes up ab8f346b (a manual merge) that has abandoned some things from PR #2395.
* | Googletest exportAbseil Team2019-09-271-2/+4
|/ | | | | | Makes testing::ResultOf() work with non-copyable arguments. PiperOrigin-RevId: 271222632
* Googletest exportkuzkry2019-09-162-17/+16
| | | | | | | | | Merge 3bdefdb473d304803d2a38e2a2cd5cdc1827c3bd into fb49e6c164490a227bbb7cf5223b846c836a0305 Closes #2407 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/googletest/pull/2407 from kuzkry:StaticAssertTypeEq 3bdefdb473d304803d2a38e2a2cd5cdc1827c3bd PiperOrigin-RevId: 269255328
* Merge pull request #2387 from kuzkry:iffShaindel Schwartz2019-09-125-56/+64
|\ | | | | | | PiperOrigin-RevId: 268693457
| * restore mistakenly removed iffs in their explicit formrefs/pull/2387/headKrystian Kuzniarek2019-08-205-56/+64
| | | | | | | | | | Due to confusion arisen from "iff" standing for "if and only if", this commit uses the latter.
* | Googletest exportHosein Ghahremanzadeh2019-09-121-2/+2
| | | | | | | | | | | | | | | | | | Merge 4c9ef099b29d2c840c04643cd9662fd7be712f7b into 565f1b848215b77c3732bca345fe76a0431d8b34 Closes #2403 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/googletest/pull/2403 from IYP-Programer-Yeah:remove-compile-assert-type-equal 4c9ef099b29d2c840c04643cd9662fd7be712f7b PiperOrigin-RevId: 268681883
* | Googletest exportkuzkry2019-09-063-9/+4
| | | | | | | | | | | | | | | | | | Merge 7f4f58da20e1066a888d3e4bcbef541db798a605 into 90a443f9c2437ca8a682a1ac625eba64e1d74a8a Closes #2395 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/googletest/pull/2395 from kuzkry:custom-type-traits-remove_reference 7f4f58da20e1066a888d3e4bcbef541db798a605 PiperOrigin-RevId: 266189044
* | Merge pull request #2426 from kuzkry:#2396-postreviewGennadiy Civil2019-08-281-9/+9
|\ \ | | | | | | | | | PiperOrigin-RevId: 265785837
| * | post-review to db1b7399 (#2396)refs/pull/2426/headKrystian Kuzniarek2019-08-241-9/+9
| | |
* | | Merge pull request #2382 from kuzkry:dead-metafunctionGennadiy Civil2019-08-271-13/+0
|\ \ \ | | | | | | | | | | | | PiperOrigin-RevId: 265730482
| * | | remove a dead metafunctionrefs/pull/2382/headKrystian Kuzniarek2019-08-161-13/+0
| | | |
generated by cgit v0.12 at 2024-10-31 06:46:59 (GMT)