From 4bcc9b9807b256e2a59daabb86156f8658031b68 Mon Sep 17 00:00:00 2001 From: Masaru Tsuchiyama Date: Wed, 23 May 2018 21:11:45 +0900 Subject: [PATCH] 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. --- .../include/gmock/gmock-generated-function-mockers.h | 8 ++++---- .../include/gmock/gmock-generated-function-mockers.h.pump | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/googlemock/include/gmock/gmock-generated-function-mockers.h b/googlemock/include/gmock/gmock-generated-function-mockers.h index 126c48c7..b8bf7a5a 100644 --- a/googlemock/include/gmock/gmock-generated-function-mockers.h +++ b/googlemock/include/gmock/gmock-generated-function-mockers.h @@ -352,21 +352,21 @@ class FunctionMocker : public // // class MockClass { // // Overload 1 -// MockSpec gmock_GetName() { … } +// MockSpec 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 gmock_GetName( -// const WithoutMatchers&, const Function*) const { +// const WithoutMatchers&, const Function*) 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 gmock_GetName( -// const WithoutMatchers&, const Function*) const { +// const WithoutMatchers&, const Function*) const { // // Does not remove const, calls overload 3 // return AdjustConstness_const(this)->gmock_GetName(); // } diff --git a/googlemock/include/gmock/gmock-generated-function-mockers.h.pump b/googlemock/include/gmock/gmock-generated-function-mockers.h.pump index efcb3e8c..6426d9a0 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 : public // // class MockClass { // // Overload 1 -// MockSpec gmock_GetName() { … } +// MockSpec 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 gmock_GetName( -// const WithoutMatchers&, const Function*) const { +// const WithoutMatchers&, const Function*) 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 gmock_GetName( -// const WithoutMatchers&, const Function*) const { +// const WithoutMatchers&, const Function*) const { // // Does not remove const, calls overload 3 // return AdjustConstness_const(this)->gmock_GetName(); // }