googletest/googlemock/include/gmock
Victor Costan 51f8ad47df Sync gmock-generated-nice-strict.h.pump with gmock-generated-nice-strict.h.
Commit fe402c2779 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
2018-04-06 17:21:05 -07:00
..
internal Merge branch 'master' of https://github.com/google/googletest 2018-03-05 12:26:24 -05:00
gmock-actions.h More merges, removing old dead code 2018-03-13 11:13:37 -04:00
gmock-cardinalities.h move googlemock files into googlemock/ subdir 2015-08-25 17:47:18 -04:00
gmock-generated-actions.h change links from former code.google.com to current github repository 2017-08-31 18:12:17 +02:00
gmock-generated-actions.h.pump change links from former code.google.com to current github repository 2017-08-31 18:12:17 +02:00
gmock-generated-function-mockers.h Merging gMock, 2 2018-04-05 16:09:17 -04:00
gmock-generated-function-mockers.h.pump Merging gMock, 2 2018-04-05 16:09:17 -04:00
gmock-generated-matchers.h Remove gcc 6 misleading indentations. 2017-10-25 17:53:01 +02:00
gmock-generated-matchers.h.pump Remove gcc 6 misleading indentations. 2017-10-25 17:53:01 +02:00
gmock-generated-nice-strict.h Merging gMock, 2 2018-04-05 16:09:17 -04:00
gmock-generated-nice-strict.h.pump Sync gmock-generated-nice-strict.h.pump with gmock-generated-nice-strict.h. 2018-04-06 17:21:05 -07:00
gmock-matchers.h merging gmock matchers 1 2018-04-04 14:05:00 -04:00
gmock-more-actions.h move googlemock files into googlemock/ subdir 2015-08-25 17:47:18 -04:00
gmock-more-matchers.h formatting 2018-04-05 14:41:16 -04:00
gmock-spec-builders.h Merging gMock, 2 2018-04-05 16:09:17 -04:00
gmock.h Code merges 2018-01-26 11:57:58 -05:00