diff options
| author | Chris Johnson <chrisjohnsonmail@gmail.com> | 2019-08-27 23:00:04 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-27 23:00:04 (GMT) |
| commit | 85f059f03d56ce82cf8f68cf7505b695a0c730c2 (patch) | |
| tree | e715b911578e831d7a3fdf46bbf2bdbece4fafc3 /googlemock/include/gmock/gmock-generated-matchers.h.pump | |
| parent | 130e5aa86a7a71501cf8fa7cd6f507928f01bd79 (diff) | |
| parent | fdd6a1dc8c74bf37211c14a1b2e4b64755bb3380 (diff) | |
| download | googletest-85f059f03d56ce82cf8f68cf7505b695a0c730c2.zip googletest-85f059f03d56ce82cf8f68cf7505b695a0c730c2.tar.gz googletest-85f059f03d56ce82cf8f68cf7505b695a0c730c2.tar.bz2 | |
Merge pull request #3 from google/master
Update master
Diffstat (limited to 'googlemock/include/gmock/gmock-generated-matchers.h.pump')
| -rw-r--r-- | googlemock/include/gmock/gmock-generated-matchers.h.pump | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/googlemock/include/gmock/gmock-generated-matchers.h.pump b/googlemock/include/gmock/gmock-generated-matchers.h.pump index 43a0c5f..ae90917 100644 --- a/googlemock/include/gmock/gmock-generated-matchers.h.pump +++ b/googlemock/include/gmock/gmock-generated-matchers.h.pump @@ -252,18 +252,15 @@ $$ }} This line fixes auto-indentation of the following code in Emacs. // overloading matchers based on parameter types (as opposed to just // based on the number of parameters). // -// MATCHER*() can only be used in a namespace scope. The reason is -// that C++ doesn't yet allow function-local types to be used to -// instantiate templates. The up-coming C++0x standard will fix this. -// Once that's done, we'll consider supporting using MATCHER*() inside -// a function. +// MATCHER*() can only be used in a namespace scope as templates cannot be +// declared inside of a local class. // // More Information // ================ // // To learn more about using these macros, please search for 'MATCHER' // on -// https://github.com/google/googletest/blob/master/googlemock/docs/CookBook.md +// https://github.com/google/googletest/blob/master/googlemock/docs/cook_book.md $range i 0..n $for i |