Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1551 from gennadiycivil/master | Gennadiy Civil | 2018-04-09 | 13 | -27/+303 |
|\ | | | | | gmock actions 2 | ||||
| * | ... and this | Gennadiy Civil | 2018-04-09 | 1 | -8/+4 |
| | | |||||
| * | this should be it | Gennadiy Civil | 2018-04-09 | 1 | -4/+0 |
| | | |||||
| * | yet more | Gennadiy Civil | 2018-04-09 | 2 | -4/+4 |
| | | |||||
| * | formatting | Gennadiy Civil | 2018-04-09 | 4 | -4/+7 |
| | | |||||
| * | tuning | Gennadiy Civil | 2018-04-09 | 1 | -1/+1 |
| | | |||||
| * | tuning | Gennadiy Civil | 2018-04-09 | 1 | -3/+7 |
| | | |||||
| * | more | Gennadiy Civil | 2018-04-09 | 1 | -6/+9 |
| | | |||||
| * | cont | Gennadiy Civil | 2018-04-09 | 1 | -3/+0 |
| | | |||||
| * | msvc | Gennadiy Civil | 2018-04-09 | 2 | -12/+13 |
| | | |||||
| * | more msvc | Gennadiy Civil | 2018-04-09 | 2 | -16/+15 |
| | | |||||
| * | msvc 14 | Gennadiy Civil | 2018-04-09 | 2 | -14/+16 |
| | | |||||
| * | testing msvc again | Gennadiy Civil | 2018-04-09 | 2 | -16/+14 |
| | | |||||
| * | More msvc 14 | Gennadiy Civil | 2018-04-09 | 1 | -0/+16 |
| | | |||||
| * | And also silence for MSVS14 | Gennadiy Civil | 2018-04-09 | 1 | -2/+2 |
| | | |||||
| * | preproc syntax ( I can never remember it) | Gennadiy Civil | 2018-04-09 | 1 | -5/+9 |
| | | |||||
| * | syntax | Gennadiy Civil | 2018-04-09 | 1 | -2/+2 |
| | | |||||
| * | cont. | Gennadiy Civil | 2018-04-09 | 1 | -2/+2 |
| | | |||||
| * | continued | Gennadiy Civil | 2018-04-09 | 5 | -7/+8 |
| | | |||||
| * | Merge branch 'master' of github.com:google/googletest | Gennadiy Civil | 2018-04-09 | 1 | -30/+60 |
| |\ | |/ |/| | |||||
* | | Merge pull request #1552 from pwnall/mock-pump | Gennadiy Civil | 2018-04-09 | 1 | -30/+60 |
|\ \ | | | | | | | Sync gmock-generated-nice-strict.h.pump with gmock-generated-nice-strict.h | ||||
| * | | Sync gmock-generated-nice-strict.h.pump with gmock-generated-nice-strict.h. | Victor Costan | 2018-04-06 | 1 | -30/+60 |
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit fe402c27790ff1cc9a7e17c5d0aea4ebe7fd8a71 published the changes in internal CL 156157936, but missed the diff in gmock-generated-nice-strict.h.pump. This makes it difficult to reason about the change, because the .pump file is more concise than the generated file. This PR was tested by re-generating the .h file using the command below and checking the git diff. ./googletest/scripts/pump.py \ googlemock/include/gmock/gmock-generated-nice-strict.h.pump | ||||
| * | more mcvs fixing | Gennadiy Civil | 2018-04-06 | 1 | -0/+12 |
| | | |||||
| * | linkage, fixing MSVC | Gennadiy Civil | 2018-04-06 | 1 | -1/+1 |
| | | |||||
| * | fixing MSVC | Gennadiy Civil | 2018-04-06 | 2 | -1/+3 |
| | | |||||
| * | more warnings | Gennadiy Civil | 2018-04-06 | 1 | -0/+12 |
| | | |||||
| * | more warnings | Gennadiy Civil | 2018-04-06 | 1 | -0/+1 |
| | | |||||
| * | more MSVC warnings | Gennadiy Civil | 2018-04-06 | 1 | -0/+11 |
| | | |||||
| * | warnings | Gennadiy Civil | 2018-04-06 | 1 | -1/+2 |
| | | |||||
| * | cont - 2 | Gennadiy Civil | 2018-04-06 | 1 | -1/+1 |
| | | |||||
| * | cont | Gennadiy Civil | 2018-04-06 | 1 | -1/+1 |
| | | |||||
| * | more warnings | Gennadiy Civil | 2018-04-06 | 1 | -1/+1 |
| | | |||||
| * | deal with MSVC warn, cont 1 | Gennadiy Civil | 2018-04-06 | 1 | -2/+1 |
| | | |||||
| * | Cont. deal with MCVS warnings | Gennadiy Civil | 2018-04-06 | 2 | -2/+16 |
| | | |||||
| * | Deal with MCVS warnings | Gennadiy Civil | 2018-04-06 | 1 | -0/+6 |
| | | |||||
| * | Merge branch 'master' of github.com:google/googletest | Gennadiy Civil | 2018-04-06 | 0 | -0/+0 |
| |\ | |/ |/| | |||||
* | | Merge pull request #1549 from gennadiycivil/master | Gennadiy Civil | 2018-04-05 | 9 | -420/+573 |
|\ \ | | | | | | | Merging gMock, 2 | ||||
| | * | merging gmock-actions 2 | Gennadiy Civil | 2018-04-06 | 2 | -18/+216 |
| |/ | |||||
| * | Merge branch 'master' of github.com:google/googletest | Gennadiy Civil | 2018-04-05 | 0 | -0/+0 |
| |\ | |/ |/| | |||||
* | | Merge pull request #1547 from gennadiycivil/master | Gennadiy Civil | 2018-04-05 | 2 | -37/+788 |
|\ \ | | | | | | | Matchers testing | ||||
| | * | Merging gMock, 2 | Gennadiy Civil | 2018-04-05 | 9 | -420/+573 |
| |/ | |||||
| * | formatting | Gennadiy Civil | 2018-04-05 | 1 | -2/+2 |
| | | |||||
| * | And more MCVS warnings | Gennadiy Civil | 2018-04-05 | 1 | -5/+4 |
| | | |||||
| * | fixing MCVS warn | Gennadiy Civil | 2018-04-05 | 1 | -0/+10 |
| | | |||||
| * | Have to wait for this one | Gennadiy Civil | 2018-04-05 | 1 | -2/+2 |
| | | |||||
| * | Have to wait for this one | Gennadiy Civil | 2018-04-05 | 1 | -1/+1 |
| | | |||||
| * | Merging matchers test | Gennadiy Civil | 2018-04-05 | 1 | -0/+3 |
| | | |||||
| * | Merge branch 'master' of github.com:google/googletest | Gennadiy Civil | 2018-04-05 | 1 | -1/+1 |
| |\ | |/ |/| | |||||
* | | Merge pull request #1545 from gennadiycivil/master | Gennadiy Civil | 2018-04-04 | 3 | -70/+487 |
|\ \ | | | | | | | merging gmock matchers 1 | ||||
| * \ | Merge branch 'master' into master | Gennadiy Civil | 2018-04-04 | 1 | -1/+1 |
| |\ \ | |/ / |/| | |