aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into googletest_for_asamduxiuxing2018-07-193-204/+3
|\
| * Code sync, mostly formatting and removing outdatesGennadiy Civil2018-07-182-203/+2
| |
| * Formatting and a linkGennadiy Civil2018-07-181-1/+1
| |
* | Fix warning C4819: The file contains a character that cannot be represented ↵duxiuxing2018-07-173-21/+21
|/ | | | in the current code page (936). Save the file in Unicode format to prevent data loss
* Put ifdef guard after the includes.Adrian Moran2018-07-131-1/+1
| | | | Signed-off-by: Adrian Moran <amoran@ikerlan.es>
* Avoid full test in no exceptions are enabled.Adrian Moran2018-07-121-5/+2
| | | | Signed-off-by: Adrian Moran <amoran@ikerlan.es>
* Fix issue #1654.Adrian Moran2018-07-111-0/+2
| | | | Signed-off-by: Adrian Moran <amoran@ikerlan.es>
* Removed "Documentation.md" not adding value and not consitent with internal docsGennadiy Civil2018-06-111-1/+0
|
* Rename AdvancedGuide.md to advanced.md and adjust the links. Gennadiy Civil2018-06-113-3/+3
| | | Part of documentation rationalization work
* Rename "Primer.md" to "primer.md" and adjust links. Part of the documentaion ↵Gennadiy Civil2018-06-112-9/+9
| | | | rationalzation
* formatting changes Gennadiy Civil2018-05-232-6/+5
|
* Formatting changes Gennadiy Civil2018-05-232-2/+2
|
* Fix gmock not building when -fno-rttiScott Graham2018-05-022-8/+6
| | | | Fixes issue #1554. This is internal cl/195020996.
* mergedGennadiy Civil2018-04-251-1/+0
|\
| * Merge branch 'master' into parameterlessGennadiy Civil2018-04-191-112/+93
| |\
| * | Fix friend declaration to use GTEST_API_ decl spec.David Sunderland2018-04-191-1/+1
| | |
| * | Revert useless use of GTEST_API_ on WithoutMatchers decl.David Sunderland2018-04-191-1/+1
| | |
| * | Add GTEST_API_ tag to WithoutMatchers class. Hopefully that fixes the ↵David Sunderland2018-04-181-1/+1
| | | | | | | | | | | | problem on MSVC?
| * | Mark new GetWithoutMatchers method as part of the exported API, to address ↵David Sunderland2018-04-182-2/+2
| | | | | | | | | | | | MSVC linker errors.
| * | Merge branch 'parameterless' of https://github.com/dnsunderland/googletest ↵David Sunderland2018-04-185-270/+438
| |\ \ | | | | | | | | | | | | into parameterless
| | * \ Merge branch 'master' into parameterlessdnsunderland2018-04-185-270/+438
| | |\ \
| * | | | Don't use generalized initializer list; is C++11 extension.David Sunderland2018-04-181-1/+1
| |/ / /
| * | | Clone of unsubmitted cr/176529515. Introduce parameterless expectations.David Sunderland2018-04-187-13/+426
| | | |
* | | | merging, Gennadiy Civil2018-04-258-493/+929
| |_|/ |/| |
* | | reverting, testGennadiy Civil2018-04-191-13/+3
| | |
* | | reverting just to test Gennadiy Civil2018-04-191-1/+1
| | |
* | | testingGennadiy Civil2018-04-191-12/+12
| | |
* | | more typosGennadiy Civil2018-04-181-1/+1
| | |
* | | msvcGennadiy Civil2018-04-181-8/+6
| | |
* | | more typosGennadiy Civil2018-04-181-3/+2
| | |
* | | typoGennadiy Civil2018-04-181-7/+7
| | |
* | | move only types docsGennadiy Civil2018-04-181-112/+93
| | |
* | | typoGennadiy Civil2018-04-181-0/+4
| | |
* | | typoGennadiy Civil2018-04-181-1/+1
| | |
* | | http://cl/193386206Gennadiy Civil2018-04-181-0/+9
| | |
* | | merge, explicit, ( should be it)Gennadiy Civil2018-04-181-1/+1
| |/ |/|
* | 193353312Gennadiy Civil2018-04-182-4/+16
| |
* | cl/193060888Gennadiy Civil2018-04-171-3/+3
| |
* | http://cl/193060888Gennadiy Civil2018-04-171-30/+6
| |
* | http://cl/193060888Gennadiy Civil2018-04-172-5/+55
| |
* | test-meergingGennadiy Civil2018-04-162-34/+6
| |
* | typoGennadiy Civil2018-04-161-1/+1
| |
* | more msvcGennadiy Civil2018-04-161-1/+2
| |
* | typoGennadiy Civil2018-04-161-1/+1
| |
* | msvc warningsGennadiy Civil2018-04-161-0/+11
| |
* | merging gmock generated matchersGennadiy Civil2018-04-163-268/+414
|/
* merging, testing, this should be itGennadiy Civil2018-04-161-1/+1
|
* mergingGennadiy Civil2018-04-161-3/+2
|
* mergingGennadiy Civil2018-04-161-2/+3
|
* more pizzaGennadiy Civil2018-04-131-3/+2
|