diff options
author | Masaru Tsuchiyama <m.tmatma@gmail.com> | 2018-05-23 12:11:45 (GMT) |
---|---|---|
committer | Masaru Tsuchiyama <m.tmatma@gmail.com> | 2018-06-30 12:46:41 (GMT) |
commit | 4bcc9b9807b256e2a59daabb86156f8658031b68 (patch) | |
tree | 0a4ae724510a565d93070a03c8b65811ba68447c /googlemock/include/gmock/gmock-generated-function-mockers.h.pump | |
parent | ba96d0b1161f540656efdaed035b3c062b60e006 (diff) | |
download | googletest-4bcc9b9807b256e2a59daabb86156f8658031b68.zip googletest-4bcc9b9807b256e2a59daabb86156f8658031b68.tar.gz googletest-4bcc9b9807b256e2a59daabb86156f8658031b68.tar.bz2 |
This closes #1595: fix compiler error with Visual Studio 2017 on Win10 JP.
non-ASCII charactors are interpreted as Shift-JIS on the environment.
But the charators in the files are non Shift-JIS charactors and the compiler
stops compiling with C4819.
To fix the errors, remove non-ASCII charactors.
Diffstat (limited to 'googlemock/include/gmock/gmock-generated-function-mockers.h.pump')
-rw-r--r-- | googlemock/include/gmock/gmock-generated-function-mockers.h.pump | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/googlemock/include/gmock/gmock-generated-function-mockers.h.pump b/googlemock/include/gmock/gmock-generated-function-mockers.h.pump index efcb3e8..6426d9a 100644 --- a/googlemock/include/gmock/gmock-generated-function-mockers.h.pump +++ b/googlemock/include/gmock/gmock-generated-function-mockers.h.pump @@ -114,21 +114,21 @@ class FunctionMocker<R($As)> : public // // class MockClass { // // Overload 1 -// MockSpec<string&()> gmock_GetName() { … } +// MockSpec<string&()> gmock_GetName() { ... } // // Overload 2. Declared const so that the compiler will generate an // // error when trying to resolve between this and overload 4 in // // 'gmock_GetName(WithoutMatchers(), nullptr)'. // MockSpec<string&()> gmock_GetName( -// const WithoutMatchers&, const Function<string&()>*) const { +// const WithoutMatchers&, const Function<string&()>*) const { // // Removes const from this, calls overload 1 // return AdjustConstness_(this)->gmock_GetName(); // } // // // Overload 3 -// const string& gmock_GetName() const { … } +// const string& gmock_GetName() const { ... } // // Overload 4 // MockSpec<const string&()> gmock_GetName( -// const WithoutMatchers&, const Function<const string&()>*) const { +// const WithoutMatchers&, const Function<const string&()>*) const { // // Does not remove const, calls overload 3 // return AdjustConstness_const(this)->gmock_GetName(); // } |