From 4bcc9b9807b256e2a59daabb86156f8658031b68 Mon Sep 17 00:00:00 2001
From: Masaru Tsuchiyama <m.tmatma@gmail.com>
Date: Wed, 23 May 2018 21:11:45 +0900
Subject: 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.
---
 googlemock/include/gmock/gmock-generated-function-mockers.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'googlemock/include/gmock/gmock-generated-function-mockers.h')

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<R(A1, A2, A3, A4, A5, A6, A7, A8, A9, A10)> : 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();
 //     }
-- 
cgit v1.2.3


From 984cba30ed10622122c12960b4914656fc770e04 Mon Sep 17 00:00:00 2001
From: Gennadiy Civil <misterg@google.com>
Date: Fri, 27 Jul 2018 11:15:08 -0400
Subject: Formatting changes for automatic code management

---
 googlemock/include/gmock/gmock-generated-function-mockers.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'googlemock/include/gmock/gmock-generated-function-mockers.h')

diff --git a/googlemock/include/gmock/gmock-generated-function-mockers.h b/googlemock/include/gmock/gmock-generated-function-mockers.h
index b8bf7a5a..0474c896 100644
--- a/googlemock/include/gmock/gmock-generated-function-mockers.h
+++ b/googlemock/include/gmock/gmock-generated-function-mockers.h
@@ -37,6 +37,8 @@
 //
 // This file implements function mockers of various arities.
 
+// GOOGLETEST_CM0002 DO NOT DELETE
+
 #ifndef GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_FUNCTION_MOCKERS_H_
 #define GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_FUNCTION_MOCKERS_H_
 
-- 
cgit v1.2.3