aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge pull request #2595 from kuzkry:remove-workaround_msvc-warning-4355Matt Calabrese2019-12-131-8/+0
|\ | | | | | | PiperOrigin-RevId: 284234675
| * remove MSVC workaround: warning 4355Krystian Kuzniarek2019-11-221-8/+0
| |
* | Merge pull request #2592 from kuzkry:remove-workaround_msvc-error-C2665Matt Calabrese2019-12-131-9/+0
|\ \ | | | | | | | | | PiperOrigin-RevId: 284207090
| * | remove MSVC workaround: error C2665Krystian Kuzniarek2019-11-221-9/+0
| |/
* | Merge pull request #2609 from kuzkry:revert-2596Mark Barolak2019-12-061-3/+10
|\ \ | | | | | | | | | PiperOrigin-RevId: 284041013
| * | Revert "remove MSVC workaround: wmain link error in the static library"Krystian Kuzniarek2019-11-271-2/+9
| | | | | | | | | | | | This reverts commit 298a40f023e6813d2bf73847c3a38ceaf5e46320.
| * | Revert "unify googletest and googlemock main functions"Krystian Kuzniarek2019-11-271-1/+1
| | | | | | | | | | | | This reverts commit a909becdc599c46bcb57346b6123cb57cd07d15d.
* | | 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 droppingKrystian Kuzniarek2019-11-221-14/+3
| | |/ | |/|
* | | Googletest exportAbseil Team2019-12-021-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify use of IsTrue and IsFalse matchers. These matchers are subtle and confusing: what are they for? The docs in the code are clear, but not very accessible. googletest/googlemock/include/gmock/gmock-more-matchers.h PiperOrigin-RevId: 283393275
* | | Merge pull request #2603 from maximilianschwab:patch-1Mark Barolak2019-12-021-1/+1
|\ \ \ | | | | | | | | | | | | PiperOrigin-RevId: 283349646
| * | | Fixed typoMaximilian Schwab2019-11-251-1/+1
| | | |
* | | | Merge pull request #2583 from ChristophStrehle:masterGennadiy Rozental2019-11-271-1/+2
|\ \ \ \ | |_|_|/ |/| | | | | | | PiperOrigin-RevId: 282817206
| * | | Fix compile break for Microsoft Visual Studio 2017 v141Christoph 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 #2593 from ↵Gennadiy Rozental2019-11-261-9/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | kuzkry:remove-workaround_msvc-namespace-scope-from-nested-class PiperOrigin-RevId: 282593823
| * | | | remove MSVC workaround: accessing namespace scope from within nested classesKrystian Kuzniarek2019-11-221-9/+4
| | |_|/ | |/| |
* | | | Merge pull request #2596 from kuzkry:remove-workaround_msvc-wmain-link-errorGennadiy Rozental2019-11-261-10/+3
|\ \ \ \ | | | | | | | | | | | | | | | PiperOrigin-RevId: 282589492
| * | | | unify googletest and googlemock main functionsKrystian Kuzniarek2019-11-221-1/+1
| | | | |
| * | | | remove MSVC workaround: wmain link error in the static libraryKrystian Kuzniarek2019-11-221-9/+2
| |/ / /
* | | | 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: SafeMatcherCastImplKrystian Kuzniarek2019-11-221-49/+36
| | | |
| * | | consistency fix for SafeMatcherCastImpl member functionsKrystian Kuzniarek2019-11-221-1/+1
| |/ /
* | | Googletest exportAbseil Team2019-11-226-25/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Add a breadcrumb about nullopt comparison near the Optional() matcher. Also add a note about how otherwise-spurious 'Eq()' may be needed in some cases. Without this, something like Field(&MyStruct::optional_field_without_equals_equals, absl::nullopt) doesn't work - it converts the nullopt to an optional<> of the non-equalable type, and fails to select the operator==(optional<>, nullopt_t) overload. The Eq() lets the type persist later into the match. PiperOrigin-RevId: 281305519
* | | Googletest exportAbseil Team2019-11-192-2/+2
| |/ |/| | | | | | | | | Update stale comments to point to proper location. PiperOrigin-RevId: 281157036
* | Merge pull request #2556 from ienorand:avoid-pkg-config-lpthread-cflagAndy Getz2019-11-132-2/+2
|\ \ | | | | | | | | | PiperOrigin-RevId: 279375858
| * | pkg-config: Remove pthread link flag from CflagsMartin Erik Werner2019-11-052-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the threads link library variable references from the pkg-config Cflags: field, removing -lpthread(s) from the compile flags. "-l*" linker flags should only be part of the Libs: section and should not be part of the Cflags: section in pkg-config files. This was first suggested in https://github.com/google/googletest/pull/2006 and further discussed in https://github.com/google/googletest/pull/2483 .
* | | Merge pull request #2549 from kuzkry:pump-support-for-python-3Xiaoyi Zhang2019-11-051-6/+7
|\ \ \ | | | | | | | | | | | | PiperOrigin-RevId: 278702666
| * | | pump.py: add support for Python 3Krystian Kuzniarek2019-11-021-6/+7
| | |/ | |/|
* | | Merge pull request #2548 from kuzkry:update-pump-manualXiaoyi Zhang2019-11-051-12/+9
|\ \ \ | | | | | | | | | | | | PiperOrigin-RevId: 278702531
| * | | update pump_manual.mdKrystian Kuzniarek2019-11-021-12/+9
| |/ /
* / / fix a typoKrystian Kuzniarek2019-11-021-1/+1
|/ /
* | Merge pull request #2533 from thejcannon:noexcept_specvslashg2019-11-012-20/+51
|\ \ | | | | | | | | | PiperOrigin-RevId: 277924721
| * | Revert "Merge pull request #2498 from thejcannon:noexcept_spec"Joshua Cannon2019-10-232-20/+51
| | | | | | | | | | | | | | | 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 exportmisterg2019-10-302-1480/+0
| | | | | | | | | | | | | | | | | | Remove outdated unsupported scripts PiperOrigin-RevId: 277556831
* | | Googletest exportmisterg2019-10-297-175/+75
| | | | | | | | | | | | | | | | | | Internal Change PiperOrigin-RevId: 277336786
* | | Googletest exportmhermas2019-10-293-394/+440
| | | | | | | | | | | | | | | | | | | | | | | | | | | Merge 65032e28cba171c000accc85ffaf6f1e62921b86 into 8c91ecef292e963d23cd5b25f01ea1579fbe9aaa Closes #2470 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/googletest/pull/2470 from hermas55:bugfix/default_const_param 65032e28cba171c000accc85ffaf6f1e62921b86 PiperOrigin-RevId: 277118535
* | | 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-292-0/+40
|\ \ \ | | | | | | | | | | | | | | | | | | | | PiotrNycz:gmock_prevent_return_ref_to_store_temporaries_2 PiperOrigin-RevId: 277061341
| * | | variable names corrected (followed google coding style)Piotr Nycz2019-10-251-14/+14
| | | | | | | | | | | | | | | | Issue 2527
| * | | Apply 80chars limitPiotr Nycz2019-10-251-1/+2
| | | | | | | | | | | | | | | | Issue 2527
| * | | Tests simplified and names corrected (POD->scalar)Piotr Nycz2019-10-241-49/+18
| | | | | | | | | | | | | | | | Issue 2527
| * | | Added more tests to verify: ReturnRef not accept temporaryPiotr Nycz2019-10-231-15/+57
| | | | | | | | | | | | | | | | Issue 2471
| * | | Added tests verifying that temporaries are accepted by ReturnRefPiotr Nycz2019-10-221-0/+24
| | | | | | | | | | | | | | | | Issue no 2527
| * | | Prevent using ReturnRef on reference to temporaryPiotr Nycz2019-10-221-0/+4
| | | | | | | | | | | | | | | | Fixed issue: 2471
* | | | Googletest exportAbseil Team2019-10-291-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | Remove badly formatted suggestion in gmock cheat sheet. PiperOrigin-RevId: 277060475
* | | | Merge pull request #2388 from kuzkry:remove-gtest-type-util.pumpvslashg2019-10-293-0/+1227
|\ \ \ \ | | | | | | | | | | | | | | | PiperOrigin-RevId: 276944601
| * | | | move the pumping script to googlemockKrystian Kuzniarek2019-10-252-0/+1045
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 12:09:35 +0000