Restoring authorship annotation for <somov@yandex-team.ru>. Commit 2 of 2.

12 files changed, 6104 insertions, 6104 deletions

diff --git a/contrib/restricted/googletest/googlemock/include/gmock/gmock-actions.h b/contrib/restricted/googletest/googlemock/include/gmock/gmock-actions.h
index dd03053850..f2393bd3af 100644
--- a/contrib/restricted/googletest/googlemock/include/gmock/gmock-actions.h
+++ b/contrib/restricted/googletest/googlemock/include/gmock/gmock-actions.h
@@ -1,35 +1,35 @@
-// Copyright 2007, Google Inc. 
-// All rights reserved. 
-// 
-// Redistribution and use in source and binary forms, with or without 
-// modification, are permitted provided that the following conditions are 
-// met: 
-// 
-//     * Redistributions of source code must retain the above copyright 
-// notice, this list of conditions and the following disclaimer. 
-//     * Redistributions in binary form must reproduce the above 
-// copyright notice, this list of conditions and the following disclaimer 
-// in the documentation and/or other materials provided with the 
-// distribution. 
-//     * Neither the name of Google Inc. nor the names of its 
-// contributors may be used to endorse or promote products derived from 
-// this software without specific prior written permission. 
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- 
-
-// Google Mock - a framework for writing C++ mock classes. 
-// 
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+// Google Mock - a framework for writing C++ mock classes.
+//
 // The ACTION* family of macros can be used in a namespace scope to
 // define custom actions easily.  The syntax:
 //
@@ -124,318 +124,318 @@
 //
 // To learn more about using these macros, please search for 'ACTION' on
 // https://github.com/google/googletest/blob/master/docs/gmock_cook_book.md
- 
+
 // GOOGLETEST_CM0002 DO NOT DELETE
 
 #ifndef GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_ACTIONS_H_
 #define GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_ACTIONS_H_
- 
-#ifndef _WIN32_WCE 
-# include <errno.h> 
-#endif 
- 
-#include <algorithm> 
+
+#ifndef _WIN32_WCE
+# include <errno.h>
+#endif
+
+#include <algorithm>
 #include <functional>
 #include <memory>
-#include <string> 
+#include <string>
 #include <tuple>
 #include <type_traits>
 #include <utility>
- 
-#include "gmock/internal/gmock-internal-utils.h" 
-#include "gmock/internal/gmock-port.h" 
+
+#include "gmock/internal/gmock-internal-utils.h"
+#include "gmock/internal/gmock-port.h"
 #include "gmock/internal/gmock-pp.h"
- 
+
 #ifdef _MSC_VER
 # pragma warning(push)
 # pragma warning(disable:4100)
-#endif 
- 
-namespace testing { 
- 
-// To implement an action Foo, define: 
-//   1. a class FooAction that implements the ActionInterface interface, and 
-//   2. a factory function that creates an Action object from a 
-//      const FooAction*. 
-// 
-// The two-level delegation design follows that of Matcher, providing 
-// consistency for extension developers.  It also eases ownership 
-// management as Action objects can now be copied like plain values. 
- 
-namespace internal { 
- 
-// BuiltInDefaultValueGetter<T, true>::Get() returns a 
-// default-constructed T value.  BuiltInDefaultValueGetter<T, 
-// false>::Get() crashes with an error. 
-// 
-// This primary template is used when kDefaultConstructible is true. 
-template <typename T, bool kDefaultConstructible> 
-struct BuiltInDefaultValueGetter { 
-  static T Get() { return T(); } 
-}; 
-template <typename T> 
-struct BuiltInDefaultValueGetter<T, false> { 
-  static T Get() { 
-    Assert(false, __FILE__, __LINE__, 
-           "Default action undefined for the function return type."); 
-    return internal::Invalid<T>(); 
-    // The above statement will never be reached, but is required in 
-    // order for this function to compile. 
-  } 
-}; 
- 
-// BuiltInDefaultValue<T>::Get() returns the "built-in" default value 
-// for type T, which is NULL when T is a raw pointer type, 0 when T is 
-// a numeric type, false when T is bool, or "" when T is string or 
-// std::string.  In addition, in C++11 and above, it turns a 
-// default-constructed T value if T is default constructible.  For any 
-// other type T, the built-in default T value is undefined, and the 
-// function will abort the process. 
-template <typename T> 
-class BuiltInDefaultValue { 
- public: 
+#endif
+
+namespace testing {
+
+// To implement an action Foo, define:
+//   1. a class FooAction that implements the ActionInterface interface, and
+//   2. a factory function that creates an Action object from a
+//      const FooAction*.
+//
+// The two-level delegation design follows that of Matcher, providing
+// consistency for extension developers.  It also eases ownership
+// management as Action objects can now be copied like plain values.
+
+namespace internal {
+
+// BuiltInDefaultValueGetter<T, true>::Get() returns a
+// default-constructed T value.  BuiltInDefaultValueGetter<T,
+// false>::Get() crashes with an error.
+//
+// This primary template is used when kDefaultConstructible is true.
+template <typename T, bool kDefaultConstructible>
+struct BuiltInDefaultValueGetter {
+  static T Get() { return T(); }
+};
+template <typename T>
+struct BuiltInDefaultValueGetter<T, false> {
+  static T Get() {
+    Assert(false, __FILE__, __LINE__,
+           "Default action undefined for the function return type.");
+    return internal::Invalid<T>();
+    // The above statement will never be reached, but is required in
+    // order for this function to compile.
+  }
+};
+
+// BuiltInDefaultValue<T>::Get() returns the "built-in" default value
+// for type T, which is NULL when T is a raw pointer type, 0 when T is
+// a numeric type, false when T is bool, or "" when T is string or
+// std::string.  In addition, in C++11 and above, it turns a
+// default-constructed T value if T is default constructible.  For any
+// other type T, the built-in default T value is undefined, and the
+// function will abort the process.
+template <typename T>
+class BuiltInDefaultValue {
+ public:
   // This function returns true if and only if type T has a built-in default
   // value.
-  static bool Exists() { 
-    return ::std::is_default_constructible<T>::value; 
-  } 
- 
-  static T Get() { 
-    return BuiltInDefaultValueGetter< 
-        T, ::std::is_default_constructible<T>::value>::Get(); 
-  } 
-}; 
- 
-// This partial specialization says that we use the same built-in 
-// default value for T and const T. 
-template <typename T> 
-class BuiltInDefaultValue<const T> { 
- public: 
-  static bool Exists() { return BuiltInDefaultValue<T>::Exists(); } 
-  static T Get() { return BuiltInDefaultValue<T>::Get(); } 
-}; 
- 
-// This partial specialization defines the default values for pointer 
-// types. 
-template <typename T> 
-class BuiltInDefaultValue<T*> { 
- public: 
-  static bool Exists() { return true; } 
+  static bool Exists() {
+    return ::std::is_default_constructible<T>::value;
+  }
+
+  static T Get() {
+    return BuiltInDefaultValueGetter<
+        T, ::std::is_default_constructible<T>::value>::Get();
+  }
+};
+
+// This partial specialization says that we use the same built-in
+// default value for T and const T.
+template <typename T>
+class BuiltInDefaultValue<const T> {
+ public:
+  static bool Exists() { return BuiltInDefaultValue<T>::Exists(); }
+  static T Get() { return BuiltInDefaultValue<T>::Get(); }
+};
+
+// This partial specialization defines the default values for pointer
+// types.
+template <typename T>
+class BuiltInDefaultValue<T*> {
+ public:
+  static bool Exists() { return true; }
   static T* Get() { return nullptr; }
-}; 
- 
-// The following specializations define the default values for 
-// specific types we care about. 
-#define GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(type, value) \ 
-  template <> \ 
-  class BuiltInDefaultValue<type> { \ 
-   public: \ 
-    static bool Exists() { return true; } \ 
-    static type Get() { return value; } \ 
-  } 
- 
-GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(void, );  // NOLINT 
-GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(::std::string, ""); 
-GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(bool, false); 
-GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(unsigned char, '\0'); 
-GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(signed char, '\0'); 
-GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(char, '\0'); 
- 
-// There's no need for a default action for signed wchar_t, as that 
-// type is the same as wchar_t for gcc, and invalid for MSVC. 
-// 
-// There's also no need for a default action for unsigned wchar_t, as 
-// that type is the same as unsigned int for gcc, and invalid for 
-// MSVC. 
-#if GMOCK_WCHAR_T_IS_NATIVE_ 
-GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(wchar_t, 0U);  // NOLINT 
-#endif 
- 
-GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(unsigned short, 0U);  // NOLINT 
-GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(signed short, 0);     // NOLINT 
-GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(unsigned int, 0U); 
-GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(signed int, 0); 
-GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(unsigned long, 0UL);  // NOLINT 
-GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(signed long, 0L);     // NOLINT 
+};
+
+// The following specializations define the default values for
+// specific types we care about.
+#define GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(type, value) \
+  template <> \
+  class BuiltInDefaultValue<type> { \
+   public: \
+    static bool Exists() { return true; } \
+    static type Get() { return value; } \
+  }
+
+GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(void, );  // NOLINT
+GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(::std::string, "");
+GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(bool, false);
+GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(unsigned char, '\0');
+GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(signed char, '\0');
+GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(char, '\0');
+
+// There's no need for a default action for signed wchar_t, as that
+// type is the same as wchar_t for gcc, and invalid for MSVC.
+//
+// There's also no need for a default action for unsigned wchar_t, as
+// that type is the same as unsigned int for gcc, and invalid for
+// MSVC.
+#if GMOCK_WCHAR_T_IS_NATIVE_
+GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(wchar_t, 0U);  // NOLINT
+#endif
+
+GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(unsigned short, 0U);  // NOLINT
+GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(signed short, 0);     // NOLINT
+GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(unsigned int, 0U);
+GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(signed int, 0);
+GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(unsigned long, 0UL);  // NOLINT
+GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(signed long, 0L);     // NOLINT
 GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(unsigned long long, 0);  // NOLINT
 GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(signed long long, 0);  // NOLINT
-GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(float, 0); 
-GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(double, 0); 
- 
-#undef GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_ 
- 
+GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(float, 0);
+GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(double, 0);
+
+#undef GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_
+
 // Simple two-arg form of std::disjunction.
 template <typename P, typename Q>
 using disjunction = typename ::std::conditional<P::value, P, Q>::type;
 
-}  // namespace internal 
- 
-// When an unexpected function call is encountered, Google Mock will 
-// let it return a default value if the user has specified one for its 
-// return type, or if the return type has a built-in default value; 
-// otherwise Google Mock won't know what value to return and will have 
-// to abort the process. 
-// 
-// The DefaultValue<T> class allows a user to specify the 
-// default value for a type T that is both copyable and publicly 
-// destructible (i.e. anything that can be used as a function return 
-// type).  The usage is: 
-// 
-//   // Sets the default value for type T to be foo. 
-//   DefaultValue<T>::Set(foo); 
-template <typename T> 
-class DefaultValue { 
- public: 
-  // Sets the default value for type T; requires T to be 
-  // copy-constructable and have a public destructor. 
-  static void Set(T x) { 
-    delete producer_; 
-    producer_ = new FixedValueProducer(x); 
-  } 
- 
-  // Provides a factory function to be called to generate the default value. 
-  // This method can be used even if T is only move-constructible, but it is not 
-  // limited to that case. 
-  typedef T (*FactoryFunction)(); 
-  static void SetFactory(FactoryFunction factory) { 
-    delete producer_; 
-    producer_ = new FactoryValueProducer(factory); 
-  } 
- 
-  // Unsets the default value for type T. 
-  static void Clear() { 
-    delete producer_; 
+}  // namespace internal
+
+// When an unexpected function call is encountered, Google Mock will
+// let it return a default value if the user has specified one for its
+// return type, or if the return type has a built-in default value;
+// otherwise Google Mock won't know what value to return and will have
+// to abort the process.
+//
+// The DefaultValue<T> class allows a user to specify the
+// default value for a type T that is both copyable and publicly
+// destructible (i.e. anything that can be used as a function return
+// type).  The usage is:
+//
+//   // Sets the default value for type T to be foo.
+//   DefaultValue<T>::Set(foo);
+template <typename T>
+class DefaultValue {
+ public:
+  // Sets the default value for type T; requires T to be
+  // copy-constructable and have a public destructor.
+  static void Set(T x) {
+    delete producer_;
+    producer_ = new FixedValueProducer(x);
+  }
+
+  // Provides a factory function to be called to generate the default value.
+  // This method can be used even if T is only move-constructible, but it is not
+  // limited to that case.
+  typedef T (*FactoryFunction)();
+  static void SetFactory(FactoryFunction factory) {
+    delete producer_;
+    producer_ = new FactoryValueProducer(factory);
+  }
+
+  // Unsets the default value for type T.
+  static void Clear() {
+    delete producer_;
     producer_ = nullptr;
-  } 
- 
+  }
+
   // Returns true if and only if the user has set the default value for type T.
   static bool IsSet() { return producer_ != nullptr; }
- 
-  // Returns true if T has a default return value set by the user or there 
-  // exists a built-in default value. 
-  static bool Exists() { 
-    return IsSet() || internal::BuiltInDefaultValue<T>::Exists(); 
-  } 
- 
-  // Returns the default value for type T if the user has set one; 
-  // otherwise returns the built-in default value. Requires that Exists() 
-  // is true, which ensures that the return value is well-defined. 
-  static T Get() { 
+
+  // Returns true if T has a default return value set by the user or there
+  // exists a built-in default value.
+  static bool Exists() {
+    return IsSet() || internal::BuiltInDefaultValue<T>::Exists();
+  }
+
+  // Returns the default value for type T if the user has set one;
+  // otherwise returns the built-in default value. Requires that Exists()
+  // is true, which ensures that the return value is well-defined.
+  static T Get() {
     return producer_ == nullptr ? internal::BuiltInDefaultValue<T>::Get()
                                 : producer_->Produce();
-  } 
- 
- private: 
-  class ValueProducer { 
-   public: 
-    virtual ~ValueProducer() {} 
-    virtual T Produce() = 0; 
-  }; 
- 
-  class FixedValueProducer : public ValueProducer { 
-   public: 
-    explicit FixedValueProducer(T value) : value_(value) {} 
+  }
+
+ private:
+  class ValueProducer {
+   public:
+    virtual ~ValueProducer() {}
+    virtual T Produce() = 0;
+  };
+
+  class FixedValueProducer : public ValueProducer {
+   public:
+    explicit FixedValueProducer(T value) : value_(value) {}
     T Produce() override { return value_; }
- 
-   private: 
-    const T value_; 
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(FixedValueProducer); 
-  }; 
- 
-  class FactoryValueProducer : public ValueProducer { 
-   public: 
-    explicit FactoryValueProducer(FactoryFunction factory) 
-        : factory_(factory) {} 
+
+   private:
+    const T value_;
+    GTEST_DISALLOW_COPY_AND_ASSIGN_(FixedValueProducer);
+  };
+
+  class FactoryValueProducer : public ValueProducer {
+   public:
+    explicit FactoryValueProducer(FactoryFunction factory)
+        : factory_(factory) {}
     T Produce() override { return factory_(); }
- 
-   private: 
-    const FactoryFunction factory_; 
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(FactoryValueProducer); 
-  }; 
- 
-  static ValueProducer* producer_; 
-}; 
- 
-// This partial specialization allows a user to set default values for 
-// reference types. 
-template <typename T> 
-class DefaultValue<T&> { 
- public: 
-  // Sets the default value for type T&. 
-  static void Set(T& x) {  // NOLINT 
-    address_ = &x; 
-  } 
- 
-  // Unsets the default value for type T&. 
+
+   private:
+    const FactoryFunction factory_;
+    GTEST_DISALLOW_COPY_AND_ASSIGN_(FactoryValueProducer);
+  };
+
+  static ValueProducer* producer_;
+};
+
+// This partial specialization allows a user to set default values for
+// reference types.
+template <typename T>
+class DefaultValue<T&> {
+ public:
+  // Sets the default value for type T&.
+  static void Set(T& x) {  // NOLINT
+    address_ = &x;
+  }
+
+  // Unsets the default value for type T&.
   static void Clear() { address_ = nullptr; }
- 
+
   // Returns true if and only if the user has set the default value for type T&.
   static bool IsSet() { return address_ != nullptr; }
- 
-  // Returns true if T has a default return value set by the user or there 
-  // exists a built-in default value. 
-  static bool Exists() { 
-    return IsSet() || internal::BuiltInDefaultValue<T&>::Exists(); 
-  } 
- 
-  // Returns the default value for type T& if the user has set one; 
-  // otherwise returns the built-in default value if there is one; 
-  // otherwise aborts the process. 
-  static T& Get() { 
+
+  // Returns true if T has a default return value set by the user or there
+  // exists a built-in default value.
+  static bool Exists() {
+    return IsSet() || internal::BuiltInDefaultValue<T&>::Exists();
+  }
+
+  // Returns the default value for type T& if the user has set one;
+  // otherwise returns the built-in default value if there is one;
+  // otherwise aborts the process.
+  static T& Get() {
     return address_ == nullptr ? internal::BuiltInDefaultValue<T&>::Get()
                                : *address_;
-  } 
- 
- private: 
-  static T* address_; 
-}; 
- 
-// This specialization allows DefaultValue<void>::Get() to 
-// compile. 
-template <> 
-class DefaultValue<void> { 
- public: 
-  static bool Exists() { return true; } 
-  static void Get() {} 
-}; 
- 
-// Points to the user-set default value for type T. 
-template <typename T> 
+  }
+
+ private:
+  static T* address_;
+};
+
+// This specialization allows DefaultValue<void>::Get() to
+// compile.
+template <>
+class DefaultValue<void> {
+ public:
+  static bool Exists() { return true; }
+  static void Get() {}
+};
+
+// Points to the user-set default value for type T.
+template <typename T>
 typename DefaultValue<T>::ValueProducer* DefaultValue<T>::producer_ = nullptr;
- 
-// Points to the user-set default value for type T&. 
-template <typename T> 
+
+// Points to the user-set default value for type T&.
+template <typename T>
 T* DefaultValue<T&>::address_ = nullptr;
- 
-// Implement this interface to define an action for function type F. 
-template <typename F> 
-class ActionInterface { 
- public: 
-  typedef typename internal::Function<F>::Result Result; 
-  typedef typename internal::Function<F>::ArgumentTuple ArgumentTuple; 
- 
-  ActionInterface() {} 
-  virtual ~ActionInterface() {} 
- 
-  // Performs the action.  This method is not const, as in general an 
-  // action can have side effects and be stateful.  For example, a 
-  // get-the-next-element-from-the-collection action will need to 
-  // remember the current element. 
-  virtual Result Perform(const ArgumentTuple& args) = 0; 
- 
- private: 
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ActionInterface); 
-}; 
- 
-// An Action<F> is a copyable and IMMUTABLE (except by assignment) 
-// object that represents an action to be taken when a mock function 
-// of type F is called.  The implementation of Action<T> is just a 
+
+// Implement this interface to define an action for function type F.
+template <typename F>
+class ActionInterface {
+ public:
+  typedef typename internal::Function<F>::Result Result;
+  typedef typename internal::Function<F>::ArgumentTuple ArgumentTuple;
+
+  ActionInterface() {}
+  virtual ~ActionInterface() {}
+
+  // Performs the action.  This method is not const, as in general an
+  // action can have side effects and be stateful.  For example, a
+  // get-the-next-element-from-the-collection action will need to
+  // remember the current element.
+  virtual Result Perform(const ArgumentTuple& args) = 0;
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(ActionInterface);
+};
+
+// An Action<F> is a copyable and IMMUTABLE (except by assignment)
+// object that represents an action to be taken when a mock function
+// of type F is called.  The implementation of Action<T> is just a
 // std::shared_ptr to const ActionInterface<T>. Don't inherit from Action!
-// You can view an object implementing ActionInterface<F> as a 
-// concrete action (including its current state), and an Action<F> 
-// object as a handle to it. 
-template <typename F> 
-class Action { 
+// You can view an object implementing ActionInterface<F> as a
+// concrete action (including its current state), and an Action<F>
+// object as a handle to it.
+template <typename F>
+class Action {
   // Adapter class to allow constructing Action from a legacy ActionInterface.
   // New code should create Actions from functors instead.
   struct ActionAdapter {
@@ -452,14 +452,14 @@ class Action {
   template <typename G>
   using IsCompatibleFunctor = std::is_constructible<std::function<F>, G>;
 
- public: 
-  typedef typename internal::Function<F>::Result Result; 
-  typedef typename internal::Function<F>::ArgumentTuple ArgumentTuple; 
- 
-  // Constructs a null Action.  Needed for storing Action objects in 
-  // STL containers. 
+ public:
+  typedef typename internal::Function<F>::Result Result;
+  typedef typename internal::Function<F>::ArgumentTuple ArgumentTuple;
+
+  // Constructs a null Action.  Needed for storing Action objects in
+  // STL containers.
   Action() {}
- 
+
   // Construct an Action from a specified callable.
   // This cannot take std::function directly, because then Action would not be
   // directly constructible from lambda (it would require two conversions).
@@ -471,37 +471,37 @@ class Action {
   Action(G&& fun) {  // NOLINT
     Init(::std::forward<G>(fun), IsCompatibleFunctor<G>());
   }
- 
+
   // Constructs an Action from its implementation.
   explicit Action(ActionInterface<F>* impl)
       : fun_(ActionAdapter{::std::shared_ptr<ActionInterface<F>>(impl)}) {}
- 
-  // This constructor allows us to turn an Action<Func> object into an 
-  // Action<F>, as long as F's arguments can be implicitly converted 
+
+  // This constructor allows us to turn an Action<Func> object into an
+  // Action<F>, as long as F's arguments can be implicitly converted
   // to Func's and Func's return type can be implicitly converted to F's.
-  template <typename Func> 
+  template <typename Func>
   explicit Action(const Action<Func>& action) : fun_(action.fun_) {}
- 
+
   // Returns true if and only if this is the DoDefault() action.
   bool IsDoDefault() const { return fun_ == nullptr; }
- 
-  // Performs the action.  Note that this method is const even though 
-  // the corresponding method in ActionInterface is not.  The reason 
-  // is that a const Action<F> means that it cannot be re-bound to 
-  // another concrete action, not that the concrete action it binds to 
-  // cannot change state.  (Think of the difference between a const 
-  // pointer and a pointer to const.) 
+
+  // Performs the action.  Note that this method is const even though
+  // the corresponding method in ActionInterface is not.  The reason
+  // is that a const Action<F> means that it cannot be re-bound to
+  // another concrete action, not that the concrete action it binds to
+  // cannot change state.  (Think of the difference between a const
+  // pointer and a pointer to const.)
   Result Perform(ArgumentTuple args) const {
     if (IsDoDefault()) {
       internal::IllegalDoDefault(__FILE__, __LINE__);
     }
     return internal::Apply(fun_, ::std::move(args));
-  } 
- 
- private: 
+  }
+
+ private:
   template <typename G>
   friend class Action;
- 
+
   template <typename G>
   void Init(G&& g, ::std::true_type) {
     fun_ = ::std::forward<G>(g);
@@ -524,308 +524,308 @@ class Action {
 
   // fun_ is an empty function if and only if this is the DoDefault() action.
   ::std::function<F> fun_;
-}; 
- 
-// The PolymorphicAction class template makes it easy to implement a 
-// polymorphic action (i.e. an action that can be used in mock 
-// functions of than one type, e.g. Return()). 
-// 
-// To define a polymorphic action, a user first provides a COPYABLE 
-// implementation class that has a Perform() method template: 
-// 
-//   class FooAction { 
-//    public: 
-//     template <typename Result, typename ArgumentTuple> 
-//     Result Perform(const ArgumentTuple& args) const { 
-//       // Processes the arguments and returns a result, using 
+};
+
+// The PolymorphicAction class template makes it easy to implement a
+// polymorphic action (i.e. an action that can be used in mock
+// functions of than one type, e.g. Return()).
+//
+// To define a polymorphic action, a user first provides a COPYABLE
+// implementation class that has a Perform() method template:
+//
+//   class FooAction {
+//    public:
+//     template <typename Result, typename ArgumentTuple>
+//     Result Perform(const ArgumentTuple& args) const {
+//       // Processes the arguments and returns a result, using
 //       // std::get<N>(args) to get the N-th (0-based) argument in the tuple.
-//     } 
-//     ... 
-//   }; 
-// 
-// Then the user creates the polymorphic action using 
-// MakePolymorphicAction(object) where object has type FooAction.  See 
-// the definition of Return(void) and SetArgumentPointee<N>(value) for 
-// complete examples. 
-template <typename Impl> 
-class PolymorphicAction { 
- public: 
-  explicit PolymorphicAction(const Impl& impl) : impl_(impl) {} 
- 
-  template <typename F> 
-  operator Action<F>() const { 
-    return Action<F>(new MonomorphicImpl<F>(impl_)); 
-  } 
- 
- private: 
-  template <typename F> 
-  class MonomorphicImpl : public ActionInterface<F> { 
-   public: 
-    typedef typename internal::Function<F>::Result Result; 
-    typedef typename internal::Function<F>::ArgumentTuple ArgumentTuple; 
- 
-    explicit MonomorphicImpl(const Impl& impl) : impl_(impl) {} 
- 
+//     }
+//     ...
+//   };
+//
+// Then the user creates the polymorphic action using
+// MakePolymorphicAction(object) where object has type FooAction.  See
+// the definition of Return(void) and SetArgumentPointee<N>(value) for
+// complete examples.
+template <typename Impl>
+class PolymorphicAction {
+ public:
+  explicit PolymorphicAction(const Impl& impl) : impl_(impl) {}
+
+  template <typename F>
+  operator Action<F>() const {
+    return Action<F>(new MonomorphicImpl<F>(impl_));
+  }
+
+ private:
+  template <typename F>
+  class MonomorphicImpl : public ActionInterface<F> {
+   public:
+    typedef typename internal::Function<F>::Result Result;
+    typedef typename internal::Function<F>::ArgumentTuple ArgumentTuple;
+
+    explicit MonomorphicImpl(const Impl& impl) : impl_(impl) {}
+
     Result Perform(const ArgumentTuple& args) override {
-      return impl_.template Perform<Result>(args); 
-    } 
- 
-   private: 
-    Impl impl_; 
-  }; 
- 
-  Impl impl_; 
-}; 
- 
-// Creates an Action from its implementation and returns it.  The 
-// created Action object owns the implementation. 
-template <typename F> 
-Action<F> MakeAction(ActionInterface<F>* impl) { 
-  return Action<F>(impl); 
-} 
- 
-// Creates a polymorphic action from its implementation.  This is 
-// easier to use than the PolymorphicAction<Impl> constructor as it 
-// doesn't require you to explicitly write the template argument, e.g. 
-// 
-//   MakePolymorphicAction(foo); 
-// vs 
-//   PolymorphicAction<TypeOfFoo>(foo); 
-template <typename Impl> 
-inline PolymorphicAction<Impl> MakePolymorphicAction(const Impl& impl) { 
-  return PolymorphicAction<Impl>(impl); 
-} 
- 
-namespace internal { 
- 
-// Helper struct to specialize ReturnAction to execute a move instead of a copy 
-// on return. Useful for move-only types, but could be used on any type. 
-template <typename T> 
-struct ByMoveWrapper { 
+      return impl_.template Perform<Result>(args);
+    }
+
+   private:
+    Impl impl_;
+  };
+
+  Impl impl_;
+};
+
+// Creates an Action from its implementation and returns it.  The
+// created Action object owns the implementation.
+template <typename F>
+Action<F> MakeAction(ActionInterface<F>* impl) {
+  return Action<F>(impl);
+}
+
+// Creates a polymorphic action from its implementation.  This is
+// easier to use than the PolymorphicAction<Impl> constructor as it
+// doesn't require you to explicitly write the template argument, e.g.
+//
+//   MakePolymorphicAction(foo);
+// vs
+//   PolymorphicAction<TypeOfFoo>(foo);
+template <typename Impl>
+inline PolymorphicAction<Impl> MakePolymorphicAction(const Impl& impl) {
+  return PolymorphicAction<Impl>(impl);
+}
+
+namespace internal {
+
+// Helper struct to specialize ReturnAction to execute a move instead of a copy
+// on return. Useful for move-only types, but could be used on any type.
+template <typename T>
+struct ByMoveWrapper {
   explicit ByMoveWrapper(T value) : payload(std::move(value)) {}
-  T payload; 
-}; 
- 
-// Implements the polymorphic Return(x) action, which can be used in 
-// any function that returns the type of x, regardless of the argument 
-// types. 
-// 
-// Note: The value passed into Return must be converted into 
-// Function<F>::Result when this action is cast to Action<F> rather than 
-// when that action is performed. This is important in scenarios like 
-// 
-// MOCK_METHOD1(Method, T(U)); 
-// ... 
-// { 
-//   Foo foo; 
-//   X x(&foo); 
-//   EXPECT_CALL(mock, Method(_)).WillOnce(Return(x)); 
-// } 
-// 
-// In the example above the variable x holds reference to foo which leaves 
-// scope and gets destroyed.  If copying X just copies a reference to foo, 
-// that copy will be left with a hanging reference.  If conversion to T 
-// makes a copy of foo, the above code is safe. To support that scenario, we 
-// need to make sure that the type conversion happens inside the EXPECT_CALL 
-// statement, and conversion of the result of Return to Action<T(U)> is a 
-// good place for that. 
-// 
+  T payload;
+};
+
+// Implements the polymorphic Return(x) action, which can be used in
+// any function that returns the type of x, regardless of the argument
+// types.
+//
+// Note: The value passed into Return must be converted into
+// Function<F>::Result when this action is cast to Action<F> rather than
+// when that action is performed. This is important in scenarios like
+//
+// MOCK_METHOD1(Method, T(U));
+// ...
+// {
+//   Foo foo;
+//   X x(&foo);
+//   EXPECT_CALL(mock, Method(_)).WillOnce(Return(x));
+// }
+//
+// In the example above the variable x holds reference to foo which leaves
+// scope and gets destroyed.  If copying X just copies a reference to foo,
+// that copy will be left with a hanging reference.  If conversion to T
+// makes a copy of foo, the above code is safe. To support that scenario, we
+// need to make sure that the type conversion happens inside the EXPECT_CALL
+// statement, and conversion of the result of Return to Action<T(U)> is a
+// good place for that.
+//
 // The real life example of the above scenario happens when an invocation
 // of gtl::Container() is passed into Return.
 //
-template <typename R> 
-class ReturnAction { 
- public: 
-  // Constructs a ReturnAction object from the value to be returned. 
-  // 'value' is passed by value instead of by const reference in order 
-  // to allow Return("string literal") to compile. 
+template <typename R>
+class ReturnAction {
+ public:
+  // Constructs a ReturnAction object from the value to be returned.
+  // 'value' is passed by value instead of by const reference in order
+  // to allow Return("string literal") to compile.
   explicit ReturnAction(R value) : value_(new R(std::move(value))) {}
- 
-  // This template type conversion operator allows Return(x) to be 
-  // used in ANY function that returns x's type. 
-  template <typename F> 
+
+  // This template type conversion operator allows Return(x) to be
+  // used in ANY function that returns x's type.
+  template <typename F>
   operator Action<F>() const {  // NOLINT
-    // Assert statement belongs here because this is the best place to verify 
-    // conditions on F. It produces the clearest error messages 
-    // in most compilers. 
-    // Impl really belongs in this scope as a local class but can't 
-    // because MSVC produces duplicate symbols in different translation units 
-    // in this case. Until MS fixes that bug we put Impl into the class scope 
-    // and put the typedef both here (for use in assert statement) and 
-    // in the Impl class. But both definitions must be the same. 
-    typedef typename Function<F>::Result Result; 
-    GTEST_COMPILE_ASSERT_( 
+    // Assert statement belongs here because this is the best place to verify
+    // conditions on F. It produces the clearest error messages
+    // in most compilers.
+    // Impl really belongs in this scope as a local class but can't
+    // because MSVC produces duplicate symbols in different translation units
+    // in this case. Until MS fixes that bug we put Impl into the class scope
+    // and put the typedef both here (for use in assert statement) and
+    // in the Impl class. But both definitions must be the same.
+    typedef typename Function<F>::Result Result;
+    GTEST_COMPILE_ASSERT_(
         !std::is_reference<Result>::value,
-        use_ReturnRef_instead_of_Return_to_return_a_reference); 
+        use_ReturnRef_instead_of_Return_to_return_a_reference);
     static_assert(!std::is_void<Result>::value,
                   "Can't use Return() on an action expected to return `void`.");
-    return Action<F>(new Impl<R, F>(value_)); 
-  } 
- 
- private: 
-  // Implements the Return(x) action for a particular function type F. 
-  template <typename R_, typename F> 
-  class Impl : public ActionInterface<F> { 
-   public: 
-    typedef typename Function<F>::Result Result; 
-    typedef typename Function<F>::ArgumentTuple ArgumentTuple; 
- 
-    // The implicit cast is necessary when Result has more than one 
-    // single-argument constructor (e.g. Result is std::vector<int>) and R 
-    // has a type conversion operator template.  In that case, value_(value) 
-    // won't compile as the compiler doesn't known which constructor of 
-    // Result to call.  ImplicitCast_ forces the compiler to convert R to 
-    // Result without considering explicit constructors, thus resolving the 
-    // ambiguity. value_ is then initialized using its copy constructor. 
+    return Action<F>(new Impl<R, F>(value_));
+  }
+
+ private:
+  // Implements the Return(x) action for a particular function type F.
+  template <typename R_, typename F>
+  class Impl : public ActionInterface<F> {
+   public:
+    typedef typename Function<F>::Result Result;
+    typedef typename Function<F>::ArgumentTuple ArgumentTuple;
+
+    // The implicit cast is necessary when Result has more than one
+    // single-argument constructor (e.g. Result is std::vector<int>) and R
+    // has a type conversion operator template.  In that case, value_(value)
+    // won't compile as the compiler doesn't known which constructor of
+    // Result to call.  ImplicitCast_ forces the compiler to convert R to
+    // Result without considering explicit constructors, thus resolving the
+    // ambiguity. value_ is then initialized using its copy constructor.
     explicit Impl(const std::shared_ptr<R>& value)
-        : value_before_cast_(*value), 
-          value_(ImplicitCast_<Result>(value_before_cast_)) {} 
- 
+        : value_before_cast_(*value),
+          value_(ImplicitCast_<Result>(value_before_cast_)) {}
+
     Result Perform(const ArgumentTuple&) override { return value_; }
- 
-   private: 
+
+   private:
     GTEST_COMPILE_ASSERT_(!std::is_reference<Result>::value,
-                          Result_cannot_be_a_reference_type); 
-    // We save the value before casting just in case it is being cast to a 
-    // wrapper type. 
-    R value_before_cast_; 
-    Result value_; 
- 
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(Impl); 
-  }; 
- 
-  // Partially specialize for ByMoveWrapper. This version of ReturnAction will 
-  // move its contents instead. 
-  template <typename R_, typename F> 
-  class Impl<ByMoveWrapper<R_>, F> : public ActionInterface<F> { 
-   public: 
-    typedef typename Function<F>::Result Result; 
-    typedef typename Function<F>::ArgumentTuple ArgumentTuple; 
- 
+                          Result_cannot_be_a_reference_type);
+    // We save the value before casting just in case it is being cast to a
+    // wrapper type.
+    R value_before_cast_;
+    Result value_;
+
+    GTEST_DISALLOW_COPY_AND_ASSIGN_(Impl);
+  };
+
+  // Partially specialize for ByMoveWrapper. This version of ReturnAction will
+  // move its contents instead.
+  template <typename R_, typename F>
+  class Impl<ByMoveWrapper<R_>, F> : public ActionInterface<F> {
+   public:
+    typedef typename Function<F>::Result Result;
+    typedef typename Function<F>::ArgumentTuple ArgumentTuple;
+
     explicit Impl(const std::shared_ptr<R>& wrapper)
-        : performed_(false), wrapper_(wrapper) {} 
- 
+        : performed_(false), wrapper_(wrapper) {}
+
     Result Perform(const ArgumentTuple&) override {
-      GTEST_CHECK_(!performed_) 
-          << "A ByMove() action should only be performed once."; 
-      performed_ = true; 
+      GTEST_CHECK_(!performed_)
+          << "A ByMove() action should only be performed once.";
+      performed_ = true;
       return std::move(wrapper_->payload);
-    } 
- 
-   private: 
-    bool performed_; 
+    }
+
+   private:
+    bool performed_;
     const std::shared_ptr<R> wrapper_;
-  }; 
- 
+  };
+
   const std::shared_ptr<R> value_;
-}; 
- 
-// Implements the ReturnNull() action. 
-class ReturnNullAction { 
- public: 
-  // Allows ReturnNull() to be used in any pointer-returning function. In C++11 
-  // this is enforced by returning nullptr, and in non-C++11 by asserting a 
-  // pointer type on compile time. 
-  template <typename Result, typename ArgumentTuple> 
-  static Result Perform(const ArgumentTuple&) { 
-    return nullptr; 
-  } 
-}; 
- 
-// Implements the Return() action. 
-class ReturnVoidAction { 
- public: 
-  // Allows Return() to be used in any void-returning function. 
-  template <typename Result, typename ArgumentTuple> 
-  static void Perform(const ArgumentTuple&) { 
+};
+
+// Implements the ReturnNull() action.
+class ReturnNullAction {
+ public:
+  // Allows ReturnNull() to be used in any pointer-returning function. In C++11
+  // this is enforced by returning nullptr, and in non-C++11 by asserting a
+  // pointer type on compile time.
+  template <typename Result, typename ArgumentTuple>
+  static Result Perform(const ArgumentTuple&) {
+    return nullptr;
+  }
+};
+
+// Implements the Return() action.
+class ReturnVoidAction {
+ public:
+  // Allows Return() to be used in any void-returning function.
+  template <typename Result, typename ArgumentTuple>
+  static void Perform(const ArgumentTuple&) {
     static_assert(std::is_void<Result>::value, "Result should be void.");
-  } 
-}; 
- 
-// Implements the polymorphic ReturnRef(x) action, which can be used 
-// in any function that returns a reference to the type of x, 
-// regardless of the argument types. 
-template <typename T> 
-class ReturnRefAction { 
- public: 
-  // Constructs a ReturnRefAction object from the reference to be returned. 
-  explicit ReturnRefAction(T& ref) : ref_(ref) {}  // NOLINT 
- 
-  // This template type conversion operator allows ReturnRef(x) to be 
-  // used in ANY function that returns a reference to x's type. 
-  template <typename F> 
-  operator Action<F>() const { 
-    typedef typename Function<F>::Result Result; 
-    // Asserts that the function return type is a reference.  This 
-    // catches the user error of using ReturnRef(x) when Return(x) 
-    // should be used, and generates some helpful error message. 
+  }
+};
+
+// Implements the polymorphic ReturnRef(x) action, which can be used
+// in any function that returns a reference to the type of x,
+// regardless of the argument types.
+template <typename T>
+class ReturnRefAction {
+ public:
+  // Constructs a ReturnRefAction object from the reference to be returned.
+  explicit ReturnRefAction(T& ref) : ref_(ref) {}  // NOLINT
+
+  // This template type conversion operator allows ReturnRef(x) to be
+  // used in ANY function that returns a reference to x's type.
+  template <typename F>
+  operator Action<F>() const {
+    typedef typename Function<F>::Result Result;
+    // Asserts that the function return type is a reference.  This
+    // catches the user error of using ReturnRef(x) when Return(x)
+    // should be used, and generates some helpful error message.
     GTEST_COMPILE_ASSERT_(std::is_reference<Result>::value,
-                          use_Return_instead_of_ReturnRef_to_return_a_value); 
-    return Action<F>(new Impl<F>(ref_)); 
-  } 
- 
- private: 
-  // Implements the ReturnRef(x) action for a particular function type F. 
-  template <typename F> 
-  class Impl : public ActionInterface<F> { 
-   public: 
-    typedef typename Function<F>::Result Result; 
-    typedef typename Function<F>::ArgumentTuple ArgumentTuple; 
- 
-    explicit Impl(T& ref) : ref_(ref) {}  // NOLINT 
- 
+                          use_Return_instead_of_ReturnRef_to_return_a_value);
+    return Action<F>(new Impl<F>(ref_));
+  }
+
+ private:
+  // Implements the ReturnRef(x) action for a particular function type F.
+  template <typename F>
+  class Impl : public ActionInterface<F> {
+   public:
+    typedef typename Function<F>::Result Result;
+    typedef typename Function<F>::ArgumentTuple ArgumentTuple;
+
+    explicit Impl(T& ref) : ref_(ref) {}  // NOLINT
+
     Result Perform(const ArgumentTuple&) override { return ref_; }
- 
-   private: 
-    T& ref_; 
-  }; 
- 
-  T& ref_; 
-}; 
- 
-// Implements the polymorphic ReturnRefOfCopy(x) action, which can be 
-// used in any function that returns a reference to the type of x, 
-// regardless of the argument types. 
-template <typename T> 
-class ReturnRefOfCopyAction { 
- public: 
-  // Constructs a ReturnRefOfCopyAction object from the reference to 
-  // be returned. 
-  explicit ReturnRefOfCopyAction(const T& value) : value_(value) {}  // NOLINT 
- 
-  // This template type conversion operator allows ReturnRefOfCopy(x) to be 
-  // used in ANY function that returns a reference to x's type. 
-  template <typename F> 
-  operator Action<F>() const { 
-    typedef typename Function<F>::Result Result; 
-    // Asserts that the function return type is a reference.  This 
-    // catches the user error of using ReturnRefOfCopy(x) when Return(x) 
-    // should be used, and generates some helpful error message. 
-    GTEST_COMPILE_ASSERT_( 
+
+   private:
+    T& ref_;
+  };
+
+  T& ref_;
+};
+
+// Implements the polymorphic ReturnRefOfCopy(x) action, which can be
+// used in any function that returns a reference to the type of x,
+// regardless of the argument types.
+template <typename T>
+class ReturnRefOfCopyAction {
+ public:
+  // Constructs a ReturnRefOfCopyAction object from the reference to
+  // be returned.
+  explicit ReturnRefOfCopyAction(const T& value) : value_(value) {}  // NOLINT
+
+  // This template type conversion operator allows ReturnRefOfCopy(x) to be
+  // used in ANY function that returns a reference to x's type.
+  template <typename F>
+  operator Action<F>() const {
+    typedef typename Function<F>::Result Result;
+    // Asserts that the function return type is a reference.  This
+    // catches the user error of using ReturnRefOfCopy(x) when Return(x)
+    // should be used, and generates some helpful error message.
+    GTEST_COMPILE_ASSERT_(
         std::is_reference<Result>::value,
-        use_Return_instead_of_ReturnRefOfCopy_to_return_a_value); 
-    return Action<F>(new Impl<F>(value_)); 
-  } 
- 
- private: 
-  // Implements the ReturnRefOfCopy(x) action for a particular function type F. 
-  template <typename F> 
-  class Impl : public ActionInterface<F> { 
-   public: 
-    typedef typename Function<F>::Result Result; 
-    typedef typename Function<F>::ArgumentTuple ArgumentTuple; 
- 
-    explicit Impl(const T& value) : value_(value) {}  // NOLINT 
- 
+        use_Return_instead_of_ReturnRefOfCopy_to_return_a_value);
+    return Action<F>(new Impl<F>(value_));
+  }
+
+ private:
+  // Implements the ReturnRefOfCopy(x) action for a particular function type F.
+  template <typename F>
+  class Impl : public ActionInterface<F> {
+   public:
+    typedef typename Function<F>::Result Result;
+    typedef typename Function<F>::ArgumentTuple ArgumentTuple;
+
+    explicit Impl(const T& value) : value_(value) {}  // NOLINT
+
     Result Perform(const ArgumentTuple&) override { return value_; }
- 
-   private: 
-    T value_; 
-  }; 
- 
-  const T value_; 
+
+   private:
+    T value_;
+  };
+
+  const T value_;
 };
- 
+
 // Implements the polymorphic ReturnRoundRobin(v) action, which can be
 // used in any function that returns the element_type of v.
 template <typename T>
@@ -854,167 +854,167 @@ class ReturnRoundRobinAction {
     size_t i = 0;
   };
   std::shared_ptr<State> state_ = std::make_shared<State>();
-}; 
- 
-// Implements the polymorphic DoDefault() action. 
-class DoDefaultAction { 
- public: 
-  // This template type conversion operator allows DoDefault() to be 
-  // used in any function. 
-  template <typename F> 
+};
+
+// Implements the polymorphic DoDefault() action.
+class DoDefaultAction {
+ public:
+  // This template type conversion operator allows DoDefault() to be
+  // used in any function.
+  template <typename F>
   operator Action<F>() const { return Action<F>(); }  // NOLINT
-}; 
- 
-// Implements the Assign action to set a given pointer referent to a 
-// particular value. 
-template <typename T1, typename T2> 
-class AssignAction { 
- public: 
-  AssignAction(T1* ptr, T2 value) : ptr_(ptr), value_(value) {} 
- 
-  template <typename Result, typename ArgumentTuple> 
-  void Perform(const ArgumentTuple& /* args */) const { 
-    *ptr_ = value_; 
-  } 
- 
- private: 
-  T1* const ptr_; 
-  const T2 value_; 
-}; 
- 
-#if !GTEST_OS_WINDOWS_MOBILE 
- 
-// Implements the SetErrnoAndReturn action to simulate return from 
-// various system calls and libc functions. 
-template <typename T> 
-class SetErrnoAndReturnAction { 
- public: 
-  SetErrnoAndReturnAction(int errno_value, T result) 
-      : errno_(errno_value), 
-        result_(result) {} 
-  template <typename Result, typename ArgumentTuple> 
-  Result Perform(const ArgumentTuple& /* args */) const { 
-    errno = errno_; 
-    return result_; 
-  } 
- 
- private: 
-  const int errno_; 
-  const T result_; 
-}; 
- 
-#endif  // !GTEST_OS_WINDOWS_MOBILE 
- 
-// Implements the SetArgumentPointee<N>(x) action for any function 
+};
+
+// Implements the Assign action to set a given pointer referent to a
+// particular value.
+template <typename T1, typename T2>
+class AssignAction {
+ public:
+  AssignAction(T1* ptr, T2 value) : ptr_(ptr), value_(value) {}
+
+  template <typename Result, typename ArgumentTuple>
+  void Perform(const ArgumentTuple& /* args */) const {
+    *ptr_ = value_;
+  }
+
+ private:
+  T1* const ptr_;
+  const T2 value_;
+};
+
+#if !GTEST_OS_WINDOWS_MOBILE
+
+// Implements the SetErrnoAndReturn action to simulate return from
+// various system calls and libc functions.
+template <typename T>
+class SetErrnoAndReturnAction {
+ public:
+  SetErrnoAndReturnAction(int errno_value, T result)
+      : errno_(errno_value),
+        result_(result) {}
+  template <typename Result, typename ArgumentTuple>
+  Result Perform(const ArgumentTuple& /* args */) const {
+    errno = errno_;
+    return result_;
+  }
+
+ private:
+  const int errno_;
+  const T result_;
+};
+
+#endif  // !GTEST_OS_WINDOWS_MOBILE
+
+// Implements the SetArgumentPointee<N>(x) action for any function
 // whose N-th argument (0-based) is a pointer to x's type.
 template <size_t N, typename A, typename = void>
 struct SetArgumentPointeeAction {
   A value;
- 
+
   template <typename... Args>
   void operator()(const Args&... args) const {
     *::std::get<N>(std::tie(args...)) = value;
-  } 
-}; 
- 
+  }
+};
+
 // Implements the Invoke(object_ptr, &Class::Method) action.
 template <class Class, typename MethodPtr>
 struct InvokeMethodAction {
   Class* const obj_ptr;
   const MethodPtr method_ptr;
- 
+
   template <typename... Args>
   auto operator()(Args&&... args) const
       -> decltype((obj_ptr->*method_ptr)(std::forward<Args>(args)...)) {
     return (obj_ptr->*method_ptr)(std::forward<Args>(args)...);
-  } 
-}; 
- 
-// Implements the InvokeWithoutArgs(f) action.  The template argument 
-// FunctionImpl is the implementation type of f, which can be either a 
-// function pointer or a functor.  InvokeWithoutArgs(f) can be used as an 
+  }
+};
+
+// Implements the InvokeWithoutArgs(f) action.  The template argument
+// FunctionImpl is the implementation type of f, which can be either a
+// function pointer or a functor.  InvokeWithoutArgs(f) can be used as an
 // Action<F> as long as f's type is compatible with F.
-template <typename FunctionImpl> 
+template <typename FunctionImpl>
 struct InvokeWithoutArgsAction {
   FunctionImpl function_impl;
- 
-  // Allows InvokeWithoutArgs(f) to be used as any action whose type is 
-  // compatible with f. 
+
+  // Allows InvokeWithoutArgs(f) to be used as any action whose type is
+  // compatible with f.
   template <typename... Args>
   auto operator()(const Args&...) -> decltype(function_impl()) {
     return function_impl();
   }
-}; 
- 
-// Implements the InvokeWithoutArgs(object_ptr, &Class::Method) action. 
-template <class Class, typename MethodPtr> 
+};
+
+// Implements the InvokeWithoutArgs(object_ptr, &Class::Method) action.
+template <class Class, typename MethodPtr>
 struct InvokeMethodWithoutArgsAction {
   Class* const obj_ptr;
   const MethodPtr method_ptr;
- 
+
   using ReturnType =
       decltype((std::declval<Class*>()->*std::declval<MethodPtr>())());
 
   template <typename... Args>
   ReturnType operator()(const Args&...) const {
     return (obj_ptr->*method_ptr)();
-  } 
-}; 
- 
-// Implements the IgnoreResult(action) action. 
-template <typename A> 
-class IgnoreResultAction { 
- public: 
-  explicit IgnoreResultAction(const A& action) : action_(action) {} 
- 
-  template <typename F> 
-  operator Action<F>() const { 
-    // Assert statement belongs here because this is the best place to verify 
-    // conditions on F. It produces the clearest error messages 
-    // in most compilers. 
-    // Impl really belongs in this scope as a local class but can't 
-    // because MSVC produces duplicate symbols in different translation units 
-    // in this case. Until MS fixes that bug we put Impl into the class scope 
-    // and put the typedef both here (for use in assert statement) and 
-    // in the Impl class. But both definitions must be the same. 
-    typedef typename internal::Function<F>::Result Result; 
- 
-    // Asserts at compile time that F returns void. 
+  }
+};
+
+// Implements the IgnoreResult(action) action.
+template <typename A>
+class IgnoreResultAction {
+ public:
+  explicit IgnoreResultAction(const A& action) : action_(action) {}
+
+  template <typename F>
+  operator Action<F>() const {
+    // Assert statement belongs here because this is the best place to verify
+    // conditions on F. It produces the clearest error messages
+    // in most compilers.
+    // Impl really belongs in this scope as a local class but can't
+    // because MSVC produces duplicate symbols in different translation units
+    // in this case. Until MS fixes that bug we put Impl into the class scope
+    // and put the typedef both here (for use in assert statement) and
+    // in the Impl class. But both definitions must be the same.
+    typedef typename internal::Function<F>::Result Result;
+
+    // Asserts at compile time that F returns void.
     static_assert(std::is_void<Result>::value, "Result type should be void.");
- 
-    return Action<F>(new Impl<F>(action_)); 
-  } 
- 
- private: 
-  template <typename F> 
-  class Impl : public ActionInterface<F> { 
-   public: 
-    typedef typename internal::Function<F>::Result Result; 
-    typedef typename internal::Function<F>::ArgumentTuple ArgumentTuple; 
- 
-    explicit Impl(const A& action) : action_(action) {} 
- 
+
+    return Action<F>(new Impl<F>(action_));
+  }
+
+ private:
+  template <typename F>
+  class Impl : public ActionInterface<F> {
+   public:
+    typedef typename internal::Function<F>::Result Result;
+    typedef typename internal::Function<F>::ArgumentTuple ArgumentTuple;
+
+    explicit Impl(const A& action) : action_(action) {}
+
     void Perform(const ArgumentTuple& args) override {
-      // Performs the action and ignores its result. 
-      action_.Perform(args); 
-    } 
- 
-   private: 
-    // Type OriginalFunction is the same as F except that its return 
-    // type is IgnoredValue. 
-    typedef typename internal::Function<F>::MakeResultIgnoredValue 
-        OriginalFunction; 
- 
-    const Action<OriginalFunction> action_; 
-  }; 
- 
-  const A action_; 
-}; 
- 
+      // Performs the action and ignores its result.
+      action_.Perform(args);
+    }
+
+   private:
+    // Type OriginalFunction is the same as F except that its return
+    // type is IgnoredValue.
+    typedef typename internal::Function<F>::MakeResultIgnoredValue
+        OriginalFunction;
+
+    const Action<OriginalFunction> action_;
+  };
+
+  const A action_;
+};
+
 template <typename InnerAction, size_t... I>
 struct WithArgsAction {
   InnerAction action;
- 
+
   // The inner action could be anything convertible to Action<X>.
   // We use the conversion operator to detect the signature of the inner Action.
   template <typename R, typename... Args>
@@ -1028,8 +1028,8 @@ struct WithArgsAction {
         std::get<I>(std::forward_as_tuple(std::forward<Args>(args)...))...));
     };
   }
-}; 
- 
+};
+
 template <typename... Actions>
 struct DoAllAction {
  private:
@@ -1041,10 +1041,10 @@ struct DoAllAction {
   std::vector<ActionT> Convert(IndexSequence<I...>) const {
     return {ActionT(std::get<I>(actions))...};
   }
- 
- public: 
+
+ public:
   std::tuple<Actions...> actions;
- 
+
   template <typename R, typename... Args>
   operator Action<R(Args...)>() const {  // NOLINT
     struct Op {
@@ -1061,9 +1061,9 @@ struct DoAllAction {
     return Op{Convert<Action<void(NonFinalType<Args>...)>>(
                   MakeIndexSequence<sizeof...(Actions) - 1>()),
               std::get<sizeof...(Actions) - 1>(actions)};
-  } 
-}; 
- 
+  }
+};
+
 template <typename T, typename... Params>
 struct ReturnNewAction {
   T* operator()() const {
@@ -1163,40 +1163,40 @@ struct ThrowAction {
 };
 #endif  // GTEST_HAS_EXCEPTIONS
 
-}  // namespace internal 
- 
-// An Unused object can be implicitly constructed from ANY value. 
-// This is handy when defining actions that ignore some or all of the 
-// mock function arguments.  For example, given 
-// 
-//   MOCK_METHOD3(Foo, double(const string& label, double x, double y)); 
-//   MOCK_METHOD3(Bar, double(int index, double x, double y)); 
-// 
-// instead of 
-// 
-//   double DistanceToOriginWithLabel(const string& label, double x, double y) { 
-//     return sqrt(x*x + y*y); 
-//   } 
-//   double DistanceToOriginWithIndex(int index, double x, double y) { 
-//     return sqrt(x*x + y*y); 
-//   } 
-//   ... 
+}  // namespace internal
+
+// An Unused object can be implicitly constructed from ANY value.
+// This is handy when defining actions that ignore some or all of the
+// mock function arguments.  For example, given
+//
+//   MOCK_METHOD3(Foo, double(const string& label, double x, double y));
+//   MOCK_METHOD3(Bar, double(int index, double x, double y));
+//
+// instead of
+//
+//   double DistanceToOriginWithLabel(const string& label, double x, double y) {
+//     return sqrt(x*x + y*y);
+//   }
+//   double DistanceToOriginWithIndex(int index, double x, double y) {
+//     return sqrt(x*x + y*y);
+//   }
+//   ...
 //   EXPECT_CALL(mock, Foo("abc", _, _))
-//       .WillOnce(Invoke(DistanceToOriginWithLabel)); 
+//       .WillOnce(Invoke(DistanceToOriginWithLabel));
 //   EXPECT_CALL(mock, Bar(5, _, _))
-//       .WillOnce(Invoke(DistanceToOriginWithIndex)); 
-// 
-// you could write 
-// 
-//   // We can declare any uninteresting argument as Unused. 
-//   double DistanceToOrigin(Unused, double x, double y) { 
-//     return sqrt(x*x + y*y); 
-//   } 
-//   ... 
+//       .WillOnce(Invoke(DistanceToOriginWithIndex));
+//
+// you could write
+//
+//   // We can declare any uninteresting argument as Unused.
+//   double DistanceToOrigin(Unused, double x, double y) {
+//     return sqrt(x*x + y*y);
+//   }
+//   ...
 //   EXPECT_CALL(mock, Foo("abc", _, _)).WillOnce(Invoke(DistanceToOrigin));
 //   EXPECT_CALL(mock, Bar(5, _, _)).WillOnce(Invoke(DistanceToOrigin));
-typedef internal::IgnoredValue Unused; 
- 
+typedef internal::IgnoredValue Unused;
+
 // Creates an action that does actions a1, a2, ..., sequentially in
 // each invocation. All but the last action will have a readonly view of the
 // arguments.
@@ -1205,7 +1205,7 @@ internal::DoAllAction<typename std::decay<Action>::type...> DoAll(
     Action&&... action) {
   return {std::forward_as_tuple(std::forward<Action>(action)...)};
 }
- 
+
 // WithArg<k>(an_action) creates an action that passes the k-th
 // (0-based) argument of the mock function to an_action and performs
 // it.  It adapts an action accepting one argument to one that accepts
@@ -1237,51 +1237,51 @@ WithoutArgs(InnerAction&& action) {
   return {std::forward<InnerAction>(action)};
 }
 
-// Creates an action that returns 'value'.  'value' is passed by value 
-// instead of const reference - otherwise Return("string literal") 
-// will trigger a compiler error about using array as initializer. 
-template <typename R> 
-internal::ReturnAction<R> Return(R value) { 
+// Creates an action that returns 'value'.  'value' is passed by value
+// instead of const reference - otherwise Return("string literal")
+// will trigger a compiler error about using array as initializer.
+template <typename R>
+internal::ReturnAction<R> Return(R value) {
   return internal::ReturnAction<R>(std::move(value));
-} 
- 
-// Creates an action that returns NULL. 
-inline PolymorphicAction<internal::ReturnNullAction> ReturnNull() { 
-  return MakePolymorphicAction(internal::ReturnNullAction()); 
-} 
- 
-// Creates an action that returns from a void function. 
-inline PolymorphicAction<internal::ReturnVoidAction> Return() { 
-  return MakePolymorphicAction(internal::ReturnVoidAction()); 
-} 
- 
-// Creates an action that returns the reference to a variable. 
-template <typename R> 
-inline internal::ReturnRefAction<R> ReturnRef(R& x) {  // NOLINT 
-  return internal::ReturnRefAction<R>(x); 
-} 
- 
+}
+
+// Creates an action that returns NULL.
+inline PolymorphicAction<internal::ReturnNullAction> ReturnNull() {
+  return MakePolymorphicAction(internal::ReturnNullAction());
+}
+
+// Creates an action that returns from a void function.
+inline PolymorphicAction<internal::ReturnVoidAction> Return() {
+  return MakePolymorphicAction(internal::ReturnVoidAction());
+}
+
+// Creates an action that returns the reference to a variable.
+template <typename R>
+inline internal::ReturnRefAction<R> ReturnRef(R& x) {  // NOLINT
+  return internal::ReturnRefAction<R>(x);
+}
+
 // Prevent using ReturnRef on reference to temporary.
 template <typename R, R* = nullptr>
 internal::ReturnRefAction<R> ReturnRef(R&&) = delete;
 
-// Creates an action that returns the reference to a copy of the 
-// argument.  The copy is created when the action is constructed and 
-// lives as long as the action. 
-template <typename R> 
-inline internal::ReturnRefOfCopyAction<R> ReturnRefOfCopy(const R& x) { 
-  return internal::ReturnRefOfCopyAction<R>(x); 
-} 
- 
-// Modifies the parent action (a Return() action) to perform a move of the 
-// argument instead of a copy. 
-// Return(ByMove()) actions can only be executed once and will assert this 
-// invariant. 
-template <typename R> 
-internal::ByMoveWrapper<R> ByMove(R x) { 
+// Creates an action that returns the reference to a copy of the
+// argument.  The copy is created when the action is constructed and
+// lives as long as the action.
+template <typename R>
+inline internal::ReturnRefOfCopyAction<R> ReturnRefOfCopy(const R& x) {
+  return internal::ReturnRefOfCopyAction<R>(x);
+}
+
+// Modifies the parent action (a Return() action) to perform a move of the
+// argument instead of a copy.
+// Return(ByMove()) actions can only be executed once and will assert this
+// invariant.
+template <typename R>
+internal::ByMoveWrapper<R> ByMove(R x) {
   return internal::ByMoveWrapper<R>(std::move(x));
-} 
- 
+}
+
 // Creates an action that returns an element of `vals`. Calling this action will
 // repeatedly return the next value from `vals` until it reaches the end and
 // will restart from the beginning.
@@ -1299,44 +1299,44 @@ internal::ReturnRoundRobinAction<T> ReturnRoundRobin(
   return internal::ReturnRoundRobinAction<T>(std::vector<T>(vals));
 }
 
-// Creates an action that does the default action for the give mock function. 
-inline internal::DoDefaultAction DoDefault() { 
-  return internal::DoDefaultAction(); 
-} 
- 
-// Creates an action that sets the variable pointed by the N-th 
-// (0-based) function argument to 'value'. 
-template <size_t N, typename T> 
+// Creates an action that does the default action for the give mock function.
+inline internal::DoDefaultAction DoDefault() {
+  return internal::DoDefaultAction();
+}
+
+// Creates an action that sets the variable pointed by the N-th
+// (0-based) function argument to 'value'.
+template <size_t N, typename T>
 internal::SetArgumentPointeeAction<N, T> SetArgPointee(T value) {
   return {std::move(value)};
-} 
- 
-// The following version is DEPRECATED. 
-template <size_t N, typename T> 
+}
+
+// The following version is DEPRECATED.
+template <size_t N, typename T>
 internal::SetArgumentPointeeAction<N, T> SetArgumentPointee(T value) {
   return {std::move(value)};
-} 
- 
-// Creates an action that sets a pointer referent to a given value. 
-template <typename T1, typename T2> 
-PolymorphicAction<internal::AssignAction<T1, T2> > Assign(T1* ptr, T2 val) { 
-  return MakePolymorphicAction(internal::AssignAction<T1, T2>(ptr, val)); 
-} 
- 
-#if !GTEST_OS_WINDOWS_MOBILE 
- 
-// Creates an action that sets errno and returns the appropriate error. 
-template <typename T> 
-PolymorphicAction<internal::SetErrnoAndReturnAction<T> > 
-SetErrnoAndReturn(int errval, T result) { 
-  return MakePolymorphicAction( 
-      internal::SetErrnoAndReturnAction<T>(errval, result)); 
-} 
- 
-#endif  // !GTEST_OS_WINDOWS_MOBILE 
- 
+}
+
+// Creates an action that sets a pointer referent to a given value.
+template <typename T1, typename T2>
+PolymorphicAction<internal::AssignAction<T1, T2> > Assign(T1* ptr, T2 val) {
+  return MakePolymorphicAction(internal::AssignAction<T1, T2>(ptr, val));
+}
+
+#if !GTEST_OS_WINDOWS_MOBILE
+
+// Creates an action that sets errno and returns the appropriate error.
+template <typename T>
+PolymorphicAction<internal::SetErrnoAndReturnAction<T> >
+SetErrnoAndReturn(int errval, T result) {
+  return MakePolymorphicAction(
+      internal::SetErrnoAndReturnAction<T>(errval, result));
+}
+
+#endif  // !GTEST_OS_WINDOWS_MOBILE
+
 // Various overloads for Invoke().
- 
+
 // Legacy function.
 // Actions can now be implicitly constructed from callables. No need to create
 // wrapper objects.
@@ -1354,44 +1354,44 @@ internal::InvokeMethodAction<Class, MethodPtr> Invoke(Class* obj_ptr,
   return {obj_ptr, method_ptr};
 }
 
-// Creates an action that invokes 'function_impl' with no argument. 
-template <typename FunctionImpl> 
+// Creates an action that invokes 'function_impl' with no argument.
+template <typename FunctionImpl>
 internal::InvokeWithoutArgsAction<typename std::decay<FunctionImpl>::type>
-InvokeWithoutArgs(FunctionImpl function_impl) { 
+InvokeWithoutArgs(FunctionImpl function_impl) {
   return {std::move(function_impl)};
-} 
- 
-// Creates an action that invokes the given method on the given object 
-// with no argument. 
-template <class Class, typename MethodPtr> 
+}
+
+// Creates an action that invokes the given method on the given object
+// with no argument.
+template <class Class, typename MethodPtr>
 internal::InvokeMethodWithoutArgsAction<Class, MethodPtr> InvokeWithoutArgs(
     Class* obj_ptr, MethodPtr method_ptr) {
   return {obj_ptr, method_ptr};
-} 
- 
-// Creates an action that performs an_action and throws away its 
-// result.  In other words, it changes the return type of an_action to 
-// void.  an_action MUST NOT return void, or the code won't compile. 
-template <typename A> 
-inline internal::IgnoreResultAction<A> IgnoreResult(const A& an_action) { 
-  return internal::IgnoreResultAction<A>(an_action); 
-} 
- 
-// Creates a reference wrapper for the given L-value.  If necessary, 
-// you can explicitly specify the type of the reference.  For example, 
-// suppose 'derived' is an object of type Derived, ByRef(derived) 
-// would wrap a Derived&.  If you want to wrap a const Base& instead, 
-// where Base is a base class of Derived, just write: 
-// 
-//   ByRef<const Base>(derived) 
+}
+
+// Creates an action that performs an_action and throws away its
+// result.  In other words, it changes the return type of an_action to
+// void.  an_action MUST NOT return void, or the code won't compile.
+template <typename A>
+inline internal::IgnoreResultAction<A> IgnoreResult(const A& an_action) {
+  return internal::IgnoreResultAction<A>(an_action);
+}
+
+// Creates a reference wrapper for the given L-value.  If necessary,
+// you can explicitly specify the type of the reference.  For example,
+// suppose 'derived' is an object of type Derived, ByRef(derived)
+// would wrap a Derived&.  If you want to wrap a const Base& instead,
+// where Base is a base class of Derived, just write:
+//
+//   ByRef<const Base>(derived)
 //
 // N.B. ByRef is redundant with std::ref, std::cref and std::reference_wrapper.
 // However, it may still be used for consistency with ByMove().
-template <typename T> 
+template <typename T>
 inline ::std::reference_wrapper<T> ByRef(T& l_value) {  // NOLINT
   return ::std::reference_wrapper<T>(l_value);
-} 
- 
+}
+
 // The ReturnNew<T>(a1, a2, ..., a_k) action returns a pointer to a new
 // instance of type T, constructed on the heap with constructor arguments
 // a1, a2, ..., and a_k. The caller assumes ownership of the returned value.
@@ -1678,8 +1678,8 @@ template <typename F, typename Impl>
 #define ACTION_P10(name, ...) \
   GMOCK_INTERNAL_ACTION(name, name##ActionP10, (__VA_ARGS__))
 
-}  // namespace testing 
- 
+}  // namespace testing
+
 #ifdef _MSC_VER
 # pragma warning(pop)
 #endif
diff --git a/contrib/restricted/googletest/googlemock/include/gmock/gmock-cardinalities.h b/contrib/restricted/googletest/googlemock/include/gmock/gmock-cardinalities.h
index 2065c434cf..fc7f803a7a 100644
--- a/contrib/restricted/googletest/googlemock/include/gmock/gmock-cardinalities.h
+++ b/contrib/restricted/googletest/googlemock/include/gmock/gmock-cardinalities.h
@@ -1,157 +1,157 @@
-// Copyright 2007, Google Inc. 
-// All rights reserved. 
-// 
-// Redistribution and use in source and binary forms, with or without 
-// modification, are permitted provided that the following conditions are 
-// met: 
-// 
-//     * Redistributions of source code must retain the above copyright 
-// notice, this list of conditions and the following disclaimer. 
-//     * Redistributions in binary form must reproduce the above 
-// copyright notice, this list of conditions and the following disclaimer 
-// in the documentation and/or other materials provided with the 
-// distribution. 
-//     * Neither the name of Google Inc. nor the names of its 
-// contributors may be used to endorse or promote products derived from 
-// this software without specific prior written permission. 
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- 
-
-// Google Mock - a framework for writing C++ mock classes. 
-// 
-// This file implements some commonly used cardinalities.  More 
-// cardinalities can be defined by the user implementing the 
-// CardinalityInterface interface if necessary. 
- 
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+// Google Mock - a framework for writing C++ mock classes.
+//
+// This file implements some commonly used cardinalities.  More
+// cardinalities can be defined by the user implementing the
+// CardinalityInterface interface if necessary.
+
 // GOOGLETEST_CM0002 DO NOT DELETE
 
 #ifndef GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_CARDINALITIES_H_
 #define GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_CARDINALITIES_H_
- 
-#include <limits.h> 
+
+#include <limits.h>
 #include <memory>
-#include <ostream>  // NOLINT 
-#include "gmock/internal/gmock-port.h" 
-#include "gtest/gtest.h" 
- 
+#include <ostream>  // NOLINT
+#include "gmock/internal/gmock-port.h"
+#include "gtest/gtest.h"
+
 GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
 /* class A needs to have dll-interface to be used by clients of class B */)
 
-namespace testing { 
- 
-// To implement a cardinality Foo, define: 
-//   1. a class FooCardinality that implements the 
-//      CardinalityInterface interface, and 
-//   2. a factory function that creates a Cardinality object from a 
-//      const FooCardinality*. 
-// 
-// The two-level delegation design follows that of Matcher, providing 
-// consistency for extension developers.  It also eases ownership 
-// management as Cardinality objects can now be copied like plain values. 
- 
-// The implementation of a cardinality. 
-class CardinalityInterface { 
- public: 
-  virtual ~CardinalityInterface() {} 
- 
-  // Conservative estimate on the lower/upper bound of the number of 
-  // calls allowed. 
-  virtual int ConservativeLowerBound() const { return 0; } 
-  virtual int ConservativeUpperBound() const { return INT_MAX; } 
- 
+namespace testing {
+
+// To implement a cardinality Foo, define:
+//   1. a class FooCardinality that implements the
+//      CardinalityInterface interface, and
+//   2. a factory function that creates a Cardinality object from a
+//      const FooCardinality*.
+//
+// The two-level delegation design follows that of Matcher, providing
+// consistency for extension developers.  It also eases ownership
+// management as Cardinality objects can now be copied like plain values.
+
+// The implementation of a cardinality.
+class CardinalityInterface {
+ public:
+  virtual ~CardinalityInterface() {}
+
+  // Conservative estimate on the lower/upper bound of the number of
+  // calls allowed.
+  virtual int ConservativeLowerBound() const { return 0; }
+  virtual int ConservativeUpperBound() const { return INT_MAX; }
+
   // Returns true if and only if call_count calls will satisfy this
   // cardinality.
-  virtual bool IsSatisfiedByCallCount(int call_count) const = 0; 
- 
+  virtual bool IsSatisfiedByCallCount(int call_count) const = 0;
+
   // Returns true if and only if call_count calls will saturate this
   // cardinality.
-  virtual bool IsSaturatedByCallCount(int call_count) const = 0; 
- 
-  // Describes self to an ostream. 
-  virtual void DescribeTo(::std::ostream* os) const = 0; 
-}; 
- 
-// A Cardinality is a copyable and IMMUTABLE (except by assignment) 
-// object that specifies how many times a mock function is expected to 
+  virtual bool IsSaturatedByCallCount(int call_count) const = 0;
+
+  // Describes self to an ostream.
+  virtual void DescribeTo(::std::ostream* os) const = 0;
+};
+
+// A Cardinality is a copyable and IMMUTABLE (except by assignment)
+// object that specifies how many times a mock function is expected to
 // be called.  The implementation of Cardinality is just a std::shared_ptr
 // to const CardinalityInterface. Don't inherit from Cardinality!
-class GTEST_API_ Cardinality { 
- public: 
-  // Constructs a null cardinality.  Needed for storing Cardinality 
-  // objects in STL containers. 
-  Cardinality() {} 
- 
-  // Constructs a Cardinality from its implementation. 
-  explicit Cardinality(const CardinalityInterface* impl) : impl_(impl) {} 
- 
-  // Conservative estimate on the lower/upper bound of the number of 
-  // calls allowed. 
-  int ConservativeLowerBound() const { return impl_->ConservativeLowerBound(); } 
-  int ConservativeUpperBound() const { return impl_->ConservativeUpperBound(); } 
- 
+class GTEST_API_ Cardinality {
+ public:
+  // Constructs a null cardinality.  Needed for storing Cardinality
+  // objects in STL containers.
+  Cardinality() {}
+
+  // Constructs a Cardinality from its implementation.
+  explicit Cardinality(const CardinalityInterface* impl) : impl_(impl) {}
+
+  // Conservative estimate on the lower/upper bound of the number of
+  // calls allowed.
+  int ConservativeLowerBound() const { return impl_->ConservativeLowerBound(); }
+  int ConservativeUpperBound() const { return impl_->ConservativeUpperBound(); }
+
   // Returns true if and only if call_count calls will satisfy this
   // cardinality.
-  bool IsSatisfiedByCallCount(int call_count) const { 
-    return impl_->IsSatisfiedByCallCount(call_count); 
-  } 
- 
+  bool IsSatisfiedByCallCount(int call_count) const {
+    return impl_->IsSatisfiedByCallCount(call_count);
+  }
+
   // Returns true if and only if call_count calls will saturate this
   // cardinality.
-  bool IsSaturatedByCallCount(int call_count) const { 
-    return impl_->IsSaturatedByCallCount(call_count); 
-  } 
- 
+  bool IsSaturatedByCallCount(int call_count) const {
+    return impl_->IsSaturatedByCallCount(call_count);
+  }
+
   // Returns true if and only if call_count calls will over-saturate this
-  // cardinality, i.e. exceed the maximum number of allowed calls. 
-  bool IsOverSaturatedByCallCount(int call_count) const { 
-    return impl_->IsSaturatedByCallCount(call_count) && 
-        !impl_->IsSatisfiedByCallCount(call_count); 
-  } 
- 
-  // Describes self to an ostream 
-  void DescribeTo(::std::ostream* os) const { impl_->DescribeTo(os); } 
- 
-  // Describes the given actual call count to an ostream. 
-  static void DescribeActualCallCountTo(int actual_call_count, 
-                                        ::std::ostream* os); 
- 
- private: 
+  // cardinality, i.e. exceed the maximum number of allowed calls.
+  bool IsOverSaturatedByCallCount(int call_count) const {
+    return impl_->IsSaturatedByCallCount(call_count) &&
+        !impl_->IsSatisfiedByCallCount(call_count);
+  }
+
+  // Describes self to an ostream
+  void DescribeTo(::std::ostream* os) const { impl_->DescribeTo(os); }
+
+  // Describes the given actual call count to an ostream.
+  static void DescribeActualCallCountTo(int actual_call_count,
+                                        ::std::ostream* os);
+
+ private:
   std::shared_ptr<const CardinalityInterface> impl_;
-}; 
- 
-// Creates a cardinality that allows at least n calls. 
-GTEST_API_ Cardinality AtLeast(int n); 
- 
-// Creates a cardinality that allows at most n calls. 
-GTEST_API_ Cardinality AtMost(int n); 
- 
-// Creates a cardinality that allows any number of calls. 
-GTEST_API_ Cardinality AnyNumber(); 
- 
-// Creates a cardinality that allows between min and max calls. 
-GTEST_API_ Cardinality Between(int min, int max); 
- 
-// Creates a cardinality that allows exactly n calls. 
-GTEST_API_ Cardinality Exactly(int n); 
- 
-// Creates a cardinality from its implementation. 
-inline Cardinality MakeCardinality(const CardinalityInterface* c) { 
-  return Cardinality(c); 
-} 
- 
-}  // namespace testing 
- 
+};
+
+// Creates a cardinality that allows at least n calls.
+GTEST_API_ Cardinality AtLeast(int n);
+
+// Creates a cardinality that allows at most n calls.
+GTEST_API_ Cardinality AtMost(int n);
+
+// Creates a cardinality that allows any number of calls.
+GTEST_API_ Cardinality AnyNumber();
+
+// Creates a cardinality that allows between min and max calls.
+GTEST_API_ Cardinality Between(int min, int max);
+
+// Creates a cardinality that allows exactly n calls.
+GTEST_API_ Cardinality Exactly(int n);
+
+// Creates a cardinality from its implementation.
+inline Cardinality MakeCardinality(const CardinalityInterface* c) {
+  return Cardinality(c);
+}
+
+}  // namespace testing
+
 GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251
 
 #endif  // GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_CARDINALITIES_H_
diff --git a/contrib/restricted/googletest/googlemock/include/gmock/gmock-matchers.h b/contrib/restricted/googletest/googlemock/include/gmock/gmock-matchers.h
index b073798ba3..86be9c176e 100644
--- a/contrib/restricted/googletest/googlemock/include/gmock/gmock-matchers.h
+++ b/contrib/restricted/googletest/googlemock/include/gmock/gmock-matchers.h
@@ -1,35 +1,35 @@
-// Copyright 2007, Google Inc. 
-// All rights reserved. 
-// 
-// Redistribution and use in source and binary forms, with or without 
-// modification, are permitted provided that the following conditions are 
-// met: 
-// 
-//     * Redistributions of source code must retain the above copyright 
-// notice, this list of conditions and the following disclaimer. 
-//     * Redistributions in binary form must reproduce the above 
-// copyright notice, this list of conditions and the following disclaimer 
-// in the documentation and/or other materials provided with the 
-// distribution. 
-//     * Neither the name of Google Inc. nor the names of its 
-// contributors may be used to endorse or promote products derived from 
-// this software without specific prior written permission. 
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- 
-
-// Google Mock - a framework for writing C++ mock classes. 
-// 
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+// Google Mock - a framework for writing C++ mock classes.
+//
 // The MATCHER* family of macros can be used in a namespace scope to
 // define custom matchers easily.
 //
@@ -244,129 +244,129 @@
 // https://github.com/google/googletest/blob/master/docs/gmock_cook_book.md
 //
 // This file also implements some commonly used argument matchers.  More
-// matchers can be defined by the user implementing the 
-// MatcherInterface<T> interface if necessary. 
+// matchers can be defined by the user implementing the
+// MatcherInterface<T> interface if necessary.
 //
 // See googletest/include/gtest/gtest-matchers.h for the definition of class
 // Matcher, class MatcherInterface, and others.
- 
+
 // GOOGLETEST_CM0002 DO NOT DELETE
 
 #ifndef GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_MATCHERS_H_
 #define GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_MATCHERS_H_
- 
-#include <algorithm> 
+
+#include <algorithm>
 #include <cmath>
 #include <initializer_list>
-#include <iterator> 
-#include <limits> 
+#include <iterator>
+#include <limits>
 #include <memory>
-#include <ostream>  // NOLINT 
-#include <sstream> 
-#include <string> 
+#include <ostream>  // NOLINT
+#include <sstream>
+#include <string>
 #include <type_traits>
-#include <utility> 
-#include <vector> 
+#include <utility>
+#include <vector>
 
-#include "gmock/internal/gmock-internal-utils.h" 
-#include "gmock/internal/gmock-port.h" 
+#include "gmock/internal/gmock-internal-utils.h"
+#include "gmock/internal/gmock-port.h"
 #include "gmock/internal/gmock-pp.h"
-#include "gtest/gtest.h" 
- 
+#include "gtest/gtest.h"
+
 // MSVC warning C5046 is new as of VS2017 version 15.8.
 #if defined(_MSC_VER) && _MSC_VER >= 1915
 #define GMOCK_MAYBE_5046_ 5046
 #else
 #define GMOCK_MAYBE_5046_
-#endif 
- 
+#endif
+
 GTEST_DISABLE_MSC_WARNINGS_PUSH_(
     4251 GMOCK_MAYBE_5046_ /* class A needs to have dll-interface to be used by
                               clients of class B */
     /* Symbol involving type with internal linkage not defined */)
 
-namespace testing { 
- 
-// To implement a matcher Foo for type T, define: 
-//   1. a class FooMatcherImpl that implements the 
-//      MatcherInterface<T> interface, and 
-//   2. a factory function that creates a Matcher<T> object from a 
-//      FooMatcherImpl*. 
-// 
-// The two-level delegation design makes it possible to allow a user 
-// to write "v" instead of "Eq(v)" where a Matcher is expected, which 
-// is impossible if we pass matchers by pointers.  It also eases 
-// ownership management as Matcher objects can now be copied like 
-// plain values. 
- 
-// A match result listener that stores the explanation in a string. 
-class StringMatchResultListener : public MatchResultListener { 
- public: 
-  StringMatchResultListener() : MatchResultListener(&ss_) {} 
- 
-  // Returns the explanation accumulated so far. 
+namespace testing {
+
+// To implement a matcher Foo for type T, define:
+//   1. a class FooMatcherImpl that implements the
+//      MatcherInterface<T> interface, and
+//   2. a factory function that creates a Matcher<T> object from a
+//      FooMatcherImpl*.
+//
+// The two-level delegation design makes it possible to allow a user
+// to write "v" instead of "Eq(v)" where a Matcher is expected, which
+// is impossible if we pass matchers by pointers.  It also eases
+// ownership management as Matcher objects can now be copied like
+// plain values.
+
+// A match result listener that stores the explanation in a string.
+class StringMatchResultListener : public MatchResultListener {
+ public:
+  StringMatchResultListener() : MatchResultListener(&ss_) {}
+
+  // Returns the explanation accumulated so far.
   std::string str() const { return ss_.str(); }
- 
-  // Clears the explanation accumulated so far. 
-  void Clear() { ss_.str(""); } 
- 
- private: 
-  ::std::stringstream ss_; 
- 
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(StringMatchResultListener); 
-}; 
- 
-// Anything inside the 'internal' namespace IS INTERNAL IMPLEMENTATION 
-// and MUST NOT BE USED IN USER CODE!!! 
-namespace internal { 
- 
-// The MatcherCastImpl class template is a helper for implementing 
-// MatcherCast().  We need this helper in order to partially 
-// specialize the implementation of MatcherCast() (C++ allows 
-// class/struct templates to be partially specialized, but not 
-// function templates.). 
- 
-// This general version is used when MatcherCast()'s argument is a 
-// polymorphic matcher (i.e. something that can be converted to a 
-// Matcher but is not one yet; for example, Eq(value)) or a value (for 
-// example, "hello"). 
-template <typename T, typename M> 
-class MatcherCastImpl { 
- public: 
-  static Matcher<T> Cast(const M& polymorphic_matcher_or_value) { 
+
+  // Clears the explanation accumulated so far.
+  void Clear() { ss_.str(""); }
+
+ private:
+  ::std::stringstream ss_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(StringMatchResultListener);
+};
+
+// Anything inside the 'internal' namespace IS INTERNAL IMPLEMENTATION
+// and MUST NOT BE USED IN USER CODE!!!
+namespace internal {
+
+// The MatcherCastImpl class template is a helper for implementing
+// MatcherCast().  We need this helper in order to partially
+// specialize the implementation of MatcherCast() (C++ allows
+// class/struct templates to be partially specialized, but not
+// function templates.).
+
+// This general version is used when MatcherCast()'s argument is a
+// polymorphic matcher (i.e. something that can be converted to a
+// Matcher but is not one yet; for example, Eq(value)) or a value (for
+// example, "hello").
+template <typename T, typename M>
+class MatcherCastImpl {
+ public:
+  static Matcher<T> Cast(const M& polymorphic_matcher_or_value) {
     // M can be a polymorphic matcher, in which case we want to use
-    // its conversion operator to create Matcher<T>.  Or it can be a value 
-    // that should be passed to the Matcher<T>'s constructor. 
-    // 
-    // We can't call Matcher<T>(polymorphic_matcher_or_value) when M is a 
-    // polymorphic matcher because it'll be ambiguous if T has an implicit 
-    // constructor from M (this usually happens when T has an implicit 
-    // constructor from any type). 
-    // 
+    // its conversion operator to create Matcher<T>.  Or it can be a value
+    // that should be passed to the Matcher<T>'s constructor.
+    //
+    // We can't call Matcher<T>(polymorphic_matcher_or_value) when M is a
+    // polymorphic matcher because it'll be ambiguous if T has an implicit
+    // constructor from M (this usually happens when T has an implicit
+    // constructor from any type).
+    //
     // It won't work to unconditionally implicit_cast
-    // polymorphic_matcher_or_value to Matcher<T> because it won't trigger 
-    // a user-defined conversion from M to T if one exists (assuming M is 
-    // a value). 
+    // polymorphic_matcher_or_value to Matcher<T> because it won't trigger
+    // a user-defined conversion from M to T if one exists (assuming M is
+    // a value).
     return CastImpl(polymorphic_matcher_or_value,
                     std::is_convertible<M, Matcher<T>>{},
                     std::is_convertible<M, T>{});
-  } 
- 
- private: 
+  }
+
+ private:
   template <bool Ignore>
-  static Matcher<T> CastImpl(const M& polymorphic_matcher_or_value, 
+  static Matcher<T> CastImpl(const M& polymorphic_matcher_or_value,
                              std::true_type /* convertible_to_matcher */,
                              std::integral_constant<bool, Ignore>) {
-    // M is implicitly convertible to Matcher<T>, which means that either 
+    // M is implicitly convertible to Matcher<T>, which means that either
     // M is a polymorphic matcher or Matcher<T> has an implicit constructor
-    // from M.  In both cases using the implicit conversion will produce a 
-    // matcher. 
-    // 
-    // Even if T has an implicit constructor from M, it won't be called because 
-    // creating Matcher<T> would require a chain of two user-defined conversions 
-    // (first to create T from M and then to create Matcher<T> from T). 
-    return polymorphic_matcher_or_value; 
-  } 
+    // from M.  In both cases using the implicit conversion will produce a
+    // matcher.
+    //
+    // Even if T has an implicit constructor from M, it won't be called because
+    // creating Matcher<T> would require a chain of two user-defined conversions
+    // (first to create T from M and then to create Matcher<T> from T).
+    return polymorphic_matcher_or_value;
+  }
 
   // M can't be implicitly converted to Matcher<T>, so M isn't a polymorphic
   // matcher. It's a value of a type implicitly convertible to T. Use direct
@@ -390,25 +390,25 @@ class MatcherCastImpl {
   static Matcher<T> CastImpl(const M& value,
                              std::false_type /* convertible_to_matcher */,
                              std::false_type /* convertible_to_T */);
-}; 
- 
-// This more specialized version is used when MatcherCast()'s argument 
-// is already a Matcher.  This only compiles when type T can be 
-// statically converted to type U. 
-template <typename T, typename U> 
-class MatcherCastImpl<T, Matcher<U> > { 
- public: 
-  static Matcher<T> Cast(const Matcher<U>& source_matcher) { 
-    return Matcher<T>(new Impl(source_matcher)); 
-  } 
- 
- private: 
-  class Impl : public MatcherInterface<T> { 
-   public: 
-    explicit Impl(const Matcher<U>& source_matcher) 
-        : source_matcher_(source_matcher) {} 
- 
-    // We delegate the matching logic to the source matcher. 
+};
+
+// This more specialized version is used when MatcherCast()'s argument
+// is already a Matcher.  This only compiles when type T can be
+// statically converted to type U.
+template <typename T, typename U>
+class MatcherCastImpl<T, Matcher<U> > {
+ public:
+  static Matcher<T> Cast(const Matcher<U>& source_matcher) {
+    return Matcher<T>(new Impl(source_matcher));
+  }
+
+ private:
+  class Impl : public MatcherInterface<T> {
+   public:
+    explicit Impl(const Matcher<U>& source_matcher)
+        : source_matcher_(source_matcher) {}
+
+    // We delegate the matching logic to the source matcher.
     bool MatchAndExplain(T x, MatchResultListener* listener) const override {
       using FromType = typename std::remove_cv<typename std::remove_pointer<
           typename std::remove_reference<T>::type>::type>::type;
@@ -432,29 +432,29 @@ class MatcherCastImpl<T, Matcher<U> > {
 
       return source_matcher_.MatchAndExplain(static_cast<CastType>(x),
                                              listener);
-    } 
- 
+    }
+
     void DescribeTo(::std::ostream* os) const override {
-      source_matcher_.DescribeTo(os); 
-    } 
- 
+      source_matcher_.DescribeTo(os);
+    }
+
     void DescribeNegationTo(::std::ostream* os) const override {
-      source_matcher_.DescribeNegationTo(os); 
-    } 
- 
-   private: 
-    const Matcher<U> source_matcher_; 
-  }; 
-}; 
- 
-// This even more specialized version is used for efficiently casting 
-// a matcher to its own type. 
-template <typename T> 
-class MatcherCastImpl<T, Matcher<T> > { 
- public: 
-  static Matcher<T> Cast(const Matcher<T>& matcher) { return matcher; } 
-}; 
- 
+      source_matcher_.DescribeNegationTo(os);
+    }
+
+   private:
+    const Matcher<U> source_matcher_;
+  };
+};
+
+// This even more specialized version is used for efficiently casting
+// a matcher to its own type.
+template <typename T>
+class MatcherCastImpl<T, Matcher<T> > {
+ public:
+  static Matcher<T> Cast(const Matcher<T>& matcher) { return matcher; }
+};
+
 // Template specialization for parameterless Matcher.
 template <typename Derived>
 class MatcherBaseImpl {
@@ -499,24 +499,24 @@ class MatcherBaseImpl<Derived<Ts...>> {
   const std::tuple<Ts...> params_;
 };
 
-}  // namespace internal 
- 
-// In order to be safe and clear, casting between different matcher 
-// types is done explicitly via MatcherCast<T>(m), which takes a 
-// matcher m and returns a Matcher<T>.  It compiles only when T can be 
-// statically converted to the argument type of m. 
-template <typename T, typename M> 
-inline Matcher<T> MatcherCast(const M& matcher) { 
-  return internal::MatcherCastImpl<T, M>::Cast(matcher); 
-} 
- 
+}  // namespace internal
+
+// In order to be safe and clear, casting between different matcher
+// types is done explicitly via MatcherCast<T>(m), which takes a
+// matcher m and returns a Matcher<T>.  It compiles only when T can be
+// statically converted to the argument type of m.
+template <typename T, typename M>
+inline Matcher<T> MatcherCast(const M& matcher) {
+  return internal::MatcherCastImpl<T, M>::Cast(matcher);
+}
+
 // This overload handles polymorphic matchers and values only since
 // monomorphic matchers are handled by the next one.
-template <typename T, typename M> 
+template <typename T, typename M>
 inline Matcher<T> SafeMatcherCast(const M& polymorphic_matcher_or_value) {
   return MatcherCast<T>(polymorphic_matcher_or_value);
-} 
- 
+}
+
 // This overload handles monomorphic matchers.
 //
 // In general, if type T can be implicitly converted to type U, we can
@@ -549,198 +549,198 @@ inline Matcher<T> SafeMatcherCast(const Matcher<U>& matcher) {
   return MatcherCast<T>(matcher);
 }
 
-// A<T>() returns a matcher that matches any value of type T. 
-template <typename T> 
-Matcher<T> A(); 
- 
-// Anything inside the 'internal' namespace IS INTERNAL IMPLEMENTATION 
-// and MUST NOT BE USED IN USER CODE!!! 
-namespace internal { 
- 
-// If the explanation is not empty, prints it to the ostream. 
+// A<T>() returns a matcher that matches any value of type T.
+template <typename T>
+Matcher<T> A();
+
+// Anything inside the 'internal' namespace IS INTERNAL IMPLEMENTATION
+// and MUST NOT BE USED IN USER CODE!!!
+namespace internal {
+
+// If the explanation is not empty, prints it to the ostream.
 inline void PrintIfNotEmpty(const std::string& explanation,
-                            ::std::ostream* os) { 
+                            ::std::ostream* os) {
   if (explanation != "" && os != nullptr) {
-    *os << ", " << explanation; 
-  } 
-} 
- 
-// Returns true if the given type name is easy to read by a human. 
-// This is used to decide whether printing the type of a value might 
-// be helpful. 
+    *os << ", " << explanation;
+  }
+}
+
+// Returns true if the given type name is easy to read by a human.
+// This is used to decide whether printing the type of a value might
+// be helpful.
 inline bool IsReadableTypeName(const std::string& type_name) {
-  // We consider a type name readable if it's short or doesn't contain 
-  // a template or function type. 
-  return (type_name.length() <= 20 || 
+  // We consider a type name readable if it's short or doesn't contain
+  // a template or function type.
+  return (type_name.length() <= 20 ||
           type_name.find_first_of("<(") == std::string::npos);
-} 
- 
-// Matches the value against the given matcher, prints the value and explains 
-// the match result to the listener. Returns the match result. 
-// 'listener' must not be NULL. 
-// Value cannot be passed by const reference, because some matchers take a 
-// non-const argument. 
-template <typename Value, typename T> 
-bool MatchPrintAndExplain(Value& value, const Matcher<T>& matcher, 
-                          MatchResultListener* listener) { 
-  if (!listener->IsInterested()) { 
-    // If the listener is not interested, we do not need to construct the 
-    // inner explanation. 
-    return matcher.Matches(value); 
-  } 
- 
-  StringMatchResultListener inner_listener; 
-  const bool match = matcher.MatchAndExplain(value, &inner_listener); 
- 
-  UniversalPrint(value, listener->stream()); 
-#if GTEST_HAS_RTTI 
+}
+
+// Matches the value against the given matcher, prints the value and explains
+// the match result to the listener. Returns the match result.
+// 'listener' must not be NULL.
+// Value cannot be passed by const reference, because some matchers take a
+// non-const argument.
+template <typename Value, typename T>
+bool MatchPrintAndExplain(Value& value, const Matcher<T>& matcher,
+                          MatchResultListener* listener) {
+  if (!listener->IsInterested()) {
+    // If the listener is not interested, we do not need to construct the
+    // inner explanation.
+    return matcher.Matches(value);
+  }
+
+  StringMatchResultListener inner_listener;
+  const bool match = matcher.MatchAndExplain(value, &inner_listener);
+
+  UniversalPrint(value, listener->stream());
+#if GTEST_HAS_RTTI
   const std::string& type_name = GetTypeName<Value>();
-  if (IsReadableTypeName(type_name)) 
-    *listener->stream() << " (of type " << type_name << ")"; 
-#endif 
-  PrintIfNotEmpty(inner_listener.str(), listener->stream()); 
- 
-  return match; 
-} 
- 
-// An internal helper class for doing compile-time loop on a tuple's 
-// fields. 
-template <size_t N> 
-class TuplePrefix { 
- public: 
-  // TuplePrefix<N>::Matches(matcher_tuple, value_tuple) returns true 
+  if (IsReadableTypeName(type_name))
+    *listener->stream() << " (of type " << type_name << ")";
+#endif
+  PrintIfNotEmpty(inner_listener.str(), listener->stream());
+
+  return match;
+}
+
+// An internal helper class for doing compile-time loop on a tuple's
+// fields.
+template <size_t N>
+class TuplePrefix {
+ public:
+  // TuplePrefix<N>::Matches(matcher_tuple, value_tuple) returns true
   // if and only if the first N fields of matcher_tuple matches
   // the first N fields of value_tuple, respectively.
-  template <typename MatcherTuple, typename ValueTuple> 
-  static bool Matches(const MatcherTuple& matcher_tuple, 
-                      const ValueTuple& value_tuple) { 
+  template <typename MatcherTuple, typename ValueTuple>
+  static bool Matches(const MatcherTuple& matcher_tuple,
+                      const ValueTuple& value_tuple) {
     return TuplePrefix<N - 1>::Matches(matcher_tuple, value_tuple) &&
            std::get<N - 1>(matcher_tuple).Matches(std::get<N - 1>(value_tuple));
-  } 
- 
-  // TuplePrefix<N>::ExplainMatchFailuresTo(matchers, values, os) 
-  // describes failures in matching the first N fields of matchers 
-  // against the first N fields of values.  If there is no failure, 
-  // nothing will be streamed to os. 
-  template <typename MatcherTuple, typename ValueTuple> 
-  static void ExplainMatchFailuresTo(const MatcherTuple& matchers, 
-                                     const ValueTuple& values, 
-                                     ::std::ostream* os) { 
-    // First, describes failures in the first N - 1 fields. 
-    TuplePrefix<N - 1>::ExplainMatchFailuresTo(matchers, values, os); 
- 
-    // Then describes the failure (if any) in the (N - 1)-th (0-based) 
-    // field. 
+  }
+
+  // TuplePrefix<N>::ExplainMatchFailuresTo(matchers, values, os)
+  // describes failures in matching the first N fields of matchers
+  // against the first N fields of values.  If there is no failure,
+  // nothing will be streamed to os.
+  template <typename MatcherTuple, typename ValueTuple>
+  static void ExplainMatchFailuresTo(const MatcherTuple& matchers,
+                                     const ValueTuple& values,
+                                     ::std::ostream* os) {
+    // First, describes failures in the first N - 1 fields.
+    TuplePrefix<N - 1>::ExplainMatchFailuresTo(matchers, values, os);
+
+    // Then describes the failure (if any) in the (N - 1)-th (0-based)
+    // field.
     typename std::tuple_element<N - 1, MatcherTuple>::type matcher =
         std::get<N - 1>(matchers);
     typedef typename std::tuple_element<N - 1, ValueTuple>::type Value;
     const Value& value = std::get<N - 1>(values);
-    StringMatchResultListener listener; 
-    if (!matcher.MatchAndExplain(value, &listener)) { 
-      *os << "  Expected arg #" << N - 1 << ": "; 
+    StringMatchResultListener listener;
+    if (!matcher.MatchAndExplain(value, &listener)) {
+      *os << "  Expected arg #" << N - 1 << ": ";
       std::get<N - 1>(matchers).DescribeTo(os);
-      *os << "\n           Actual: "; 
-      // We remove the reference in type Value to prevent the 
-      // universal printer from printing the address of value, which 
-      // isn't interesting to the user most of the time.  The 
-      // matcher's MatchAndExplain() method handles the case when 
-      // the address is interesting. 
-      internal::UniversalPrint(value, os); 
-      PrintIfNotEmpty(listener.str(), os); 
-      *os << "\n"; 
-    } 
-  } 
-}; 
- 
-// The base case. 
-template <> 
-class TuplePrefix<0> { 
- public: 
-  template <typename MatcherTuple, typename ValueTuple> 
-  static bool Matches(const MatcherTuple& /* matcher_tuple */, 
-                      const ValueTuple& /* value_tuple */) { 
-    return true; 
-  } 
- 
-  template <typename MatcherTuple, typename ValueTuple> 
-  static void ExplainMatchFailuresTo(const MatcherTuple& /* matchers */, 
-                                     const ValueTuple& /* values */, 
-                                     ::std::ostream* /* os */) {} 
-}; 
- 
+      *os << "\n           Actual: ";
+      // We remove the reference in type Value to prevent the
+      // universal printer from printing the address of value, which
+      // isn't interesting to the user most of the time.  The
+      // matcher's MatchAndExplain() method handles the case when
+      // the address is interesting.
+      internal::UniversalPrint(value, os);
+      PrintIfNotEmpty(listener.str(), os);
+      *os << "\n";
+    }
+  }
+};
+
+// The base case.
+template <>
+class TuplePrefix<0> {
+ public:
+  template <typename MatcherTuple, typename ValueTuple>
+  static bool Matches(const MatcherTuple& /* matcher_tuple */,
+                      const ValueTuple& /* value_tuple */) {
+    return true;
+  }
+
+  template <typename MatcherTuple, typename ValueTuple>
+  static void ExplainMatchFailuresTo(const MatcherTuple& /* matchers */,
+                                     const ValueTuple& /* values */,
+                                     ::std::ostream* /* os */) {}
+};
+
 // TupleMatches(matcher_tuple, value_tuple) returns true if and only if
 // all matchers in matcher_tuple match the corresponding fields in
-// value_tuple.  It is a compiler error if matcher_tuple and 
-// value_tuple have different number of fields or incompatible field 
-// types. 
-template <typename MatcherTuple, typename ValueTuple> 
-bool TupleMatches(const MatcherTuple& matcher_tuple, 
-                  const ValueTuple& value_tuple) { 
-  // Makes sure that matcher_tuple and value_tuple have the same 
-  // number of fields. 
+// value_tuple.  It is a compiler error if matcher_tuple and
+// value_tuple have different number of fields or incompatible field
+// types.
+template <typename MatcherTuple, typename ValueTuple>
+bool TupleMatches(const MatcherTuple& matcher_tuple,
+                  const ValueTuple& value_tuple) {
+  // Makes sure that matcher_tuple and value_tuple have the same
+  // number of fields.
   GTEST_COMPILE_ASSERT_(std::tuple_size<MatcherTuple>::value ==
                             std::tuple_size<ValueTuple>::value,
-                        matcher_and_value_have_different_numbers_of_fields); 
+                        matcher_and_value_have_different_numbers_of_fields);
   return TuplePrefix<std::tuple_size<ValueTuple>::value>::Matches(matcher_tuple,
                                                                   value_tuple);
-} 
- 
-// Describes failures in matching matchers against values.  If there 
-// is no failure, nothing will be streamed to os. 
-template <typename MatcherTuple, typename ValueTuple> 
-void ExplainMatchFailureTupleTo(const MatcherTuple& matchers, 
-                                const ValueTuple& values, 
-                                ::std::ostream* os) { 
+}
+
+// Describes failures in matching matchers against values.  If there
+// is no failure, nothing will be streamed to os.
+template <typename MatcherTuple, typename ValueTuple>
+void ExplainMatchFailureTupleTo(const MatcherTuple& matchers,
+                                const ValueTuple& values,
+                                ::std::ostream* os) {
   TuplePrefix<std::tuple_size<MatcherTuple>::value>::ExplainMatchFailuresTo(
-      matchers, values, os); 
-} 
- 
-// TransformTupleValues and its helper. 
-// 
-// TransformTupleValuesHelper hides the internal machinery that 
-// TransformTupleValues uses to implement a tuple traversal. 
-template <typename Tuple, typename Func, typename OutIter> 
-class TransformTupleValuesHelper { 
- private: 
+      matchers, values, os);
+}
+
+// TransformTupleValues and its helper.
+//
+// TransformTupleValuesHelper hides the internal machinery that
+// TransformTupleValues uses to implement a tuple traversal.
+template <typename Tuple, typename Func, typename OutIter>
+class TransformTupleValuesHelper {
+ private:
   typedef ::std::tuple_size<Tuple> TupleSize;
- 
- public: 
-  // For each member of tuple 't', taken in order, evaluates '*out++ = f(t)'. 
-  // Returns the final value of 'out' in case the caller needs it. 
-  static OutIter Run(Func f, const Tuple& t, OutIter out) { 
-    return IterateOverTuple<Tuple, TupleSize::value>()(f, t, out); 
-  } 
- 
- private: 
-  template <typename Tup, size_t kRemainingSize> 
-  struct IterateOverTuple { 
-    OutIter operator() (Func f, const Tup& t, OutIter out) const { 
+
+ public:
+  // For each member of tuple 't', taken in order, evaluates '*out++ = f(t)'.
+  // Returns the final value of 'out' in case the caller needs it.
+  static OutIter Run(Func f, const Tuple& t, OutIter out) {
+    return IterateOverTuple<Tuple, TupleSize::value>()(f, t, out);
+  }
+
+ private:
+  template <typename Tup, size_t kRemainingSize>
+  struct IterateOverTuple {
+    OutIter operator() (Func f, const Tup& t, OutIter out) const {
       *out++ = f(::std::get<TupleSize::value - kRemainingSize>(t));
-      return IterateOverTuple<Tup, kRemainingSize - 1>()(f, t, out); 
-    } 
-  }; 
-  template <typename Tup> 
-  struct IterateOverTuple<Tup, 0> { 
-    OutIter operator() (Func /* f */, const Tup& /* t */, OutIter out) const { 
-      return out; 
-    } 
-  }; 
-}; 
- 
-// Successively invokes 'f(element)' on each element of the tuple 't', 
-// appending each result to the 'out' iterator. Returns the final value 
-// of 'out'. 
-template <typename Tuple, typename Func, typename OutIter> 
-OutIter TransformTupleValues(Func f, const Tuple& t, OutIter out) { 
-  return TransformTupleValuesHelper<Tuple, Func, OutIter>::Run(f, t, out); 
-} 
- 
+      return IterateOverTuple<Tup, kRemainingSize - 1>()(f, t, out);
+    }
+  };
+  template <typename Tup>
+  struct IterateOverTuple<Tup, 0> {
+    OutIter operator() (Func /* f */, const Tup& /* t */, OutIter out) const {
+      return out;
+    }
+  };
+};
+
+// Successively invokes 'f(element)' on each element of the tuple 't',
+// appending each result to the 'out' iterator. Returns the final value
+// of 'out'.
+template <typename Tuple, typename Func, typename OutIter>
+OutIter TransformTupleValues(Func f, const Tuple& t, OutIter out) {
+  return TransformTupleValuesHelper<Tuple, Func, OutIter>::Run(f, t, out);
+}
+
 // Implements _, a matcher that matches any value of any
 // type.  This is a polymorphic matcher, so we need a template type
 // conversion operator to make it appearing as a Matcher<T> for any
 // type T.
 class AnythingMatcher {
- public: 
+ public:
   using is_gtest_matcher = void;
 
   template <typename T>
@@ -750,158 +750,158 @@ class AnythingMatcher {
   void DescribeTo(std::ostream* os) const { *os << "is anything"; }
   void DescribeNegationTo(::std::ostream* os) const {
     // This is mostly for completeness' sake, as it's not very useful
-    // to write Not(A<bool>()).  However we cannot completely rule out 
-    // such a possibility, and it doesn't hurt to be prepared. 
-    *os << "never matches"; 
-  } 
-}; 
- 
-// Implements the polymorphic IsNull() matcher, which matches any raw or smart 
-// pointer that is NULL. 
-class IsNullMatcher { 
- public: 
-  template <typename Pointer> 
-  bool MatchAndExplain(const Pointer& p, 
-                       MatchResultListener* /* listener */) const { 
-    return p == nullptr; 
-  } 
- 
-  void DescribeTo(::std::ostream* os) const { *os << "is NULL"; } 
-  void DescribeNegationTo(::std::ostream* os) const { 
-    *os << "isn't NULL"; 
-  } 
-}; 
- 
-// Implements the polymorphic NotNull() matcher, which matches any raw or smart 
-// pointer that is not NULL. 
-class NotNullMatcher { 
- public: 
-  template <typename Pointer> 
-  bool MatchAndExplain(const Pointer& p, 
-                       MatchResultListener* /* listener */) const { 
-    return p != nullptr; 
-  } 
- 
-  void DescribeTo(::std::ostream* os) const { *os << "isn't NULL"; } 
-  void DescribeNegationTo(::std::ostream* os) const { 
-    *os << "is NULL"; 
-  } 
-}; 
- 
-// Ref(variable) matches any argument that is a reference to 
-// 'variable'.  This matcher is polymorphic as it can match any 
-// super type of the type of 'variable'. 
-// 
-// The RefMatcher template class implements Ref(variable).  It can 
-// only be instantiated with a reference type.  This prevents a user 
-// from mistakenly using Ref(x) to match a non-reference function 
-// argument.  For example, the following will righteously cause a 
-// compiler error: 
-// 
-//   int n; 
-//   Matcher<int> m1 = Ref(n);   // This won't compile. 
-//   Matcher<int&> m2 = Ref(n);  // This will compile. 
-template <typename T> 
-class RefMatcher; 
- 
-template <typename T> 
-class RefMatcher<T&> { 
-  // Google Mock is a generic framework and thus needs to support 
-  // mocking any function types, including those that take non-const 
-  // reference arguments.  Therefore the template parameter T (and 
-  // Super below) can be instantiated to either a const type or a 
-  // non-const type. 
- public: 
-  // RefMatcher() takes a T& instead of const T&, as we want the 
-  // compiler to catch using Ref(const_value) as a matcher for a 
-  // non-const reference. 
-  explicit RefMatcher(T& x) : object_(x) {}  // NOLINT 
- 
-  template <typename Super> 
-  operator Matcher<Super&>() const { 
-    // By passing object_ (type T&) to Impl(), which expects a Super&, 
-    // we make sure that Super is a super type of T.  In particular, 
-    // this catches using Ref(const_value) as a matcher for a 
-    // non-const reference, as you cannot implicitly convert a const 
-    // reference to a non-const reference. 
-    return MakeMatcher(new Impl<Super>(object_)); 
-  } 
- 
- private: 
-  template <typename Super> 
-  class Impl : public MatcherInterface<Super&> { 
-   public: 
-    explicit Impl(Super& x) : object_(x) {}  // NOLINT 
- 
-    // MatchAndExplain() takes a Super& (as opposed to const Super&) 
-    // in order to match the interface MatcherInterface<Super&>. 
+    // to write Not(A<bool>()).  However we cannot completely rule out
+    // such a possibility, and it doesn't hurt to be prepared.
+    *os << "never matches";
+  }
+};
+
+// Implements the polymorphic IsNull() matcher, which matches any raw or smart
+// pointer that is NULL.
+class IsNullMatcher {
+ public:
+  template <typename Pointer>
+  bool MatchAndExplain(const Pointer& p,
+                       MatchResultListener* /* listener */) const {
+    return p == nullptr;
+  }
+
+  void DescribeTo(::std::ostream* os) const { *os << "is NULL"; }
+  void DescribeNegationTo(::std::ostream* os) const {
+    *os << "isn't NULL";
+  }
+};
+
+// Implements the polymorphic NotNull() matcher, which matches any raw or smart
+// pointer that is not NULL.
+class NotNullMatcher {
+ public:
+  template <typename Pointer>
+  bool MatchAndExplain(const Pointer& p,
+                       MatchResultListener* /* listener */) const {
+    return p != nullptr;
+  }
+
+  void DescribeTo(::std::ostream* os) const { *os << "isn't NULL"; }
+  void DescribeNegationTo(::std::ostream* os) const {
+    *os << "is NULL";
+  }
+};
+
+// Ref(variable) matches any argument that is a reference to
+// 'variable'.  This matcher is polymorphic as it can match any
+// super type of the type of 'variable'.
+//
+// The RefMatcher template class implements Ref(variable).  It can
+// only be instantiated with a reference type.  This prevents a user
+// from mistakenly using Ref(x) to match a non-reference function
+// argument.  For example, the following will righteously cause a
+// compiler error:
+//
+//   int n;
+//   Matcher<int> m1 = Ref(n);   // This won't compile.
+//   Matcher<int&> m2 = Ref(n);  // This will compile.
+template <typename T>
+class RefMatcher;
+
+template <typename T>
+class RefMatcher<T&> {
+  // Google Mock is a generic framework and thus needs to support
+  // mocking any function types, including those that take non-const
+  // reference arguments.  Therefore the template parameter T (and
+  // Super below) can be instantiated to either a const type or a
+  // non-const type.
+ public:
+  // RefMatcher() takes a T& instead of const T&, as we want the
+  // compiler to catch using Ref(const_value) as a matcher for a
+  // non-const reference.
+  explicit RefMatcher(T& x) : object_(x) {}  // NOLINT
+
+  template <typename Super>
+  operator Matcher<Super&>() const {
+    // By passing object_ (type T&) to Impl(), which expects a Super&,
+    // we make sure that Super is a super type of T.  In particular,
+    // this catches using Ref(const_value) as a matcher for a
+    // non-const reference, as you cannot implicitly convert a const
+    // reference to a non-const reference.
+    return MakeMatcher(new Impl<Super>(object_));
+  }
+
+ private:
+  template <typename Super>
+  class Impl : public MatcherInterface<Super&> {
+   public:
+    explicit Impl(Super& x) : object_(x) {}  // NOLINT
+
+    // MatchAndExplain() takes a Super& (as opposed to const Super&)
+    // in order to match the interface MatcherInterface<Super&>.
     bool MatchAndExplain(Super& x,
                          MatchResultListener* listener) const override {
-      *listener << "which is located @" << static_cast<const void*>(&x); 
-      return &x == &object_; 
-    } 
- 
+      *listener << "which is located @" << static_cast<const void*>(&x);
+      return &x == &object_;
+    }
+
     void DescribeTo(::std::ostream* os) const override {
-      *os << "references the variable "; 
-      UniversalPrinter<Super&>::Print(object_, os); 
-    } 
- 
+      *os << "references the variable ";
+      UniversalPrinter<Super&>::Print(object_, os);
+    }
+
     void DescribeNegationTo(::std::ostream* os) const override {
-      *os << "does not reference the variable "; 
-      UniversalPrinter<Super&>::Print(object_, os); 
-    } 
- 
-   private: 
-    const Super& object_; 
-  }; 
- 
-  T& object_; 
-}; 
- 
-// Polymorphic helper functions for narrow and wide string matchers. 
-inline bool CaseInsensitiveCStringEquals(const char* lhs, const char* rhs) { 
-  return String::CaseInsensitiveCStringEquals(lhs, rhs); 
-} 
- 
-inline bool CaseInsensitiveCStringEquals(const wchar_t* lhs, 
-                                         const wchar_t* rhs) { 
-  return String::CaseInsensitiveWideCStringEquals(lhs, rhs); 
-} 
- 
-// String comparison for narrow or wide strings that can have embedded NUL 
-// characters. 
-template <typename StringType> 
-bool CaseInsensitiveStringEquals(const StringType& s1, 
-                                 const StringType& s2) { 
-  // Are the heads equal? 
-  if (!CaseInsensitiveCStringEquals(s1.c_str(), s2.c_str())) { 
-    return false; 
-  } 
- 
-  // Skip the equal heads. 
-  const typename StringType::value_type nul = 0; 
-  const size_t i1 = s1.find(nul), i2 = s2.find(nul); 
- 
-  // Are we at the end of either s1 or s2? 
-  if (i1 == StringType::npos || i2 == StringType::npos) { 
-    return i1 == i2; 
-  } 
- 
-  // Are the tails equal? 
-  return CaseInsensitiveStringEquals(s1.substr(i1 + 1), s2.substr(i2 + 1)); 
-} 
- 
-// String matchers. 
- 
-// Implements equality-based string matchers like StrEq, StrCaseNe, and etc. 
-template <typename StringType> 
-class StrEqualityMatcher { 
- public: 
+      *os << "does not reference the variable ";
+      UniversalPrinter<Super&>::Print(object_, os);
+    }
+
+   private:
+    const Super& object_;
+  };
+
+  T& object_;
+};
+
+// Polymorphic helper functions for narrow and wide string matchers.
+inline bool CaseInsensitiveCStringEquals(const char* lhs, const char* rhs) {
+  return String::CaseInsensitiveCStringEquals(lhs, rhs);
+}
+
+inline bool CaseInsensitiveCStringEquals(const wchar_t* lhs,
+                                         const wchar_t* rhs) {
+  return String::CaseInsensitiveWideCStringEquals(lhs, rhs);
+}
+
+// String comparison for narrow or wide strings that can have embedded NUL
+// characters.
+template <typename StringType>
+bool CaseInsensitiveStringEquals(const StringType& s1,
+                                 const StringType& s2) {
+  // Are the heads equal?
+  if (!CaseInsensitiveCStringEquals(s1.c_str(), s2.c_str())) {
+    return false;
+  }
+
+  // Skip the equal heads.
+  const typename StringType::value_type nul = 0;
+  const size_t i1 = s1.find(nul), i2 = s2.find(nul);
+
+  // Are we at the end of either s1 or s2?
+  if (i1 == StringType::npos || i2 == StringType::npos) {
+    return i1 == i2;
+  }
+
+  // Are the tails equal?
+  return CaseInsensitiveStringEquals(s1.substr(i1 + 1), s2.substr(i2 + 1));
+}
+
+// String matchers.
+
+// Implements equality-based string matchers like StrEq, StrCaseNe, and etc.
+template <typename StringType>
+class StrEqualityMatcher {
+ public:
   StrEqualityMatcher(StringType str, bool expect_eq, bool case_sensitive)
       : string_(std::move(str)),
         expect_eq_(expect_eq),
         case_sensitive_(case_sensitive) {}
- 
+
 #if GTEST_INTERNAL_HAS_STRING_VIEW
   bool MatchAndExplain(const internal::StringView& s,
                        MatchResultListener* listener) const {
@@ -912,64 +912,64 @@ class StrEqualityMatcher {
   }
 #endif  // GTEST_INTERNAL_HAS_STRING_VIEW
 
-  // Accepts pointer types, particularly: 
-  //   const char* 
-  //   char* 
-  //   const wchar_t* 
-  //   wchar_t* 
-  template <typename CharType> 
-  bool MatchAndExplain(CharType* s, MatchResultListener* listener) const { 
+  // Accepts pointer types, particularly:
+  //   const char*
+  //   char*
+  //   const wchar_t*
+  //   wchar_t*
+  template <typename CharType>
+  bool MatchAndExplain(CharType* s, MatchResultListener* listener) const {
     if (s == nullptr) {
-      return !expect_eq_; 
-    } 
-    return MatchAndExplain(StringType(s), listener); 
-  } 
- 
-  // Matches anything that can convert to StringType. 
-  // 
-  // This is a template, not just a plain function with const StringType&, 
+      return !expect_eq_;
+    }
+    return MatchAndExplain(StringType(s), listener);
+  }
+
+  // Matches anything that can convert to StringType.
+  //
+  // This is a template, not just a plain function with const StringType&,
   // because StringView has some interfering non-explicit constructors.
-  template <typename MatcheeStringType> 
-  bool MatchAndExplain(const MatcheeStringType& s, 
-                       MatchResultListener* /* listener */) const { 
+  template <typename MatcheeStringType>
+  bool MatchAndExplain(const MatcheeStringType& s,
+                       MatchResultListener* /* listener */) const {
     const StringType s2(s);
-    const bool eq = case_sensitive_ ? s2 == string_ : 
-        CaseInsensitiveStringEquals(s2, string_); 
-    return expect_eq_ == eq; 
-  } 
- 
-  void DescribeTo(::std::ostream* os) const { 
-    DescribeToHelper(expect_eq_, os); 
-  } 
- 
-  void DescribeNegationTo(::std::ostream* os) const { 
-    DescribeToHelper(!expect_eq_, os); 
-  } 
- 
- private: 
-  void DescribeToHelper(bool expect_eq, ::std::ostream* os) const { 
-    *os << (expect_eq ? "is " : "isn't "); 
-    *os << "equal to "; 
-    if (!case_sensitive_) { 
-      *os << "(ignoring case) "; 
-    } 
-    UniversalPrint(string_, os); 
-  } 
- 
-  const StringType string_; 
-  const bool expect_eq_; 
-  const bool case_sensitive_; 
-}; 
- 
-// Implements the polymorphic HasSubstr(substring) matcher, which 
-// can be used as a Matcher<T> as long as T can be converted to a 
-// string. 
-template <typename StringType> 
-class HasSubstrMatcher { 
- public: 
-  explicit HasSubstrMatcher(const StringType& substring) 
-      : substring_(substring) {} 
- 
+    const bool eq = case_sensitive_ ? s2 == string_ :
+        CaseInsensitiveStringEquals(s2, string_);
+    return expect_eq_ == eq;
+  }
+
+  void DescribeTo(::std::ostream* os) const {
+    DescribeToHelper(expect_eq_, os);
+  }
+
+  void DescribeNegationTo(::std::ostream* os) const {
+    DescribeToHelper(!expect_eq_, os);
+  }
+
+ private:
+  void DescribeToHelper(bool expect_eq, ::std::ostream* os) const {
+    *os << (expect_eq ? "is " : "isn't ");
+    *os << "equal to ";
+    if (!case_sensitive_) {
+      *os << "(ignoring case) ";
+    }
+    UniversalPrint(string_, os);
+  }
+
+  const StringType string_;
+  const bool expect_eq_;
+  const bool case_sensitive_;
+};
+
+// Implements the polymorphic HasSubstr(substring) matcher, which
+// can be used as a Matcher<T> as long as T can be converted to a
+// string.
+template <typename StringType>
+class HasSubstrMatcher {
+ public:
+  explicit HasSubstrMatcher(const StringType& substring)
+      : substring_(substring) {}
+
 #if GTEST_INTERNAL_HAS_STRING_VIEW
   bool MatchAndExplain(const internal::StringView& s,
                        MatchResultListener* listener) const {
@@ -980,50 +980,50 @@ class HasSubstrMatcher {
   }
 #endif  // GTEST_INTERNAL_HAS_STRING_VIEW
 
-  // Accepts pointer types, particularly: 
-  //   const char* 
-  //   char* 
-  //   const wchar_t* 
-  //   wchar_t* 
-  template <typename CharType> 
-  bool MatchAndExplain(CharType* s, MatchResultListener* listener) const { 
+  // Accepts pointer types, particularly:
+  //   const char*
+  //   char*
+  //   const wchar_t*
+  //   wchar_t*
+  template <typename CharType>
+  bool MatchAndExplain(CharType* s, MatchResultListener* listener) const {
     return s != nullptr && MatchAndExplain(StringType(s), listener);
-  } 
- 
-  // Matches anything that can convert to StringType. 
-  // 
-  // This is a template, not just a plain function with const StringType&, 
+  }
+
+  // Matches anything that can convert to StringType.
+  //
+  // This is a template, not just a plain function with const StringType&,
   // because StringView has some interfering non-explicit constructors.
-  template <typename MatcheeStringType> 
-  bool MatchAndExplain(const MatcheeStringType& s, 
-                       MatchResultListener* /* listener */) const { 
+  template <typename MatcheeStringType>
+  bool MatchAndExplain(const MatcheeStringType& s,
+                       MatchResultListener* /* listener */) const {
     return StringType(s).find(substring_) != StringType::npos;
-  } 
- 
-  // Describes what this matcher matches. 
-  void DescribeTo(::std::ostream* os) const { 
-    *os << "has substring "; 
-    UniversalPrint(substring_, os); 
-  } 
- 
-  void DescribeNegationTo(::std::ostream* os) const { 
-    *os << "has no substring "; 
-    UniversalPrint(substring_, os); 
-  } 
- 
- private: 
-  const StringType substring_; 
-}; 
- 
-// Implements the polymorphic StartsWith(substring) matcher, which 
-// can be used as a Matcher<T> as long as T can be converted to a 
-// string. 
-template <typename StringType> 
-class StartsWithMatcher { 
- public: 
-  explicit StartsWithMatcher(const StringType& prefix) : prefix_(prefix) { 
-  } 
- 
+  }
+
+  // Describes what this matcher matches.
+  void DescribeTo(::std::ostream* os) const {
+    *os << "has substring ";
+    UniversalPrint(substring_, os);
+  }
+
+  void DescribeNegationTo(::std::ostream* os) const {
+    *os << "has no substring ";
+    UniversalPrint(substring_, os);
+  }
+
+ private:
+  const StringType substring_;
+};
+
+// Implements the polymorphic StartsWith(substring) matcher, which
+// can be used as a Matcher<T> as long as T can be converted to a
+// string.
+template <typename StringType>
+class StartsWithMatcher {
+ public:
+  explicit StartsWithMatcher(const StringType& prefix) : prefix_(prefix) {
+  }
+
 #if GTEST_INTERNAL_HAS_STRING_VIEW
   bool MatchAndExplain(const internal::StringView& s,
                        MatchResultListener* listener) const {
@@ -1034,50 +1034,50 @@ class StartsWithMatcher {
   }
 #endif  // GTEST_INTERNAL_HAS_STRING_VIEW
 
-  // Accepts pointer types, particularly: 
-  //   const char* 
-  //   char* 
-  //   const wchar_t* 
-  //   wchar_t* 
-  template <typename CharType> 
-  bool MatchAndExplain(CharType* s, MatchResultListener* listener) const { 
+  // Accepts pointer types, particularly:
+  //   const char*
+  //   char*
+  //   const wchar_t*
+  //   wchar_t*
+  template <typename CharType>
+  bool MatchAndExplain(CharType* s, MatchResultListener* listener) const {
     return s != nullptr && MatchAndExplain(StringType(s), listener);
-  } 
- 
-  // Matches anything that can convert to StringType. 
-  // 
-  // This is a template, not just a plain function with const StringType&, 
+  }
+
+  // Matches anything that can convert to StringType.
+  //
+  // This is a template, not just a plain function with const StringType&,
   // because StringView has some interfering non-explicit constructors.
-  template <typename MatcheeStringType> 
-  bool MatchAndExplain(const MatcheeStringType& s, 
-                       MatchResultListener* /* listener */) const { 
-    const StringType& s2(s); 
-    return s2.length() >= prefix_.length() && 
-        s2.substr(0, prefix_.length()) == prefix_; 
-  } 
- 
-  void DescribeTo(::std::ostream* os) const { 
-    *os << "starts with "; 
-    UniversalPrint(prefix_, os); 
-  } 
- 
-  void DescribeNegationTo(::std::ostream* os) const { 
-    *os << "doesn't start with "; 
-    UniversalPrint(prefix_, os); 
-  } 
- 
- private: 
-  const StringType prefix_; 
-}; 
- 
-// Implements the polymorphic EndsWith(substring) matcher, which 
-// can be used as a Matcher<T> as long as T can be converted to a 
-// string. 
-template <typename StringType> 
-class EndsWithMatcher { 
- public: 
-  explicit EndsWithMatcher(const StringType& suffix) : suffix_(suffix) {} 
- 
+  template <typename MatcheeStringType>
+  bool MatchAndExplain(const MatcheeStringType& s,
+                       MatchResultListener* /* listener */) const {
+    const StringType& s2(s);
+    return s2.length() >= prefix_.length() &&
+        s2.substr(0, prefix_.length()) == prefix_;
+  }
+
+  void DescribeTo(::std::ostream* os) const {
+    *os << "starts with ";
+    UniversalPrint(prefix_, os);
+  }
+
+  void DescribeNegationTo(::std::ostream* os) const {
+    *os << "doesn't start with ";
+    UniversalPrint(prefix_, os);
+  }
+
+ private:
+  const StringType prefix_;
+};
+
+// Implements the polymorphic EndsWith(substring) matcher, which
+// can be used as a Matcher<T> as long as T can be converted to a
+// string.
+template <typename StringType>
+class EndsWithMatcher {
+ public:
+  explicit EndsWithMatcher(const StringType& suffix) : suffix_(suffix) {}
+
 #if GTEST_INTERNAL_HAS_STRING_VIEW
   bool MatchAndExplain(const internal::StringView& s,
                        MatchResultListener* listener) const {
@@ -1088,187 +1088,187 @@ class EndsWithMatcher {
   }
 #endif  // GTEST_INTERNAL_HAS_STRING_VIEW
 
-  // Accepts pointer types, particularly: 
-  //   const char* 
-  //   char* 
-  //   const wchar_t* 
-  //   wchar_t* 
-  template <typename CharType> 
-  bool MatchAndExplain(CharType* s, MatchResultListener* listener) const { 
+  // Accepts pointer types, particularly:
+  //   const char*
+  //   char*
+  //   const wchar_t*
+  //   wchar_t*
+  template <typename CharType>
+  bool MatchAndExplain(CharType* s, MatchResultListener* listener) const {
     return s != nullptr && MatchAndExplain(StringType(s), listener);
-  } 
- 
-  // Matches anything that can convert to StringType. 
-  // 
-  // This is a template, not just a plain function with const StringType&, 
+  }
+
+  // Matches anything that can convert to StringType.
+  //
+  // This is a template, not just a plain function with const StringType&,
   // because StringView has some interfering non-explicit constructors.
-  template <typename MatcheeStringType> 
-  bool MatchAndExplain(const MatcheeStringType& s, 
-                       MatchResultListener* /* listener */) const { 
-    const StringType& s2(s); 
-    return s2.length() >= suffix_.length() && 
-        s2.substr(s2.length() - suffix_.length()) == suffix_; 
-  } 
- 
-  void DescribeTo(::std::ostream* os) const { 
-    *os << "ends with "; 
-    UniversalPrint(suffix_, os); 
-  } 
- 
-  void DescribeNegationTo(::std::ostream* os) const { 
-    *os << "doesn't end with "; 
-    UniversalPrint(suffix_, os); 
-  } 
- 
- private: 
-  const StringType suffix_; 
-}; 
- 
-// Implements a matcher that compares the two fields of a 2-tuple 
-// using one of the ==, <=, <, etc, operators.  The two fields being 
-// compared don't have to have the same type. 
-// 
-// The matcher defined here is polymorphic (for example, Eq() can be 
+  template <typename MatcheeStringType>
+  bool MatchAndExplain(const MatcheeStringType& s,
+                       MatchResultListener* /* listener */) const {
+    const StringType& s2(s);
+    return s2.length() >= suffix_.length() &&
+        s2.substr(s2.length() - suffix_.length()) == suffix_;
+  }
+
+  void DescribeTo(::std::ostream* os) const {
+    *os << "ends with ";
+    UniversalPrint(suffix_, os);
+  }
+
+  void DescribeNegationTo(::std::ostream* os) const {
+    *os << "doesn't end with ";
+    UniversalPrint(suffix_, os);
+  }
+
+ private:
+  const StringType suffix_;
+};
+
+// Implements a matcher that compares the two fields of a 2-tuple
+// using one of the ==, <=, <, etc, operators.  The two fields being
+// compared don't have to have the same type.
+//
+// The matcher defined here is polymorphic (for example, Eq() can be
 // used to match a std::tuple<int, short>, a std::tuple<const long&, double>,
-// etc).  Therefore we use a template type conversion operator in the 
-// implementation. 
-template <typename D, typename Op> 
-class PairMatchBase { 
- public: 
-  template <typename T1, typename T2> 
+// etc).  Therefore we use a template type conversion operator in the
+// implementation.
+template <typename D, typename Op>
+class PairMatchBase {
+ public:
+  template <typename T1, typename T2>
   operator Matcher<::std::tuple<T1, T2>>() const {
     return Matcher<::std::tuple<T1, T2>>(new Impl<const ::std::tuple<T1, T2>&>);
-  } 
-  template <typename T1, typename T2> 
+  }
+  template <typename T1, typename T2>
   operator Matcher<const ::std::tuple<T1, T2>&>() const {
     return MakeMatcher(new Impl<const ::std::tuple<T1, T2>&>);
-  } 
- 
- private: 
-  static ::std::ostream& GetDesc(::std::ostream& os) {  // NOLINT 
-    return os << D::Desc(); 
-  } 
- 
-  template <typename Tuple> 
-  class Impl : public MatcherInterface<Tuple> { 
-   public: 
+  }
+
+ private:
+  static ::std::ostream& GetDesc(::std::ostream& os) {  // NOLINT
+    return os << D::Desc();
+  }
+
+  template <typename Tuple>
+  class Impl : public MatcherInterface<Tuple> {
+   public:
     bool MatchAndExplain(Tuple args,
                          MatchResultListener* /* listener */) const override {
       return Op()(::std::get<0>(args), ::std::get<1>(args));
-    } 
+    }
     void DescribeTo(::std::ostream* os) const override {
-      *os << "are " << GetDesc; 
-    } 
+      *os << "are " << GetDesc;
+    }
     void DescribeNegationTo(::std::ostream* os) const override {
-      *os << "aren't " << GetDesc; 
-    } 
-  }; 
-}; 
- 
-class Eq2Matcher : public PairMatchBase<Eq2Matcher, AnyEq> { 
- public: 
-  static const char* Desc() { return "an equal pair"; } 
-}; 
-class Ne2Matcher : public PairMatchBase<Ne2Matcher, AnyNe> { 
- public: 
-  static const char* Desc() { return "an unequal pair"; } 
-}; 
-class Lt2Matcher : public PairMatchBase<Lt2Matcher, AnyLt> { 
- public: 
-  static const char* Desc() { return "a pair where the first < the second"; } 
-}; 
-class Gt2Matcher : public PairMatchBase<Gt2Matcher, AnyGt> { 
- public: 
-  static const char* Desc() { return "a pair where the first > the second"; } 
-}; 
-class Le2Matcher : public PairMatchBase<Le2Matcher, AnyLe> { 
- public: 
-  static const char* Desc() { return "a pair where the first <= the second"; } 
-}; 
-class Ge2Matcher : public PairMatchBase<Ge2Matcher, AnyGe> { 
- public: 
-  static const char* Desc() { return "a pair where the first >= the second"; } 
-}; 
- 
-// Implements the Not(...) matcher for a particular argument type T. 
-// We do not nest it inside the NotMatcher class template, as that 
-// will prevent different instantiations of NotMatcher from sharing 
-// the same NotMatcherImpl<T> class. 
-template <typename T> 
+      *os << "aren't " << GetDesc;
+    }
+  };
+};
+
+class Eq2Matcher : public PairMatchBase<Eq2Matcher, AnyEq> {
+ public:
+  static const char* Desc() { return "an equal pair"; }
+};
+class Ne2Matcher : public PairMatchBase<Ne2Matcher, AnyNe> {
+ public:
+  static const char* Desc() { return "an unequal pair"; }
+};
+class Lt2Matcher : public PairMatchBase<Lt2Matcher, AnyLt> {
+ public:
+  static const char* Desc() { return "a pair where the first < the second"; }
+};
+class Gt2Matcher : public PairMatchBase<Gt2Matcher, AnyGt> {
+ public:
+  static const char* Desc() { return "a pair where the first > the second"; }
+};
+class Le2Matcher : public PairMatchBase<Le2Matcher, AnyLe> {
+ public:
+  static const char* Desc() { return "a pair where the first <= the second"; }
+};
+class Ge2Matcher : public PairMatchBase<Ge2Matcher, AnyGe> {
+ public:
+  static const char* Desc() { return "a pair where the first >= the second"; }
+};
+
+// Implements the Not(...) matcher for a particular argument type T.
+// We do not nest it inside the NotMatcher class template, as that
+// will prevent different instantiations of NotMatcher from sharing
+// the same NotMatcherImpl<T> class.
+template <typename T>
 class NotMatcherImpl : public MatcherInterface<const T&> {
- public: 
-  explicit NotMatcherImpl(const Matcher<T>& matcher) 
-      : matcher_(matcher) {} 
- 
+ public:
+  explicit NotMatcherImpl(const Matcher<T>& matcher)
+      : matcher_(matcher) {}
+
   bool MatchAndExplain(const T& x,
                        MatchResultListener* listener) const override {
-    return !matcher_.MatchAndExplain(x, listener); 
-  } 
- 
+    return !matcher_.MatchAndExplain(x, listener);
+  }
+
   void DescribeTo(::std::ostream* os) const override {
-    matcher_.DescribeNegationTo(os); 
-  } 
- 
+    matcher_.DescribeNegationTo(os);
+  }
+
   void DescribeNegationTo(::std::ostream* os) const override {
-    matcher_.DescribeTo(os); 
-  } 
- 
- private: 
-  const Matcher<T> matcher_; 
-}; 
- 
-// Implements the Not(m) matcher, which matches a value that doesn't 
-// match matcher m. 
-template <typename InnerMatcher> 
-class NotMatcher { 
- public: 
-  explicit NotMatcher(InnerMatcher matcher) : matcher_(matcher) {} 
- 
-  // This template type conversion operator allows Not(m) to be used 
-  // to match any type m can match. 
-  template <typename T> 
-  operator Matcher<T>() const { 
-    return Matcher<T>(new NotMatcherImpl<T>(SafeMatcherCast<T>(matcher_))); 
-  } 
- 
- private: 
-  InnerMatcher matcher_; 
-}; 
- 
-// Implements the AllOf(m1, m2) matcher for a particular argument type 
-// T. We do not nest it inside the BothOfMatcher class template, as 
-// that will prevent different instantiations of BothOfMatcher from 
-// sharing the same BothOfMatcherImpl<T> class. 
-template <typename T> 
+    matcher_.DescribeTo(os);
+  }
+
+ private:
+  const Matcher<T> matcher_;
+};
+
+// Implements the Not(m) matcher, which matches a value that doesn't
+// match matcher m.
+template <typename InnerMatcher>
+class NotMatcher {
+ public:
+  explicit NotMatcher(InnerMatcher matcher) : matcher_(matcher) {}
+
+  // This template type conversion operator allows Not(m) to be used
+  // to match any type m can match.
+  template <typename T>
+  operator Matcher<T>() const {
+    return Matcher<T>(new NotMatcherImpl<T>(SafeMatcherCast<T>(matcher_)));
+  }
+
+ private:
+  InnerMatcher matcher_;
+};
+
+// Implements the AllOf(m1, m2) matcher for a particular argument type
+// T. We do not nest it inside the BothOfMatcher class template, as
+// that will prevent different instantiations of BothOfMatcher from
+// sharing the same BothOfMatcherImpl<T> class.
+template <typename T>
 class AllOfMatcherImpl : public MatcherInterface<const T&> {
- public: 
+ public:
   explicit AllOfMatcherImpl(std::vector<Matcher<T> > matchers)
       : matchers_(std::move(matchers)) {}
- 
+
   void DescribeTo(::std::ostream* os) const override {
-    *os << "("; 
+    *os << "(";
     for (size_t i = 0; i < matchers_.size(); ++i) {
       if (i != 0) *os << ") and (";
       matchers_[i].DescribeTo(os);
     }
-    *os << ")"; 
-  } 
- 
+    *os << ")";
+  }
+
   void DescribeNegationTo(::std::ostream* os) const override {
-    *os << "("; 
+    *os << "(";
     for (size_t i = 0; i < matchers_.size(); ++i) {
       if (i != 0) *os << ") or (";
       matchers_[i].DescribeNegationTo(os);
     }
-    *os << ")"; 
-  } 
- 
+    *os << ")";
+  }
+
   bool MatchAndExplain(const T& x,
                        MatchResultListener* listener) const override {
-    // If either matcher1_ or matcher2_ doesn't match x, we only need 
-    // to explain why one of them fails. 
+    // If either matcher1_ or matcher2_ doesn't match x, we only need
+    // to explain why one of them fails.
     std::string all_match_result;
- 
+
     for (size_t i = 0; i < matchers_.size(); ++i) {
       StringMatchResultListener slistener;
       if (matchers_[i].MatchAndExplain(x, &slistener)) {
@@ -1285,95 +1285,95 @@ class AllOfMatcherImpl : public MatcherInterface<const T&> {
         *listener << slistener.str();
         return false;
       }
-    } 
- 
-    // Otherwise we need to explain why *both* of them match. 
+    }
+
+    // Otherwise we need to explain why *both* of them match.
     *listener << all_match_result;
-    return true; 
-  } 
- 
- private: 
+    return true;
+  }
+
+ private:
   const std::vector<Matcher<T> > matchers_;
-}; 
- 
-// VariadicMatcher is used for the variadic implementation of 
-// AllOf(m_1, m_2, ...) and AnyOf(m_1, m_2, ...). 
-// CombiningMatcher<T> is used to recursively combine the provided matchers 
-// (of type Args...). 
-template <template <typename T> class CombiningMatcher, typename... Args> 
-class VariadicMatcher { 
- public: 
-  VariadicMatcher(const Args&... matchers)  // NOLINT 
+};
+
+// VariadicMatcher is used for the variadic implementation of
+// AllOf(m_1, m_2, ...) and AnyOf(m_1, m_2, ...).
+// CombiningMatcher<T> is used to recursively combine the provided matchers
+// (of type Args...).
+template <template <typename T> class CombiningMatcher, typename... Args>
+class VariadicMatcher {
+ public:
+  VariadicMatcher(const Args&... matchers)  // NOLINT
       : matchers_(matchers...) {
     static_assert(sizeof...(Args) > 0, "Must have at least one matcher.");
   }
- 
+
   VariadicMatcher(const VariadicMatcher&) = default;
   VariadicMatcher& operator=(const VariadicMatcher&) = delete;
 
-  // This template type conversion operator allows an 
-  // VariadicMatcher<Matcher1, Matcher2...> object to match any type that 
-  // all of the provided matchers (Matcher1, Matcher2, ...) can match. 
-  template <typename T> 
-  operator Matcher<T>() const { 
+  // This template type conversion operator allows an
+  // VariadicMatcher<Matcher1, Matcher2...> object to match any type that
+  // all of the provided matchers (Matcher1, Matcher2, ...) can match.
+  template <typename T>
+  operator Matcher<T>() const {
     std::vector<Matcher<T> > values;
     CreateVariadicMatcher<T>(&values, std::integral_constant<size_t, 0>());
     return Matcher<T>(new CombiningMatcher<T>(std::move(values)));
-  } 
- 
- private: 
+  }
+
+ private:
   template <typename T, size_t I>
   void CreateVariadicMatcher(std::vector<Matcher<T> >* values,
                              std::integral_constant<size_t, I>) const {
     values->push_back(SafeMatcherCast<T>(std::get<I>(matchers_)));
     CreateVariadicMatcher<T>(values, std::integral_constant<size_t, I + 1>());
   }
- 
+
   template <typename T>
   void CreateVariadicMatcher(
       std::vector<Matcher<T> >*,
       std::integral_constant<size_t, sizeof...(Args)>) const {}
- 
+
   std::tuple<Args...> matchers_;
-}; 
- 
-template <typename... Args> 
+};
+
+template <typename... Args>
 using AllOfMatcher = VariadicMatcher<AllOfMatcherImpl, Args...>;
- 
-// Implements the AnyOf(m1, m2) matcher for a particular argument type 
-// T.  We do not nest it inside the AnyOfMatcher class template, as 
-// that will prevent different instantiations of AnyOfMatcher from 
-// sharing the same EitherOfMatcherImpl<T> class. 
-template <typename T> 
+
+// Implements the AnyOf(m1, m2) matcher for a particular argument type
+// T.  We do not nest it inside the AnyOfMatcher class template, as
+// that will prevent different instantiations of AnyOfMatcher from
+// sharing the same EitherOfMatcherImpl<T> class.
+template <typename T>
 class AnyOfMatcherImpl : public MatcherInterface<const T&> {
- public: 
+ public:
   explicit AnyOfMatcherImpl(std::vector<Matcher<T> > matchers)
       : matchers_(std::move(matchers)) {}
- 
+
   void DescribeTo(::std::ostream* os) const override {
-    *os << "("; 
+    *os << "(";
     for (size_t i = 0; i < matchers_.size(); ++i) {
       if (i != 0) *os << ") or (";
       matchers_[i].DescribeTo(os);
     }
-    *os << ")"; 
-  } 
- 
+    *os << ")";
+  }
+
   void DescribeNegationTo(::std::ostream* os) const override {
-    *os << "("; 
+    *os << "(";
     for (size_t i = 0; i < matchers_.size(); ++i) {
       if (i != 0) *os << ") and (";
       matchers_[i].DescribeNegationTo(os);
     }
-    *os << ")"; 
-  } 
- 
+    *os << ")";
+  }
+
   bool MatchAndExplain(const T& x,
                        MatchResultListener* listener) const override {
     std::string no_match_result;
 
-    // If either matcher1_ or matcher2_ matches x, we just need to 
-    // explain why *one* of them matches. 
+    // If either matcher1_ or matcher2_ matches x, we just need to
+    // explain why *one* of them matches.
     for (size_t i = 0; i < matchers_.size(); ++i) {
       StringMatchResultListener slistener;
       if (matchers_[i].MatchAndExplain(x, &slistener)) {
@@ -1390,30 +1390,30 @@ class AnyOfMatcherImpl : public MatcherInterface<const T&> {
           }
         }
       }
-    } 
- 
-    // Otherwise we need to explain why *both* of them fail. 
+    }
+
+    // Otherwise we need to explain why *both* of them fail.
     *listener << no_match_result;
-    return false; 
-  } 
- 
- private: 
+    return false;
+  }
+
+ private:
   const std::vector<Matcher<T> > matchers_;
-}; 
- 
-// AnyOfMatcher is used for the variadic implementation of AnyOf(m_1, m_2, ...). 
-template <typename... Args> 
+};
+
+// AnyOfMatcher is used for the variadic implementation of AnyOf(m_1, m_2, ...).
+template <typename... Args>
 using AnyOfMatcher = VariadicMatcher<AnyOfMatcherImpl, Args...>;
- 
+
 // Wrapper for implementation of Any/AllOfArray().
 template <template <class> class MatcherImpl, typename T>
 class SomeOfArrayMatcher {
- public: 
+ public:
   // Constructs the matcher from a sequence of element values or
   // element matchers.
   template <typename Iter>
   SomeOfArrayMatcher(Iter first, Iter last) : matchers_(first, last) {}
- 
+
   template <typename U>
   operator Matcher<U>() const {  // NOLINT
     using RawU = typename std::decay<U>::type;
@@ -1422,127 +1422,127 @@ class SomeOfArrayMatcher {
       matchers.push_back(MatcherCast<RawU>(matcher));
     }
     return Matcher<U>(new MatcherImpl<RawU>(std::move(matchers)));
-  } 
- 
- private: 
+  }
+
+ private:
   const ::std::vector<T> matchers_;
-}; 
- 
+};
+
 template <typename T>
 using AllOfArrayMatcher = SomeOfArrayMatcher<AllOfMatcherImpl, T>;
 
 template <typename T>
 using AnyOfArrayMatcher = SomeOfArrayMatcher<AnyOfMatcherImpl, T>;
 
-// Used for implementing Truly(pred), which turns a predicate into a 
-// matcher. 
-template <typename Predicate> 
-class TrulyMatcher { 
- public: 
-  explicit TrulyMatcher(Predicate pred) : predicate_(pred) {} 
- 
-  // This method template allows Truly(pred) to be used as a matcher 
-  // for type T where T is the argument type of predicate 'pred'.  The 
-  // argument is passed by reference as the predicate may be 
-  // interested in the address of the argument. 
-  template <typename T> 
-  bool MatchAndExplain(T& x,  // NOLINT 
+// Used for implementing Truly(pred), which turns a predicate into a
+// matcher.
+template <typename Predicate>
+class TrulyMatcher {
+ public:
+  explicit TrulyMatcher(Predicate pred) : predicate_(pred) {}
+
+  // This method template allows Truly(pred) to be used as a matcher
+  // for type T where T is the argument type of predicate 'pred'.  The
+  // argument is passed by reference as the predicate may be
+  // interested in the address of the argument.
+  template <typename T>
+  bool MatchAndExplain(T& x,  // NOLINT
                        MatchResultListener* listener) const {
-    // Without the if-statement, MSVC sometimes warns about converting 
-    // a value to bool (warning 4800). 
-    // 
-    // We cannot write 'return !!predicate_(x);' as that doesn't work 
-    // when predicate_(x) returns a class convertible to bool but 
-    // having no operator!(). 
-    if (predicate_(x)) 
-      return true; 
+    // Without the if-statement, MSVC sometimes warns about converting
+    // a value to bool (warning 4800).
+    //
+    // We cannot write 'return !!predicate_(x);' as that doesn't work
+    // when predicate_(x) returns a class convertible to bool but
+    // having no operator!().
+    if (predicate_(x))
+      return true;
     *listener << "didn't satisfy the given predicate";
-    return false; 
-  } 
- 
-  void DescribeTo(::std::ostream* os) const { 
-    *os << "satisfies the given predicate"; 
-  } 
- 
-  void DescribeNegationTo(::std::ostream* os) const { 
-    *os << "doesn't satisfy the given predicate"; 
-  } 
- 
- private: 
-  Predicate predicate_; 
-}; 
- 
-// Used for implementing Matches(matcher), which turns a matcher into 
-// a predicate. 
-template <typename M> 
-class MatcherAsPredicate { 
- public: 
-  explicit MatcherAsPredicate(M matcher) : matcher_(matcher) {} 
- 
-  // This template operator() allows Matches(m) to be used as a 
-  // predicate on type T where m is a matcher on type T. 
-  // 
-  // The argument x is passed by reference instead of by value, as 
-  // some matcher may be interested in its address (e.g. as in 
-  // Matches(Ref(n))(x)). 
-  template <typename T> 
-  bool operator()(const T& x) const { 
-    // We let matcher_ commit to a particular type here instead of 
-    // when the MatcherAsPredicate object was constructed.  This 
-    // allows us to write Matches(m) where m is a polymorphic matcher 
-    // (e.g. Eq(5)). 
-    // 
-    // If we write Matcher<T>(matcher_).Matches(x) here, it won't 
-    // compile when matcher_ has type Matcher<const T&>; if we write 
-    // Matcher<const T&>(matcher_).Matches(x) here, it won't compile 
-    // when matcher_ has type Matcher<T>; if we just write 
-    // matcher_.Matches(x), it won't compile when matcher_ is 
-    // polymorphic, e.g. Eq(5). 
-    // 
-    // MatcherCast<const T&>() is necessary for making the code work 
-    // in all of the above situations. 
-    return MatcherCast<const T&>(matcher_).Matches(x); 
-  } 
- 
- private: 
-  M matcher_; 
-}; 
- 
-// For implementing ASSERT_THAT() and EXPECT_THAT().  The template 
-// argument M must be a type that can be converted to a matcher. 
-template <typename M> 
-class PredicateFormatterFromMatcher { 
- public: 
+    return false;
+  }
+
+  void DescribeTo(::std::ostream* os) const {
+    *os << "satisfies the given predicate";
+  }
+
+  void DescribeNegationTo(::std::ostream* os) const {
+    *os << "doesn't satisfy the given predicate";
+  }
+
+ private:
+  Predicate predicate_;
+};
+
+// Used for implementing Matches(matcher), which turns a matcher into
+// a predicate.
+template <typename M>
+class MatcherAsPredicate {
+ public:
+  explicit MatcherAsPredicate(M matcher) : matcher_(matcher) {}
+
+  // This template operator() allows Matches(m) to be used as a
+  // predicate on type T where m is a matcher on type T.
+  //
+  // The argument x is passed by reference instead of by value, as
+  // some matcher may be interested in its address (e.g. as in
+  // Matches(Ref(n))(x)).
+  template <typename T>
+  bool operator()(const T& x) const {
+    // We let matcher_ commit to a particular type here instead of
+    // when the MatcherAsPredicate object was constructed.  This
+    // allows us to write Matches(m) where m is a polymorphic matcher
+    // (e.g. Eq(5)).
+    //
+    // If we write Matcher<T>(matcher_).Matches(x) here, it won't
+    // compile when matcher_ has type Matcher<const T&>; if we write
+    // Matcher<const T&>(matcher_).Matches(x) here, it won't compile
+    // when matcher_ has type Matcher<T>; if we just write
+    // matcher_.Matches(x), it won't compile when matcher_ is
+    // polymorphic, e.g. Eq(5).
+    //
+    // MatcherCast<const T&>() is necessary for making the code work
+    // in all of the above situations.
+    return MatcherCast<const T&>(matcher_).Matches(x);
+  }
+
+ private:
+  M matcher_;
+};
+
+// For implementing ASSERT_THAT() and EXPECT_THAT().  The template
+// argument M must be a type that can be converted to a matcher.
+template <typename M>
+class PredicateFormatterFromMatcher {
+ public:
   explicit PredicateFormatterFromMatcher(M m) : matcher_(std::move(m)) {}
- 
-  // This template () operator allows a PredicateFormatterFromMatcher 
-  // object to act as a predicate-formatter suitable for using with 
-  // Google Test's EXPECT_PRED_FORMAT1() macro. 
-  template <typename T> 
-  AssertionResult operator()(const char* value_text, const T& x) const { 
-    // We convert matcher_ to a Matcher<const T&> *now* instead of 
-    // when the PredicateFormatterFromMatcher object was constructed, 
-    // as matcher_ may be polymorphic (e.g. NotNull()) and we won't 
-    // know which type to instantiate it to until we actually see the 
-    // type of x here. 
-    // 
-    // We write SafeMatcherCast<const T&>(matcher_) instead of 
-    // Matcher<const T&>(matcher_), as the latter won't compile when 
-    // matcher_ has type Matcher<T> (e.g. An<int>()). 
-    // We don't write MatcherCast<const T&> either, as that allows 
-    // potentially unsafe downcasting of the matcher argument. 
-    const Matcher<const T&> matcher = SafeMatcherCast<const T&>(matcher_); 
+
+  // This template () operator allows a PredicateFormatterFromMatcher
+  // object to act as a predicate-formatter suitable for using with
+  // Google Test's EXPECT_PRED_FORMAT1() macro.
+  template <typename T>
+  AssertionResult operator()(const char* value_text, const T& x) const {
+    // We convert matcher_ to a Matcher<const T&> *now* instead of
+    // when the PredicateFormatterFromMatcher object was constructed,
+    // as matcher_ may be polymorphic (e.g. NotNull()) and we won't
+    // know which type to instantiate it to until we actually see the
+    // type of x here.
+    //
+    // We write SafeMatcherCast<const T&>(matcher_) instead of
+    // Matcher<const T&>(matcher_), as the latter won't compile when
+    // matcher_ has type Matcher<T> (e.g. An<int>()).
+    // We don't write MatcherCast<const T&> either, as that allows
+    // potentially unsafe downcasting of the matcher argument.
+    const Matcher<const T&> matcher = SafeMatcherCast<const T&>(matcher_);
 
     // The expected path here is that the matcher should match (i.e. that most
     // tests pass) so optimize for this case.
     if (matcher.Matches(x)) {
-      return AssertionSuccess(); 
+      return AssertionSuccess();
     }
- 
-    ::std::stringstream ss; 
-    ss << "Value of: " << value_text << "\n" 
-       << "Expected: "; 
-    matcher.DescribeTo(&ss); 
+
+    ::std::stringstream ss;
+    ss << "Value of: " << value_text << "\n"
+       << "Expected: ";
+    matcher.DescribeTo(&ss);
 
     // Rerun the matcher to "PrintAndExplain" the failure.
     StringMatchResultListener listener;
@@ -1550,24 +1550,24 @@ class PredicateFormatterFromMatcher {
       ss << "\n  The matcher failed on the initial attempt; but passed when "
             "rerun to generate the explanation.";
     }
-    ss << "\n  Actual: " << listener.str(); 
-    return AssertionFailure() << ss.str(); 
-  } 
- 
- private: 
-  const M matcher_; 
-}; 
- 
-// A helper function for converting a matcher to a predicate-formatter 
-// without the user needing to explicitly write the type.  This is 
-// used for implementing ASSERT_THAT() and EXPECT_THAT(). 
-// Implementation detail: 'matcher' is received by-value to force decaying. 
-template <typename M> 
-inline PredicateFormatterFromMatcher<M> 
-MakePredicateFormatterFromMatcher(M matcher) { 
+    ss << "\n  Actual: " << listener.str();
+    return AssertionFailure() << ss.str();
+  }
+
+ private:
+  const M matcher_;
+};
+
+// A helper function for converting a matcher to a predicate-formatter
+// without the user needing to explicitly write the type.  This is
+// used for implementing ASSERT_THAT() and EXPECT_THAT().
+// Implementation detail: 'matcher' is received by-value to force decaying.
+template <typename M>
+inline PredicateFormatterFromMatcher<M>
+MakePredicateFormatterFromMatcher(M matcher) {
   return PredicateFormatterFromMatcher<M>(std::move(matcher));
-} 
- 
+}
+
 // Implements the polymorphic IsNan() matcher, which matches any floating type
 // value that is Nan.
 class IsNanMatcher {
@@ -1584,156 +1584,156 @@ class IsNanMatcher {
   }
 };
 
-// Implements the polymorphic floating point equality matcher, which matches 
-// two float values using ULP-based approximation or, optionally, a 
-// user-specified epsilon.  The template is meant to be instantiated with 
-// FloatType being either float or double. 
-template <typename FloatType> 
-class FloatingEqMatcher { 
- public: 
-  // Constructor for FloatingEqMatcher. 
-  // The matcher's input will be compared with expected.  The matcher treats two 
-  // NANs as equal if nan_eq_nan is true.  Otherwise, under IEEE standards, 
-  // equality comparisons between NANs will always return false.  We specify a 
-  // negative max_abs_error_ term to indicate that ULP-based approximation will 
-  // be used for comparison. 
-  FloatingEqMatcher(FloatType expected, bool nan_eq_nan) : 
-    expected_(expected), nan_eq_nan_(nan_eq_nan), max_abs_error_(-1) { 
-  } 
- 
-  // Constructor that supports a user-specified max_abs_error that will be used 
-  // for comparison instead of ULP-based approximation.  The max absolute 
-  // should be non-negative. 
-  FloatingEqMatcher(FloatType expected, bool nan_eq_nan, 
-                    FloatType max_abs_error) 
-      : expected_(expected), 
-        nan_eq_nan_(nan_eq_nan), 
-        max_abs_error_(max_abs_error) { 
-    GTEST_CHECK_(max_abs_error >= 0) 
-        << ", where max_abs_error is" << max_abs_error; 
-  } 
- 
-  // Implements floating point equality matcher as a Matcher<T>. 
-  template <typename T> 
-  class Impl : public MatcherInterface<T> { 
-   public: 
-    Impl(FloatType expected, bool nan_eq_nan, FloatType max_abs_error) 
-        : expected_(expected), 
-          nan_eq_nan_(nan_eq_nan), 
-          max_abs_error_(max_abs_error) {} 
- 
+// Implements the polymorphic floating point equality matcher, which matches
+// two float values using ULP-based approximation or, optionally, a
+// user-specified epsilon.  The template is meant to be instantiated with
+// FloatType being either float or double.
+template <typename FloatType>
+class FloatingEqMatcher {
+ public:
+  // Constructor for FloatingEqMatcher.
+  // The matcher's input will be compared with expected.  The matcher treats two
+  // NANs as equal if nan_eq_nan is true.  Otherwise, under IEEE standards,
+  // equality comparisons between NANs will always return false.  We specify a
+  // negative max_abs_error_ term to indicate that ULP-based approximation will
+  // be used for comparison.
+  FloatingEqMatcher(FloatType expected, bool nan_eq_nan) :
+    expected_(expected), nan_eq_nan_(nan_eq_nan), max_abs_error_(-1) {
+  }
+
+  // Constructor that supports a user-specified max_abs_error that will be used
+  // for comparison instead of ULP-based approximation.  The max absolute
+  // should be non-negative.
+  FloatingEqMatcher(FloatType expected, bool nan_eq_nan,
+                    FloatType max_abs_error)
+      : expected_(expected),
+        nan_eq_nan_(nan_eq_nan),
+        max_abs_error_(max_abs_error) {
+    GTEST_CHECK_(max_abs_error >= 0)
+        << ", where max_abs_error is" << max_abs_error;
+  }
+
+  // Implements floating point equality matcher as a Matcher<T>.
+  template <typename T>
+  class Impl : public MatcherInterface<T> {
+   public:
+    Impl(FloatType expected, bool nan_eq_nan, FloatType max_abs_error)
+        : expected_(expected),
+          nan_eq_nan_(nan_eq_nan),
+          max_abs_error_(max_abs_error) {}
+
     bool MatchAndExplain(T value,
                          MatchResultListener* listener) const override {
-      const FloatingPoint<FloatType> actual(value), expected(expected_); 
- 
-      // Compares NaNs first, if nan_eq_nan_ is true. 
-      if (actual.is_nan() || expected.is_nan()) { 
-        if (actual.is_nan() && expected.is_nan()) { 
-          return nan_eq_nan_; 
-        } 
-        // One is nan; the other is not nan. 
-        return false; 
-      } 
-      if (HasMaxAbsError()) { 
-        // We perform an equality check so that inf will match inf, regardless 
-        // of error bounds.  If the result of value - expected_ would result in 
-        // overflow or if either value is inf, the default result is infinity, 
-        // which should only match if max_abs_error_ is also infinity. 
-        if (value == expected_) { 
-          return true; 
-        } 
- 
-        const FloatType diff = value - expected_; 
+      const FloatingPoint<FloatType> actual(value), expected(expected_);
+
+      // Compares NaNs first, if nan_eq_nan_ is true.
+      if (actual.is_nan() || expected.is_nan()) {
+        if (actual.is_nan() && expected.is_nan()) {
+          return nan_eq_nan_;
+        }
+        // One is nan; the other is not nan.
+        return false;
+      }
+      if (HasMaxAbsError()) {
+        // We perform an equality check so that inf will match inf, regardless
+        // of error bounds.  If the result of value - expected_ would result in
+        // overflow or if either value is inf, the default result is infinity,
+        // which should only match if max_abs_error_ is also infinity.
+        if (value == expected_) {
+          return true;
+        }
+
+        const FloatType diff = value - expected_;
         if (::std::fabs(diff) <= max_abs_error_) {
-          return true; 
-        } 
- 
-        if (listener->IsInterested()) { 
-          *listener << "which is " << diff << " from " << expected_; 
-        } 
-        return false; 
-      } else { 
-        return actual.AlmostEquals(expected); 
-      } 
-    } 
- 
+          return true;
+        }
+
+        if (listener->IsInterested()) {
+          *listener << "which is " << diff << " from " << expected_;
+        }
+        return false;
+      } else {
+        return actual.AlmostEquals(expected);
+      }
+    }
+
     void DescribeTo(::std::ostream* os) const override {
-      // os->precision() returns the previously set precision, which we 
-      // store to restore the ostream to its original configuration 
-      // after outputting. 
-      const ::std::streamsize old_precision = os->precision( 
-          ::std::numeric_limits<FloatType>::digits10 + 2); 
-      if (FloatingPoint<FloatType>(expected_).is_nan()) { 
-        if (nan_eq_nan_) { 
-          *os << "is NaN"; 
-        } else { 
-          *os << "never matches"; 
-        } 
-      } else { 
-        *os << "is approximately " << expected_; 
-        if (HasMaxAbsError()) { 
-          *os << " (absolute error <= " << max_abs_error_ << ")"; 
-        } 
-      } 
-      os->precision(old_precision); 
-    } 
- 
+      // os->precision() returns the previously set precision, which we
+      // store to restore the ostream to its original configuration
+      // after outputting.
+      const ::std::streamsize old_precision = os->precision(
+          ::std::numeric_limits<FloatType>::digits10 + 2);
+      if (FloatingPoint<FloatType>(expected_).is_nan()) {
+        if (nan_eq_nan_) {
+          *os << "is NaN";
+        } else {
+          *os << "never matches";
+        }
+      } else {
+        *os << "is approximately " << expected_;
+        if (HasMaxAbsError()) {
+          *os << " (absolute error <= " << max_abs_error_ << ")";
+        }
+      }
+      os->precision(old_precision);
+    }
+
     void DescribeNegationTo(::std::ostream* os) const override {
-      // As before, get original precision. 
-      const ::std::streamsize old_precision = os->precision( 
-          ::std::numeric_limits<FloatType>::digits10 + 2); 
-      if (FloatingPoint<FloatType>(expected_).is_nan()) { 
-        if (nan_eq_nan_) { 
-          *os << "isn't NaN"; 
-        } else { 
-          *os << "is anything"; 
-        } 
-      } else { 
-        *os << "isn't approximately " << expected_; 
-        if (HasMaxAbsError()) { 
-          *os << " (absolute error > " << max_abs_error_ << ")"; 
-        } 
-      } 
-      // Restore original precision. 
-      os->precision(old_precision); 
-    } 
- 
-   private: 
-    bool HasMaxAbsError() const { 
-      return max_abs_error_ >= 0; 
-    } 
- 
-    const FloatType expected_; 
-    const bool nan_eq_nan_; 
-    // max_abs_error will be used for value comparison when >= 0. 
-    const FloatType max_abs_error_; 
-  }; 
- 
-  // The following 3 type conversion operators allow FloatEq(expected) and 
-  // NanSensitiveFloatEq(expected) to be used as a Matcher<float>, a 
-  // Matcher<const float&>, or a Matcher<float&>, but nothing else. 
-  operator Matcher<FloatType>() const { 
-    return MakeMatcher( 
-        new Impl<FloatType>(expected_, nan_eq_nan_, max_abs_error_)); 
-  } 
- 
-  operator Matcher<const FloatType&>() const { 
-    return MakeMatcher( 
-        new Impl<const FloatType&>(expected_, nan_eq_nan_, max_abs_error_)); 
-  } 
- 
-  operator Matcher<FloatType&>() const { 
-    return MakeMatcher( 
-        new Impl<FloatType&>(expected_, nan_eq_nan_, max_abs_error_)); 
-  } 
- 
- private: 
-  const FloatType expected_; 
-  const bool nan_eq_nan_; 
-  // max_abs_error will be used for value comparison when >= 0. 
-  const FloatType max_abs_error_; 
-}; 
- 
+      // As before, get original precision.
+      const ::std::streamsize old_precision = os->precision(
+          ::std::numeric_limits<FloatType>::digits10 + 2);
+      if (FloatingPoint<FloatType>(expected_).is_nan()) {
+        if (nan_eq_nan_) {
+          *os << "isn't NaN";
+        } else {
+          *os << "is anything";
+        }
+      } else {
+        *os << "isn't approximately " << expected_;
+        if (HasMaxAbsError()) {
+          *os << " (absolute error > " << max_abs_error_ << ")";
+        }
+      }
+      // Restore original precision.
+      os->precision(old_precision);
+    }
+
+   private:
+    bool HasMaxAbsError() const {
+      return max_abs_error_ >= 0;
+    }
+
+    const FloatType expected_;
+    const bool nan_eq_nan_;
+    // max_abs_error will be used for value comparison when >= 0.
+    const FloatType max_abs_error_;
+  };
+
+  // The following 3 type conversion operators allow FloatEq(expected) and
+  // NanSensitiveFloatEq(expected) to be used as a Matcher<float>, a
+  // Matcher<const float&>, or a Matcher<float&>, but nothing else.
+  operator Matcher<FloatType>() const {
+    return MakeMatcher(
+        new Impl<FloatType>(expected_, nan_eq_nan_, max_abs_error_));
+  }
+
+  operator Matcher<const FloatType&>() const {
+    return MakeMatcher(
+        new Impl<const FloatType&>(expected_, nan_eq_nan_, max_abs_error_));
+  }
+
+  operator Matcher<FloatType&>() const {
+    return MakeMatcher(
+        new Impl<FloatType&>(expected_, nan_eq_nan_, max_abs_error_));
+  }
+
+ private:
+  const FloatType expected_;
+  const bool nan_eq_nan_;
+  // max_abs_error will be used for value comparison when >= 0.
+  const FloatType max_abs_error_;
+};
+
 // A 2-tuple ("binary") wrapper around FloatingEqMatcher:
 // FloatingEq2Matcher() matches (x, y) by matching FloatingEqMatcher(x, false)
 // against y, and FloatingEq2Matcher(e) matches FloatingEqMatcher(x, false, e)
@@ -1810,63 +1810,63 @@ class FloatingEq2Matcher {
   bool nan_eq_nan_;
 };
 
-// Implements the Pointee(m) matcher for matching a pointer whose 
-// pointee matches matcher m.  The pointer can be either raw or smart. 
-template <typename InnerMatcher> 
-class PointeeMatcher { 
- public: 
-  explicit PointeeMatcher(const InnerMatcher& matcher) : matcher_(matcher) {} 
- 
-  // This type conversion operator template allows Pointee(m) to be 
-  // used as a matcher for any pointer type whose pointee type is 
-  // compatible with the inner matcher, where type Pointer can be 
-  // either a raw pointer or a smart pointer. 
-  // 
-  // The reason we do this instead of relying on 
-  // MakePolymorphicMatcher() is that the latter is not flexible 
-  // enough for implementing the DescribeTo() method of Pointee(). 
-  template <typename Pointer> 
-  operator Matcher<Pointer>() const { 
+// Implements the Pointee(m) matcher for matching a pointer whose
+// pointee matches matcher m.  The pointer can be either raw or smart.
+template <typename InnerMatcher>
+class PointeeMatcher {
+ public:
+  explicit PointeeMatcher(const InnerMatcher& matcher) : matcher_(matcher) {}
+
+  // This type conversion operator template allows Pointee(m) to be
+  // used as a matcher for any pointer type whose pointee type is
+  // compatible with the inner matcher, where type Pointer can be
+  // either a raw pointer or a smart pointer.
+  //
+  // The reason we do this instead of relying on
+  // MakePolymorphicMatcher() is that the latter is not flexible
+  // enough for implementing the DescribeTo() method of Pointee().
+  template <typename Pointer>
+  operator Matcher<Pointer>() const {
     return Matcher<Pointer>(new Impl<const Pointer&>(matcher_));
-  } 
- 
- private: 
-  // The monomorphic implementation that works for a particular pointer type. 
-  template <typename Pointer> 
-  class Impl : public MatcherInterface<Pointer> { 
-   public: 
+  }
+
+ private:
+  // The monomorphic implementation that works for a particular pointer type.
+  template <typename Pointer>
+  class Impl : public MatcherInterface<Pointer> {
+   public:
     using Pointee =
         typename std::pointer_traits<GTEST_REMOVE_REFERENCE_AND_CONST_(
             Pointer)>::element_type;
- 
-    explicit Impl(const InnerMatcher& matcher) 
-        : matcher_(MatcherCast<const Pointee&>(matcher)) {} 
- 
+
+    explicit Impl(const InnerMatcher& matcher)
+        : matcher_(MatcherCast<const Pointee&>(matcher)) {}
+
     void DescribeTo(::std::ostream* os) const override {
-      *os << "points to a value that "; 
-      matcher_.DescribeTo(os); 
-    } 
- 
+      *os << "points to a value that ";
+      matcher_.DescribeTo(os);
+    }
+
     void DescribeNegationTo(::std::ostream* os) const override {
-      *os << "does not point to a value that "; 
-      matcher_.DescribeTo(os); 
-    } 
- 
+      *os << "does not point to a value that ";
+      matcher_.DescribeTo(os);
+    }
+
     bool MatchAndExplain(Pointer pointer,
                          MatchResultListener* listener) const override {
       if (GetRawPointer(pointer) == nullptr) return false;
- 
-      *listener << "which points to "; 
-      return MatchPrintAndExplain(*pointer, matcher_, listener); 
-    } 
- 
-   private: 
-    const Matcher<const Pointee&> matcher_; 
-  }; 
- 
-  const InnerMatcher matcher_; 
-}; 
- 
+
+      *listener << "which points to ";
+      return MatchPrintAndExplain(*pointer, matcher_, listener);
+    }
+
+   private:
+    const Matcher<const Pointee&> matcher_;
+  };
+
+  const InnerMatcher matcher_;
+};
+
 // Implements the Pointer(m) matcher
 // Implements the Pointer(m) matcher for matching a pointer that matches matcher
 // m.  The pointer can be either raw or smart, and will match `m` against the
@@ -1926,821 +1926,821 @@ class PointerMatcher {
 };
 
 #if GTEST_HAS_RTTI
-// Implements the WhenDynamicCastTo<T>(m) matcher that matches a pointer or 
-// reference that matches inner_matcher when dynamic_cast<T> is applied. 
-// The result of dynamic_cast<To> is forwarded to the inner matcher. 
-// If To is a pointer and the cast fails, the inner matcher will receive NULL. 
-// If To is a reference and the cast fails, this matcher returns false 
-// immediately. 
-template <typename To> 
-class WhenDynamicCastToMatcherBase { 
- public: 
-  explicit WhenDynamicCastToMatcherBase(const Matcher<To>& matcher) 
-      : matcher_(matcher) {} 
- 
-  void DescribeTo(::std::ostream* os) const { 
-    GetCastTypeDescription(os); 
-    matcher_.DescribeTo(os); 
-  } 
- 
-  void DescribeNegationTo(::std::ostream* os) const { 
-    GetCastTypeDescription(os); 
-    matcher_.DescribeNegationTo(os); 
-  } 
- 
- protected: 
-  const Matcher<To> matcher_; 
- 
+// Implements the WhenDynamicCastTo<T>(m) matcher that matches a pointer or
+// reference that matches inner_matcher when dynamic_cast<T> is applied.
+// The result of dynamic_cast<To> is forwarded to the inner matcher.
+// If To is a pointer and the cast fails, the inner matcher will receive NULL.
+// If To is a reference and the cast fails, this matcher returns false
+// immediately.
+template <typename To>
+class WhenDynamicCastToMatcherBase {
+ public:
+  explicit WhenDynamicCastToMatcherBase(const Matcher<To>& matcher)
+      : matcher_(matcher) {}
+
+  void DescribeTo(::std::ostream* os) const {
+    GetCastTypeDescription(os);
+    matcher_.DescribeTo(os);
+  }
+
+  void DescribeNegationTo(::std::ostream* os) const {
+    GetCastTypeDescription(os);
+    matcher_.DescribeNegationTo(os);
+  }
+
+ protected:
+  const Matcher<To> matcher_;
+
   static std::string GetToName() {
-    return GetTypeName<To>(); 
-  } 
- 
- private: 
-  static void GetCastTypeDescription(::std::ostream* os) { 
-    *os << "when dynamic_cast to " << GetToName() << ", "; 
-  } 
-}; 
- 
-// Primary template. 
-// To is a pointer. Cast and forward the result. 
-template <typename To> 
-class WhenDynamicCastToMatcher : public WhenDynamicCastToMatcherBase<To> { 
- public: 
-  explicit WhenDynamicCastToMatcher(const Matcher<To>& matcher) 
-      : WhenDynamicCastToMatcherBase<To>(matcher) {} 
- 
-  template <typename From> 
-  bool MatchAndExplain(From from, MatchResultListener* listener) const { 
-    To to = dynamic_cast<To>(from); 
-    return MatchPrintAndExplain(to, this->matcher_, listener); 
-  } 
-}; 
- 
-// Specialize for references. 
-// In this case we return false if the dynamic_cast fails. 
-template <typename To> 
-class WhenDynamicCastToMatcher<To&> : public WhenDynamicCastToMatcherBase<To&> { 
- public: 
-  explicit WhenDynamicCastToMatcher(const Matcher<To&>& matcher) 
-      : WhenDynamicCastToMatcherBase<To&>(matcher) {} 
- 
-  template <typename From> 
-  bool MatchAndExplain(From& from, MatchResultListener* listener) const { 
-    // We don't want an std::bad_cast here, so do the cast with pointers. 
-    To* to = dynamic_cast<To*>(&from); 
+    return GetTypeName<To>();
+  }
+
+ private:
+  static void GetCastTypeDescription(::std::ostream* os) {
+    *os << "when dynamic_cast to " << GetToName() << ", ";
+  }
+};
+
+// Primary template.
+// To is a pointer. Cast and forward the result.
+template <typename To>
+class WhenDynamicCastToMatcher : public WhenDynamicCastToMatcherBase<To> {
+ public:
+  explicit WhenDynamicCastToMatcher(const Matcher<To>& matcher)
+      : WhenDynamicCastToMatcherBase<To>(matcher) {}
+
+  template <typename From>
+  bool MatchAndExplain(From from, MatchResultListener* listener) const {
+    To to = dynamic_cast<To>(from);
+    return MatchPrintAndExplain(to, this->matcher_, listener);
+  }
+};
+
+// Specialize for references.
+// In this case we return false if the dynamic_cast fails.
+template <typename To>
+class WhenDynamicCastToMatcher<To&> : public WhenDynamicCastToMatcherBase<To&> {
+ public:
+  explicit WhenDynamicCastToMatcher(const Matcher<To&>& matcher)
+      : WhenDynamicCastToMatcherBase<To&>(matcher) {}
+
+  template <typename From>
+  bool MatchAndExplain(From& from, MatchResultListener* listener) const {
+    // We don't want an std::bad_cast here, so do the cast with pointers.
+    To* to = dynamic_cast<To*>(&from);
     if (to == nullptr) {
-      *listener << "which cannot be dynamic_cast to " << this->GetToName(); 
-      return false; 
-    } 
-    return MatchPrintAndExplain(*to, this->matcher_, listener); 
-  } 
-}; 
+      *listener << "which cannot be dynamic_cast to " << this->GetToName();
+      return false;
+    }
+    return MatchPrintAndExplain(*to, this->matcher_, listener);
+  }
+};
 #endif  // GTEST_HAS_RTTI
- 
-// Implements the Field() matcher for matching a field (i.e. member 
-// variable) of an object. 
-template <typename Class, typename FieldType> 
-class FieldMatcher { 
- public: 
-  FieldMatcher(FieldType Class::*field, 
-               const Matcher<const FieldType&>& matcher) 
+
+// Implements the Field() matcher for matching a field (i.e. member
+// variable) of an object.
+template <typename Class, typename FieldType>
+class FieldMatcher {
+ public:
+  FieldMatcher(FieldType Class::*field,
+               const Matcher<const FieldType&>& matcher)
       : field_(field), matcher_(matcher), whose_field_("whose given field ") {}
- 
+
   FieldMatcher(const std::string& field_name, FieldType Class::*field,
                const Matcher<const FieldType&>& matcher)
       : field_(field),
         matcher_(matcher),
         whose_field_("whose field `" + field_name + "` ") {}
 
-  void DescribeTo(::std::ostream* os) const { 
+  void DescribeTo(::std::ostream* os) const {
     *os << "is an object " << whose_field_;
-    matcher_.DescribeTo(os); 
-  } 
- 
-  void DescribeNegationTo(::std::ostream* os) const { 
+    matcher_.DescribeTo(os);
+  }
+
+  void DescribeNegationTo(::std::ostream* os) const {
     *os << "is an object " << whose_field_;
-    matcher_.DescribeNegationTo(os); 
-  } 
- 
-  template <typename T> 
-  bool MatchAndExplain(const T& value, MatchResultListener* listener) const { 
+    matcher_.DescribeNegationTo(os);
+  }
+
+  template <typename T>
+  bool MatchAndExplain(const T& value, MatchResultListener* listener) const {
     // FIXME: The dispatch on std::is_pointer was introduced as a workaround for
     // a compiler bug, and can now be removed.
-    return MatchAndExplainImpl( 
+    return MatchAndExplainImpl(
         typename std::is_pointer<typename std::remove_const<T>::type>::type(),
-        value, listener); 
-  } 
- 
- private: 
+        value, listener);
+  }
+
+ private:
   bool MatchAndExplainImpl(std::false_type /* is_not_pointer */,
                            const Class& obj,
-                           MatchResultListener* listener) const { 
+                           MatchResultListener* listener) const {
     *listener << whose_field_ << "is ";
-    return MatchPrintAndExplain(obj.*field_, matcher_, listener); 
-  } 
- 
+    return MatchPrintAndExplain(obj.*field_, matcher_, listener);
+  }
+
   bool MatchAndExplainImpl(std::true_type /* is_pointer */, const Class* p,
-                           MatchResultListener* listener) const { 
+                           MatchResultListener* listener) const {
     if (p == nullptr) return false;
- 
-    *listener << "which points to an object "; 
-    // Since *p has a field, it must be a class/struct/union type and 
-    // thus cannot be a pointer.  Therefore we pass false_type() as 
-    // the first argument. 
+
+    *listener << "which points to an object ";
+    // Since *p has a field, it must be a class/struct/union type and
+    // thus cannot be a pointer.  Therefore we pass false_type() as
+    // the first argument.
     return MatchAndExplainImpl(std::false_type(), *p, listener);
-  } 
- 
-  const FieldType Class::*field_; 
-  const Matcher<const FieldType&> matcher_; 
- 
+  }
+
+  const FieldType Class::*field_;
+  const Matcher<const FieldType&> matcher_;
+
   // Contains either "whose given field " if the name of the field is unknown
   // or "whose field `name_of_field` " if the name is known.
   const std::string whose_field_;
-}; 
- 
-// Implements the Property() matcher for matching a property 
-// (i.e. return value of a getter method) of an object. 
+};
+
+// Implements the Property() matcher for matching a property
+// (i.e. return value of a getter method) of an object.
 //
 // Property is a const-qualified member function of Class returning
 // PropertyType.
 template <typename Class, typename PropertyType, typename Property>
-class PropertyMatcher { 
- public: 
+class PropertyMatcher {
+ public:
   typedef const PropertyType& RefToConstProperty;
- 
+
   PropertyMatcher(Property property, const Matcher<RefToConstProperty>& matcher)
       : property_(property),
         matcher_(matcher),
         whose_property_("whose given property ") {}
 
   PropertyMatcher(const std::string& property_name, Property property,
-                  const Matcher<RefToConstProperty>& matcher) 
+                  const Matcher<RefToConstProperty>& matcher)
       : property_(property),
         matcher_(matcher),
         whose_property_("whose property `" + property_name + "` ") {}
- 
-  void DescribeTo(::std::ostream* os) const { 
+
+  void DescribeTo(::std::ostream* os) const {
     *os << "is an object " << whose_property_;
-    matcher_.DescribeTo(os); 
-  } 
- 
-  void DescribeNegationTo(::std::ostream* os) const { 
+    matcher_.DescribeTo(os);
+  }
+
+  void DescribeNegationTo(::std::ostream* os) const {
     *os << "is an object " << whose_property_;
-    matcher_.DescribeNegationTo(os); 
-  } 
- 
-  template <typename T> 
-  bool MatchAndExplain(const T&value, MatchResultListener* listener) const { 
-    return MatchAndExplainImpl( 
+    matcher_.DescribeNegationTo(os);
+  }
+
+  template <typename T>
+  bool MatchAndExplain(const T&value, MatchResultListener* listener) const {
+    return MatchAndExplainImpl(
         typename std::is_pointer<typename std::remove_const<T>::type>::type(),
-        value, listener); 
-  } 
- 
- private: 
+        value, listener);
+  }
+
+ private:
   bool MatchAndExplainImpl(std::false_type /* is_not_pointer */,
                            const Class& obj,
-                           MatchResultListener* listener) const { 
+                           MatchResultListener* listener) const {
     *listener << whose_property_ << "is ";
-    // Cannot pass the return value (for example, int) to MatchPrintAndExplain, 
-    // which takes a non-const reference as argument. 
-    RefToConstProperty result = (obj.*property_)(); 
-    return MatchPrintAndExplain(result, matcher_, listener); 
-  } 
- 
+    // Cannot pass the return value (for example, int) to MatchPrintAndExplain,
+    // which takes a non-const reference as argument.
+    RefToConstProperty result = (obj.*property_)();
+    return MatchPrintAndExplain(result, matcher_, listener);
+  }
+
   bool MatchAndExplainImpl(std::true_type /* is_pointer */, const Class* p,
-                           MatchResultListener* listener) const { 
+                           MatchResultListener* listener) const {
     if (p == nullptr) return false;
- 
-    *listener << "which points to an object "; 
-    // Since *p has a property method, it must be a class/struct/union 
-    // type and thus cannot be a pointer.  Therefore we pass 
-    // false_type() as the first argument. 
+
+    *listener << "which points to an object ";
+    // Since *p has a property method, it must be a class/struct/union
+    // type and thus cannot be a pointer.  Therefore we pass
+    // false_type() as the first argument.
     return MatchAndExplainImpl(std::false_type(), *p, listener);
-  } 
- 
+  }
+
   Property property_;
-  const Matcher<RefToConstProperty> matcher_; 
- 
+  const Matcher<RefToConstProperty> matcher_;
+
   // Contains either "whose given property " if the name of the property is
   // unknown or "whose property `name_of_property` " if the name is known.
   const std::string whose_property_;
-}; 
- 
-// Type traits specifying various features of different functors for ResultOf. 
-// The default template specifies features for functor objects. 
-template <typename Functor> 
-struct CallableTraits { 
-  typedef Functor StorageType; 
- 
-  static void CheckIsValid(Functor /* functor */) {} 
-
-  template <typename T> 
+};
+
+// Type traits specifying various features of different functors for ResultOf.
+// The default template specifies features for functor objects.
+template <typename Functor>
+struct CallableTraits {
+  typedef Functor StorageType;
+
+  static void CheckIsValid(Functor /* functor */) {}
+
+  template <typename T>
   static auto Invoke(Functor f, const T& arg) -> decltype(f(arg)) {
     return f(arg);
   }
-}; 
- 
-// Specialization for function pointers. 
-template <typename ArgType, typename ResType> 
-struct CallableTraits<ResType(*)(ArgType)> { 
-  typedef ResType ResultType; 
-  typedef ResType(*StorageType)(ArgType); 
- 
-  static void CheckIsValid(ResType(*f)(ArgType)) { 
+};
+
+// Specialization for function pointers.
+template <typename ArgType, typename ResType>
+struct CallableTraits<ResType(*)(ArgType)> {
+  typedef ResType ResultType;
+  typedef ResType(*StorageType)(ArgType);
+
+  static void CheckIsValid(ResType(*f)(ArgType)) {
     GTEST_CHECK_(f != nullptr)
-        << "NULL function pointer is passed into ResultOf()."; 
-  } 
-  template <typename T> 
-  static ResType Invoke(ResType(*f)(ArgType), T arg) { 
-    return (*f)(arg); 
-  } 
-}; 
- 
-// Implements the ResultOf() matcher for matching a return value of a 
-// unary function of an object. 
+        << "NULL function pointer is passed into ResultOf().";
+  }
+  template <typename T>
+  static ResType Invoke(ResType(*f)(ArgType), T arg) {
+    return (*f)(arg);
+  }
+};
+
+// Implements the ResultOf() matcher for matching a return value of a
+// unary function of an object.
 template <typename Callable, typename InnerMatcher>
-class ResultOfMatcher { 
- public: 
+class ResultOfMatcher {
+ public:
   ResultOfMatcher(Callable callable, InnerMatcher matcher)
       : callable_(std::move(callable)), matcher_(std::move(matcher)) {
-    CallableTraits<Callable>::CheckIsValid(callable_); 
-  } 
- 
-  template <typename T> 
-  operator Matcher<T>() const { 
+    CallableTraits<Callable>::CheckIsValid(callable_);
+  }
+
+  template <typename T>
+  operator Matcher<T>() const {
     return Matcher<T>(new Impl<const T&>(callable_, matcher_));
-  } 
- 
- private: 
-  typedef typename CallableTraits<Callable>::StorageType CallableStorageType; 
- 
-  template <typename T> 
-  class Impl : public MatcherInterface<T> { 
+  }
+
+ private:
+  typedef typename CallableTraits<Callable>::StorageType CallableStorageType;
+
+  template <typename T>
+  class Impl : public MatcherInterface<T> {
     using ResultType = decltype(CallableTraits<Callable>::template Invoke<T>(
         std::declval<CallableStorageType>(), std::declval<T>()));
 
-   public: 
+   public:
     template <typename M>
     Impl(const CallableStorageType& callable, const M& matcher)
         : callable_(callable), matcher_(MatcherCast<ResultType>(matcher)) {}
- 
+
     void DescribeTo(::std::ostream* os) const override {
-      *os << "is mapped by the given callable to a value that "; 
-      matcher_.DescribeTo(os); 
-    } 
- 
+      *os << "is mapped by the given callable to a value that ";
+      matcher_.DescribeTo(os);
+    }
+
     void DescribeNegationTo(::std::ostream* os) const override {
-      *os << "is mapped by the given callable to a value that "; 
-      matcher_.DescribeNegationTo(os); 
-    } 
- 
+      *os << "is mapped by the given callable to a value that ";
+      matcher_.DescribeNegationTo(os);
+    }
+
     bool MatchAndExplain(T obj, MatchResultListener* listener) const override {
-      *listener << "which is mapped by the given callable to "; 
+      *listener << "which is mapped by the given callable to ";
       // Cannot pass the return value directly to MatchPrintAndExplain, which
       // takes a non-const reference as argument.
       // Also, specifying template argument explicitly is needed because T could
       // be a non-const reference (e.g. Matcher<Uncopyable&>).
-      ResultType result = 
-          CallableTraits<Callable>::template Invoke<T>(callable_, obj); 
-      return MatchPrintAndExplain(result, matcher_, listener); 
-    } 
- 
-   private: 
-    // Functors often define operator() as non-const method even though 
+      ResultType result =
+          CallableTraits<Callable>::template Invoke<T>(callable_, obj);
+      return MatchPrintAndExplain(result, matcher_, listener);
+    }
+
+   private:
+    // Functors often define operator() as non-const method even though
     // they are actually stateless. But we need to use them even when
-    // 'this' is a const pointer. It's the user's responsibility not to 
+    // 'this' is a const pointer. It's the user's responsibility not to
     // use stateful callables with ResultOf(), which doesn't guarantee
-    // how many times the callable will be invoked. 
-    mutable CallableStorageType callable_; 
-    const Matcher<ResultType> matcher_; 
-  };  // class Impl 
- 
-  const CallableStorageType callable_; 
+    // how many times the callable will be invoked.
+    mutable CallableStorageType callable_;
+    const Matcher<ResultType> matcher_;
+  };  // class Impl
+
+  const CallableStorageType callable_;
   const InnerMatcher matcher_;
-}; 
- 
-// Implements a matcher that checks the size of an STL-style container. 
-template <typename SizeMatcher> 
-class SizeIsMatcher { 
- public: 
-  explicit SizeIsMatcher(const SizeMatcher& size_matcher) 
-       : size_matcher_(size_matcher) { 
-  } 
- 
-  template <typename Container> 
-  operator Matcher<Container>() const { 
+};
+
+// Implements a matcher that checks the size of an STL-style container.
+template <typename SizeMatcher>
+class SizeIsMatcher {
+ public:
+  explicit SizeIsMatcher(const SizeMatcher& size_matcher)
+       : size_matcher_(size_matcher) {
+  }
+
+  template <typename Container>
+  operator Matcher<Container>() const {
     return Matcher<Container>(new Impl<const Container&>(size_matcher_));
-  } 
- 
-  template <typename Container> 
-  class Impl : public MatcherInterface<Container> { 
-   public: 
+  }
+
+  template <typename Container>
+  class Impl : public MatcherInterface<Container> {
+   public:
     using SizeType = decltype(std::declval<Container>().size());
-    explicit Impl(const SizeMatcher& size_matcher) 
-        : size_matcher_(MatcherCast<SizeType>(size_matcher)) {} 
- 
+    explicit Impl(const SizeMatcher& size_matcher)
+        : size_matcher_(MatcherCast<SizeType>(size_matcher)) {}
+
     void DescribeTo(::std::ostream* os) const override {
-      *os << "size "; 
-      size_matcher_.DescribeTo(os); 
-    } 
+      *os << "size ";
+      size_matcher_.DescribeTo(os);
+    }
     void DescribeNegationTo(::std::ostream* os) const override {
-      *os << "size "; 
-      size_matcher_.DescribeNegationTo(os); 
-    } 
- 
+      *os << "size ";
+      size_matcher_.DescribeNegationTo(os);
+    }
+
     bool MatchAndExplain(Container container,
                          MatchResultListener* listener) const override {
-      SizeType size = container.size(); 
-      StringMatchResultListener size_listener; 
-      const bool result = size_matcher_.MatchAndExplain(size, &size_listener); 
-      *listener 
-          << "whose size " << size << (result ? " matches" : " doesn't match"); 
-      PrintIfNotEmpty(size_listener.str(), listener->stream()); 
-      return result; 
-    } 
- 
-   private: 
-    const Matcher<SizeType> size_matcher_; 
-  }; 
- 
- private: 
-  const SizeMatcher size_matcher_; 
-}; 
- 
-// Implements a matcher that checks the begin()..end() distance of an STL-style 
-// container. 
-template <typename DistanceMatcher> 
-class BeginEndDistanceIsMatcher { 
- public: 
-  explicit BeginEndDistanceIsMatcher(const DistanceMatcher& distance_matcher) 
-      : distance_matcher_(distance_matcher) {} 
- 
-  template <typename Container> 
-  operator Matcher<Container>() const { 
+      SizeType size = container.size();
+      StringMatchResultListener size_listener;
+      const bool result = size_matcher_.MatchAndExplain(size, &size_listener);
+      *listener
+          << "whose size " << size << (result ? " matches" : " doesn't match");
+      PrintIfNotEmpty(size_listener.str(), listener->stream());
+      return result;
+    }
+
+   private:
+    const Matcher<SizeType> size_matcher_;
+  };
+
+ private:
+  const SizeMatcher size_matcher_;
+};
+
+// Implements a matcher that checks the begin()..end() distance of an STL-style
+// container.
+template <typename DistanceMatcher>
+class BeginEndDistanceIsMatcher {
+ public:
+  explicit BeginEndDistanceIsMatcher(const DistanceMatcher& distance_matcher)
+      : distance_matcher_(distance_matcher) {}
+
+  template <typename Container>
+  operator Matcher<Container>() const {
     return Matcher<Container>(new Impl<const Container&>(distance_matcher_));
-  } 
- 
-  template <typename Container> 
-  class Impl : public MatcherInterface<Container> { 
-   public: 
-    typedef internal::StlContainerView< 
-        GTEST_REMOVE_REFERENCE_AND_CONST_(Container)> ContainerView; 
-    typedef typename std::iterator_traits< 
-        typename ContainerView::type::const_iterator>::difference_type 
-        DistanceType; 
-    explicit Impl(const DistanceMatcher& distance_matcher) 
-        : distance_matcher_(MatcherCast<DistanceType>(distance_matcher)) {} 
- 
+  }
+
+  template <typename Container>
+  class Impl : public MatcherInterface<Container> {
+   public:
+    typedef internal::StlContainerView<
+        GTEST_REMOVE_REFERENCE_AND_CONST_(Container)> ContainerView;
+    typedef typename std::iterator_traits<
+        typename ContainerView::type::const_iterator>::difference_type
+        DistanceType;
+    explicit Impl(const DistanceMatcher& distance_matcher)
+        : distance_matcher_(MatcherCast<DistanceType>(distance_matcher)) {}
+
     void DescribeTo(::std::ostream* os) const override {
-      *os << "distance between begin() and end() "; 
-      distance_matcher_.DescribeTo(os); 
-    } 
+      *os << "distance between begin() and end() ";
+      distance_matcher_.DescribeTo(os);
+    }
     void DescribeNegationTo(::std::ostream* os) const override {
-      *os << "distance between begin() and end() "; 
-      distance_matcher_.DescribeNegationTo(os); 
-    } 
- 
+      *os << "distance between begin() and end() ";
+      distance_matcher_.DescribeNegationTo(os);
+    }
+
     bool MatchAndExplain(Container container,
                          MatchResultListener* listener) const override {
-      using std::begin; 
-      using std::end; 
-      DistanceType distance = std::distance(begin(container), end(container)); 
-      StringMatchResultListener distance_listener; 
-      const bool result = 
-          distance_matcher_.MatchAndExplain(distance, &distance_listener); 
-      *listener << "whose distance between begin() and end() " << distance 
-                << (result ? " matches" : " doesn't match"); 
-      PrintIfNotEmpty(distance_listener.str(), listener->stream()); 
-      return result; 
-    } 
- 
-   private: 
-    const Matcher<DistanceType> distance_matcher_; 
-  }; 
- 
- private: 
-  const DistanceMatcher distance_matcher_; 
-}; 
- 
-// Implements an equality matcher for any STL-style container whose elements 
-// support ==. This matcher is like Eq(), but its failure explanations provide 
-// more detailed information that is useful when the container is used as a set. 
-// The failure message reports elements that are in one of the operands but not 
-// the other. The failure messages do not report duplicate or out-of-order 
-// elements in the containers (which don't properly matter to sets, but can 
-// occur if the containers are vectors or lists, for example). 
-// 
-// Uses the container's const_iterator, value_type, operator ==, 
-// begin(), and end(). 
-template <typename Container> 
-class ContainerEqMatcher { 
- public: 
-  typedef internal::StlContainerView<Container> View; 
-  typedef typename View::type StlContainer; 
-  typedef typename View::const_reference StlContainerReference; 
- 
+      using std::begin;
+      using std::end;
+      DistanceType distance = std::distance(begin(container), end(container));
+      StringMatchResultListener distance_listener;
+      const bool result =
+          distance_matcher_.MatchAndExplain(distance, &distance_listener);
+      *listener << "whose distance between begin() and end() " << distance
+                << (result ? " matches" : " doesn't match");
+      PrintIfNotEmpty(distance_listener.str(), listener->stream());
+      return result;
+    }
+
+   private:
+    const Matcher<DistanceType> distance_matcher_;
+  };
+
+ private:
+  const DistanceMatcher distance_matcher_;
+};
+
+// Implements an equality matcher for any STL-style container whose elements
+// support ==. This matcher is like Eq(), but its failure explanations provide
+// more detailed information that is useful when the container is used as a set.
+// The failure message reports elements that are in one of the operands but not
+// the other. The failure messages do not report duplicate or out-of-order
+// elements in the containers (which don't properly matter to sets, but can
+// occur if the containers are vectors or lists, for example).
+//
+// Uses the container's const_iterator, value_type, operator ==,
+// begin(), and end().
+template <typename Container>
+class ContainerEqMatcher {
+ public:
+  typedef internal::StlContainerView<Container> View;
+  typedef typename View::type StlContainer;
+  typedef typename View::const_reference StlContainerReference;
+
   static_assert(!std::is_const<Container>::value,
                 "Container type must not be const");
   static_assert(!std::is_reference<Container>::value,
                 "Container type must not be a reference");
 
-  // We make a copy of expected in case the elements in it are modified 
-  // after this matcher is created. 
-  explicit ContainerEqMatcher(const Container& expected) 
+  // We make a copy of expected in case the elements in it are modified
+  // after this matcher is created.
+  explicit ContainerEqMatcher(const Container& expected)
       : expected_(View::Copy(expected)) {}
- 
-  void DescribeTo(::std::ostream* os) const { 
-    *os << "equals "; 
-    UniversalPrint(expected_, os); 
-  } 
-  void DescribeNegationTo(::std::ostream* os) const { 
-    *os << "does not equal "; 
-    UniversalPrint(expected_, os); 
-  } 
- 
-  template <typename LhsContainer> 
-  bool MatchAndExplain(const LhsContainer& lhs, 
-                       MatchResultListener* listener) const { 
+
+  void DescribeTo(::std::ostream* os) const {
+    *os << "equals ";
+    UniversalPrint(expected_, os);
+  }
+  void DescribeNegationTo(::std::ostream* os) const {
+    *os << "does not equal ";
+    UniversalPrint(expected_, os);
+  }
+
+  template <typename LhsContainer>
+  bool MatchAndExplain(const LhsContainer& lhs,
+                       MatchResultListener* listener) const {
     typedef internal::StlContainerView<
         typename std::remove_const<LhsContainer>::type>
-        LhsView; 
-    typedef typename LhsView::type LhsStlContainer; 
-    StlContainerReference lhs_stl_container = LhsView::ConstReference(lhs); 
-    if (lhs_stl_container == expected_) 
-      return true; 
- 
-    ::std::ostream* const os = listener->stream(); 
+        LhsView;
+    typedef typename LhsView::type LhsStlContainer;
+    StlContainerReference lhs_stl_container = LhsView::ConstReference(lhs);
+    if (lhs_stl_container == expected_)
+      return true;
+
+    ::std::ostream* const os = listener->stream();
     if (os != nullptr) {
-      // Something is different. Check for extra values first. 
-      bool printed_header = false; 
-      for (typename LhsStlContainer::const_iterator it = 
-               lhs_stl_container.begin(); 
-           it != lhs_stl_container.end(); ++it) { 
-        if (internal::ArrayAwareFind(expected_.begin(), expected_.end(), *it) == 
-            expected_.end()) { 
-          if (printed_header) { 
-            *os << ", "; 
-          } else { 
-            *os << "which has these unexpected elements: "; 
-            printed_header = true; 
-          } 
-          UniversalPrint(*it, os); 
-        } 
-      } 
- 
-      // Now check for missing values. 
-      bool printed_header2 = false; 
-      for (typename StlContainer::const_iterator it = expected_.begin(); 
-           it != expected_.end(); ++it) { 
-        if (internal::ArrayAwareFind( 
-                lhs_stl_container.begin(), lhs_stl_container.end(), *it) == 
-            lhs_stl_container.end()) { 
-          if (printed_header2) { 
-            *os << ", "; 
-          } else { 
-            *os << (printed_header ? ",\nand" : "which") 
-                << " doesn't have these expected elements: "; 
-            printed_header2 = true; 
-          } 
-          UniversalPrint(*it, os); 
-        } 
-      } 
-    } 
- 
-    return false; 
-  } 
- 
- private: 
-  const StlContainer expected_; 
-}; 
- 
-// A comparator functor that uses the < operator to compare two values. 
-struct LessComparator { 
-  template <typename T, typename U> 
-  bool operator()(const T& lhs, const U& rhs) const { return lhs < rhs; } 
-}; 
- 
-// Implements WhenSortedBy(comparator, container_matcher). 
-template <typename Comparator, typename ContainerMatcher> 
-class WhenSortedByMatcher { 
- public: 
-  WhenSortedByMatcher(const Comparator& comparator, 
-                      const ContainerMatcher& matcher) 
-      : comparator_(comparator), matcher_(matcher) {} 
- 
-  template <typename LhsContainer> 
-  operator Matcher<LhsContainer>() const { 
-    return MakeMatcher(new Impl<LhsContainer>(comparator_, matcher_)); 
-  } 
- 
-  template <typename LhsContainer> 
-  class Impl : public MatcherInterface<LhsContainer> { 
-   public: 
-    typedef internal::StlContainerView< 
-         GTEST_REMOVE_REFERENCE_AND_CONST_(LhsContainer)> LhsView; 
-    typedef typename LhsView::type LhsStlContainer; 
-    typedef typename LhsView::const_reference LhsStlContainerReference; 
-    // Transforms std::pair<const Key, Value> into std::pair<Key, Value> 
-    // so that we can match associative containers. 
-    typedef typename RemoveConstFromKey< 
-        typename LhsStlContainer::value_type>::type LhsValue; 
- 
-    Impl(const Comparator& comparator, const ContainerMatcher& matcher) 
-        : comparator_(comparator), matcher_(matcher) {} 
- 
+      // Something is different. Check for extra values first.
+      bool printed_header = false;
+      for (typename LhsStlContainer::const_iterator it =
+               lhs_stl_container.begin();
+           it != lhs_stl_container.end(); ++it) {
+        if (internal::ArrayAwareFind(expected_.begin(), expected_.end(), *it) ==
+            expected_.end()) {
+          if (printed_header) {
+            *os << ", ";
+          } else {
+            *os << "which has these unexpected elements: ";
+            printed_header = true;
+          }
+          UniversalPrint(*it, os);
+        }
+      }
+
+      // Now check for missing values.
+      bool printed_header2 = false;
+      for (typename StlContainer::const_iterator it = expected_.begin();
+           it != expected_.end(); ++it) {
+        if (internal::ArrayAwareFind(
+                lhs_stl_container.begin(), lhs_stl_container.end(), *it) ==
+            lhs_stl_container.end()) {
+          if (printed_header2) {
+            *os << ", ";
+          } else {
+            *os << (printed_header ? ",\nand" : "which")
+                << " doesn't have these expected elements: ";
+            printed_header2 = true;
+          }
+          UniversalPrint(*it, os);
+        }
+      }
+    }
+
+    return false;
+  }
+
+ private:
+  const StlContainer expected_;
+};
+
+// A comparator functor that uses the < operator to compare two values.
+struct LessComparator {
+  template <typename T, typename U>
+  bool operator()(const T& lhs, const U& rhs) const { return lhs < rhs; }
+};
+
+// Implements WhenSortedBy(comparator, container_matcher).
+template <typename Comparator, typename ContainerMatcher>
+class WhenSortedByMatcher {
+ public:
+  WhenSortedByMatcher(const Comparator& comparator,
+                      const ContainerMatcher& matcher)
+      : comparator_(comparator), matcher_(matcher) {}
+
+  template <typename LhsContainer>
+  operator Matcher<LhsContainer>() const {
+    return MakeMatcher(new Impl<LhsContainer>(comparator_, matcher_));
+  }
+
+  template <typename LhsContainer>
+  class Impl : public MatcherInterface<LhsContainer> {
+   public:
+    typedef internal::StlContainerView<
+         GTEST_REMOVE_REFERENCE_AND_CONST_(LhsContainer)> LhsView;
+    typedef typename LhsView::type LhsStlContainer;
+    typedef typename LhsView::const_reference LhsStlContainerReference;
+    // Transforms std::pair<const Key, Value> into std::pair<Key, Value>
+    // so that we can match associative containers.
+    typedef typename RemoveConstFromKey<
+        typename LhsStlContainer::value_type>::type LhsValue;
+
+    Impl(const Comparator& comparator, const ContainerMatcher& matcher)
+        : comparator_(comparator), matcher_(matcher) {}
+
     void DescribeTo(::std::ostream* os) const override {
-      *os << "(when sorted) "; 
-      matcher_.DescribeTo(os); 
-    } 
- 
+      *os << "(when sorted) ";
+      matcher_.DescribeTo(os);
+    }
+
     void DescribeNegationTo(::std::ostream* os) const override {
-      *os << "(when sorted) "; 
-      matcher_.DescribeNegationTo(os); 
-    } 
- 
+      *os << "(when sorted) ";
+      matcher_.DescribeNegationTo(os);
+    }
+
     bool MatchAndExplain(LhsContainer lhs,
                          MatchResultListener* listener) const override {
-      LhsStlContainerReference lhs_stl_container = LhsView::ConstReference(lhs); 
-      ::std::vector<LhsValue> sorted_container(lhs_stl_container.begin(), 
-                                               lhs_stl_container.end()); 
-      ::std::sort( 
-           sorted_container.begin(), sorted_container.end(), comparator_); 
- 
-      if (!listener->IsInterested()) { 
-        // If the listener is not interested, we do not need to 
-        // construct the inner explanation. 
-        return matcher_.Matches(sorted_container); 
-      } 
- 
-      *listener << "which is "; 
-      UniversalPrint(sorted_container, listener->stream()); 
-      *listener << " when sorted"; 
- 
-      StringMatchResultListener inner_listener; 
-      const bool match = matcher_.MatchAndExplain(sorted_container, 
-                                                  &inner_listener); 
-      PrintIfNotEmpty(inner_listener.str(), listener->stream()); 
-      return match; 
-    } 
- 
-   private: 
-    const Comparator comparator_; 
-    const Matcher<const ::std::vector<LhsValue>&> matcher_; 
- 
-    GTEST_DISALLOW_COPY_AND_ASSIGN_(Impl); 
-  }; 
- 
- private: 
-  const Comparator comparator_; 
-  const ContainerMatcher matcher_; 
-}; 
- 
-// Implements Pointwise(tuple_matcher, rhs_container).  tuple_matcher 
+      LhsStlContainerReference lhs_stl_container = LhsView::ConstReference(lhs);
+      ::std::vector<LhsValue> sorted_container(lhs_stl_container.begin(),
+                                               lhs_stl_container.end());
+      ::std::sort(
+           sorted_container.begin(), sorted_container.end(), comparator_);
+
+      if (!listener->IsInterested()) {
+        // If the listener is not interested, we do not need to
+        // construct the inner explanation.
+        return matcher_.Matches(sorted_container);
+      }
+
+      *listener << "which is ";
+      UniversalPrint(sorted_container, listener->stream());
+      *listener << " when sorted";
+
+      StringMatchResultListener inner_listener;
+      const bool match = matcher_.MatchAndExplain(sorted_container,
+                                                  &inner_listener);
+      PrintIfNotEmpty(inner_listener.str(), listener->stream());
+      return match;
+    }
+
+   private:
+    const Comparator comparator_;
+    const Matcher<const ::std::vector<LhsValue>&> matcher_;
+
+    GTEST_DISALLOW_COPY_AND_ASSIGN_(Impl);
+  };
+
+ private:
+  const Comparator comparator_;
+  const ContainerMatcher matcher_;
+};
+
+// Implements Pointwise(tuple_matcher, rhs_container).  tuple_matcher
 // must be able to be safely cast to Matcher<std::tuple<const T1&, const
-// T2&> >, where T1 and T2 are the types of elements in the LHS 
-// container and the RHS container respectively. 
-template <typename TupleMatcher, typename RhsContainer> 
-class PointwiseMatcher { 
+// T2&> >, where T1 and T2 are the types of elements in the LHS
+// container and the RHS container respectively.
+template <typename TupleMatcher, typename RhsContainer>
+class PointwiseMatcher {
   GTEST_COMPILE_ASSERT_(
       !IsHashTable<GTEST_REMOVE_REFERENCE_AND_CONST_(RhsContainer)>::value,
       use_UnorderedPointwise_with_hash_tables);
 
- public: 
-  typedef internal::StlContainerView<RhsContainer> RhsView; 
-  typedef typename RhsView::type RhsStlContainer; 
-  typedef typename RhsStlContainer::value_type RhsValue; 
- 
+ public:
+  typedef internal::StlContainerView<RhsContainer> RhsView;
+  typedef typename RhsView::type RhsStlContainer;
+  typedef typename RhsStlContainer::value_type RhsValue;
+
   static_assert(!std::is_const<RhsContainer>::value,
                 "RhsContainer type must not be const");
   static_assert(!std::is_reference<RhsContainer>::value,
                 "RhsContainer type must not be a reference");
 
-  // Like ContainerEq, we make a copy of rhs in case the elements in 
-  // it are modified after this matcher is created. 
-  PointwiseMatcher(const TupleMatcher& tuple_matcher, const RhsContainer& rhs) 
+  // Like ContainerEq, we make a copy of rhs in case the elements in
+  // it are modified after this matcher is created.
+  PointwiseMatcher(const TupleMatcher& tuple_matcher, const RhsContainer& rhs)
       : tuple_matcher_(tuple_matcher), rhs_(RhsView::Copy(rhs)) {}
- 
-  template <typename LhsContainer> 
-  operator Matcher<LhsContainer>() const { 
+
+  template <typename LhsContainer>
+  operator Matcher<LhsContainer>() const {
     GTEST_COMPILE_ASSERT_(
         !IsHashTable<GTEST_REMOVE_REFERENCE_AND_CONST_(LhsContainer)>::value,
         use_UnorderedPointwise_with_hash_tables);
 
     return Matcher<LhsContainer>(
         new Impl<const LhsContainer&>(tuple_matcher_, rhs_));
-  } 
- 
-  template <typename LhsContainer> 
-  class Impl : public MatcherInterface<LhsContainer> { 
-   public: 
-    typedef internal::StlContainerView< 
-         GTEST_REMOVE_REFERENCE_AND_CONST_(LhsContainer)> LhsView; 
-    typedef typename LhsView::type LhsStlContainer; 
-    typedef typename LhsView::const_reference LhsStlContainerReference; 
-    typedef typename LhsStlContainer::value_type LhsValue; 
-    // We pass the LHS value and the RHS value to the inner matcher by 
-    // reference, as they may be expensive to copy.  We must use tuple 
-    // instead of pair here, as a pair cannot hold references (C++ 98, 
-    // 20.2.2 [lib.pairs]). 
+  }
+
+  template <typename LhsContainer>
+  class Impl : public MatcherInterface<LhsContainer> {
+   public:
+    typedef internal::StlContainerView<
+         GTEST_REMOVE_REFERENCE_AND_CONST_(LhsContainer)> LhsView;
+    typedef typename LhsView::type LhsStlContainer;
+    typedef typename LhsView::const_reference LhsStlContainerReference;
+    typedef typename LhsStlContainer::value_type LhsValue;
+    // We pass the LHS value and the RHS value to the inner matcher by
+    // reference, as they may be expensive to copy.  We must use tuple
+    // instead of pair here, as a pair cannot hold references (C++ 98,
+    // 20.2.2 [lib.pairs]).
     typedef ::std::tuple<const LhsValue&, const RhsValue&> InnerMatcherArg;
- 
-    Impl(const TupleMatcher& tuple_matcher, const RhsStlContainer& rhs) 
-        // mono_tuple_matcher_ holds a monomorphic version of the tuple matcher. 
-        : mono_tuple_matcher_(SafeMatcherCast<InnerMatcherArg>(tuple_matcher)), 
-          rhs_(rhs) {} 
- 
+
+    Impl(const TupleMatcher& tuple_matcher, const RhsStlContainer& rhs)
+        // mono_tuple_matcher_ holds a monomorphic version of the tuple matcher.
+        : mono_tuple_matcher_(SafeMatcherCast<InnerMatcherArg>(tuple_matcher)),
+          rhs_(rhs) {}
+
     void DescribeTo(::std::ostream* os) const override {
-      *os << "contains " << rhs_.size() 
-          << " values, where each value and its corresponding value in "; 
-      UniversalPrinter<RhsStlContainer>::Print(rhs_, os); 
-      *os << " "; 
-      mono_tuple_matcher_.DescribeTo(os); 
-    } 
+      *os << "contains " << rhs_.size()
+          << " values, where each value and its corresponding value in ";
+      UniversalPrinter<RhsStlContainer>::Print(rhs_, os);
+      *os << " ";
+      mono_tuple_matcher_.DescribeTo(os);
+    }
     void DescribeNegationTo(::std::ostream* os) const override {
-      *os << "doesn't contain exactly " << rhs_.size() 
-          << " values, or contains a value x at some index i" 
-          << " where x and the i-th value of "; 
-      UniversalPrint(rhs_, os); 
-      *os << " "; 
-      mono_tuple_matcher_.DescribeNegationTo(os); 
-    } 
- 
+      *os << "doesn't contain exactly " << rhs_.size()
+          << " values, or contains a value x at some index i"
+          << " where x and the i-th value of ";
+      UniversalPrint(rhs_, os);
+      *os << " ";
+      mono_tuple_matcher_.DescribeNegationTo(os);
+    }
+
     bool MatchAndExplain(LhsContainer lhs,
                          MatchResultListener* listener) const override {
-      LhsStlContainerReference lhs_stl_container = LhsView::ConstReference(lhs); 
-      const size_t actual_size = lhs_stl_container.size(); 
-      if (actual_size != rhs_.size()) { 
-        *listener << "which contains " << actual_size << " values"; 
-        return false; 
-      } 
- 
-      typename LhsStlContainer::const_iterator left = lhs_stl_container.begin(); 
-      typename RhsStlContainer::const_iterator right = rhs_.begin(); 
-      for (size_t i = 0; i != actual_size; ++i, ++left, ++right) { 
-        if (listener->IsInterested()) { 
-          StringMatchResultListener inner_listener; 
+      LhsStlContainerReference lhs_stl_container = LhsView::ConstReference(lhs);
+      const size_t actual_size = lhs_stl_container.size();
+      if (actual_size != rhs_.size()) {
+        *listener << "which contains " << actual_size << " values";
+        return false;
+      }
+
+      typename LhsStlContainer::const_iterator left = lhs_stl_container.begin();
+      typename RhsStlContainer::const_iterator right = rhs_.begin();
+      for (size_t i = 0; i != actual_size; ++i, ++left, ++right) {
+        if (listener->IsInterested()) {
+          StringMatchResultListener inner_listener;
           // Create InnerMatcherArg as a temporarily object to avoid it outlives
           // *left and *right. Dereference or the conversion to `const T&` may
           // return temp objects, e.g for vector<bool>.
-          if (!mono_tuple_matcher_.MatchAndExplain( 
+          if (!mono_tuple_matcher_.MatchAndExplain(
                   InnerMatcherArg(ImplicitCast_<const LhsValue&>(*left),
                                   ImplicitCast_<const RhsValue&>(*right)),
                   &inner_listener)) {
-            *listener << "where the value pair ("; 
-            UniversalPrint(*left, listener->stream()); 
-            *listener << ", "; 
-            UniversalPrint(*right, listener->stream()); 
-            *listener << ") at index #" << i << " don't match"; 
-            PrintIfNotEmpty(inner_listener.str(), listener->stream()); 
-            return false; 
-          } 
-        } else { 
+            *listener << "where the value pair (";
+            UniversalPrint(*left, listener->stream());
+            *listener << ", ";
+            UniversalPrint(*right, listener->stream());
+            *listener << ") at index #" << i << " don't match";
+            PrintIfNotEmpty(inner_listener.str(), listener->stream());
+            return false;
+          }
+        } else {
           if (!mono_tuple_matcher_.Matches(
                   InnerMatcherArg(ImplicitCast_<const LhsValue&>(*left),
                                   ImplicitCast_<const RhsValue&>(*right))))
-            return false; 
-        } 
-      } 
- 
-      return true; 
-    } 
- 
-   private: 
-    const Matcher<InnerMatcherArg> mono_tuple_matcher_; 
-    const RhsStlContainer rhs_; 
-  }; 
- 
- private: 
-  const TupleMatcher tuple_matcher_; 
-  const RhsStlContainer rhs_; 
-}; 
- 
-// Holds the logic common to ContainsMatcherImpl and EachMatcherImpl. 
-template <typename Container> 
-class QuantifierMatcherImpl : public MatcherInterface<Container> { 
- public: 
-  typedef GTEST_REMOVE_REFERENCE_AND_CONST_(Container) RawContainer; 
-  typedef StlContainerView<RawContainer> View; 
-  typedef typename View::type StlContainer; 
-  typedef typename View::const_reference StlContainerReference; 
-  typedef typename StlContainer::value_type Element; 
- 
-  template <typename InnerMatcher> 
-  explicit QuantifierMatcherImpl(InnerMatcher inner_matcher) 
-      : inner_matcher_( 
-           testing::SafeMatcherCast<const Element&>(inner_matcher)) {} 
- 
-  // Checks whether: 
-  // * All elements in the container match, if all_elements_should_match. 
-  // * Any element in the container matches, if !all_elements_should_match. 
-  bool MatchAndExplainImpl(bool all_elements_should_match, 
-                           Container container, 
-                           MatchResultListener* listener) const { 
-    StlContainerReference stl_container = View::ConstReference(container); 
-    size_t i = 0; 
-    for (typename StlContainer::const_iterator it = stl_container.begin(); 
-         it != stl_container.end(); ++it, ++i) { 
-      StringMatchResultListener inner_listener; 
-      const bool matches = inner_matcher_.MatchAndExplain(*it, &inner_listener); 
- 
-      if (matches != all_elements_should_match) { 
-        *listener << "whose element #" << i 
-                  << (matches ? " matches" : " doesn't match"); 
-        PrintIfNotEmpty(inner_listener.str(), listener->stream()); 
-        return !all_elements_should_match; 
-      } 
-    } 
-    return all_elements_should_match; 
-  } 
- 
- protected: 
-  const Matcher<const Element&> inner_matcher_; 
-}; 
- 
-// Implements Contains(element_matcher) for the given argument type Container. 
-// Symmetric to EachMatcherImpl. 
-template <typename Container> 
-class ContainsMatcherImpl : public QuantifierMatcherImpl<Container> { 
- public: 
-  template <typename InnerMatcher> 
-  explicit ContainsMatcherImpl(InnerMatcher inner_matcher) 
-      : QuantifierMatcherImpl<Container>(inner_matcher) {} 
- 
-  // Describes what this matcher does. 
+            return false;
+        }
+      }
+
+      return true;
+    }
+
+   private:
+    const Matcher<InnerMatcherArg> mono_tuple_matcher_;
+    const RhsStlContainer rhs_;
+  };
+
+ private:
+  const TupleMatcher tuple_matcher_;
+  const RhsStlContainer rhs_;
+};
+
+// Holds the logic common to ContainsMatcherImpl and EachMatcherImpl.
+template <typename Container>
+class QuantifierMatcherImpl : public MatcherInterface<Container> {
+ public:
+  typedef GTEST_REMOVE_REFERENCE_AND_CONST_(Container) RawContainer;
+  typedef StlContainerView<RawContainer> View;
+  typedef typename View::type StlContainer;
+  typedef typename View::const_reference StlContainerReference;
+  typedef typename StlContainer::value_type Element;
+
+  template <typename InnerMatcher>
+  explicit QuantifierMatcherImpl(InnerMatcher inner_matcher)
+      : inner_matcher_(
+           testing::SafeMatcherCast<const Element&>(inner_matcher)) {}
+
+  // Checks whether:
+  // * All elements in the container match, if all_elements_should_match.
+  // * Any element in the container matches, if !all_elements_should_match.
+  bool MatchAndExplainImpl(bool all_elements_should_match,
+                           Container container,
+                           MatchResultListener* listener) const {
+    StlContainerReference stl_container = View::ConstReference(container);
+    size_t i = 0;
+    for (typename StlContainer::const_iterator it = stl_container.begin();
+         it != stl_container.end(); ++it, ++i) {
+      StringMatchResultListener inner_listener;
+      const bool matches = inner_matcher_.MatchAndExplain(*it, &inner_listener);
+
+      if (matches != all_elements_should_match) {
+        *listener << "whose element #" << i
+                  << (matches ? " matches" : " doesn't match");
+        PrintIfNotEmpty(inner_listener.str(), listener->stream());
+        return !all_elements_should_match;
+      }
+    }
+    return all_elements_should_match;
+  }
+
+ protected:
+  const Matcher<const Element&> inner_matcher_;
+};
+
+// Implements Contains(element_matcher) for the given argument type Container.
+// Symmetric to EachMatcherImpl.
+template <typename Container>
+class ContainsMatcherImpl : public QuantifierMatcherImpl<Container> {
+ public:
+  template <typename InnerMatcher>
+  explicit ContainsMatcherImpl(InnerMatcher inner_matcher)
+      : QuantifierMatcherImpl<Container>(inner_matcher) {}
+
+  // Describes what this matcher does.
   void DescribeTo(::std::ostream* os) const override {
-    *os << "contains at least one element that "; 
-    this->inner_matcher_.DescribeTo(os); 
-  } 
- 
+    *os << "contains at least one element that ";
+    this->inner_matcher_.DescribeTo(os);
+  }
+
   void DescribeNegationTo(::std::ostream* os) const override {
-    *os << "doesn't contain any element that "; 
-    this->inner_matcher_.DescribeTo(os); 
-  } 
- 
+    *os << "doesn't contain any element that ";
+    this->inner_matcher_.DescribeTo(os);
+  }
+
   bool MatchAndExplain(Container container,
                        MatchResultListener* listener) const override {
-    return this->MatchAndExplainImpl(false, container, listener); 
-  } 
-}; 
- 
-// Implements Each(element_matcher) for the given argument type Container. 
-// Symmetric to ContainsMatcherImpl. 
-template <typename Container> 
-class EachMatcherImpl : public QuantifierMatcherImpl<Container> { 
- public: 
-  template <typename InnerMatcher> 
-  explicit EachMatcherImpl(InnerMatcher inner_matcher) 
-      : QuantifierMatcherImpl<Container>(inner_matcher) {} 
- 
-  // Describes what this matcher does. 
+    return this->MatchAndExplainImpl(false, container, listener);
+  }
+};
+
+// Implements Each(element_matcher) for the given argument type Container.
+// Symmetric to ContainsMatcherImpl.
+template <typename Container>
+class EachMatcherImpl : public QuantifierMatcherImpl<Container> {
+ public:
+  template <typename InnerMatcher>
+  explicit EachMatcherImpl(InnerMatcher inner_matcher)
+      : QuantifierMatcherImpl<Container>(inner_matcher) {}
+
+  // Describes what this matcher does.
   void DescribeTo(::std::ostream* os) const override {
-    *os << "only contains elements that "; 
-    this->inner_matcher_.DescribeTo(os); 
-  } 
- 
+    *os << "only contains elements that ";
+    this->inner_matcher_.DescribeTo(os);
+  }
+
   void DescribeNegationTo(::std::ostream* os) const override {
-    *os << "contains some element that "; 
-    this->inner_matcher_.DescribeNegationTo(os); 
-  } 
- 
+    *os << "contains some element that ";
+    this->inner_matcher_.DescribeNegationTo(os);
+  }
+
   bool MatchAndExplain(Container container,
                        MatchResultListener* listener) const override {
-    return this->MatchAndExplainImpl(true, container, listener); 
-  } 
-}; 
- 
-// Implements polymorphic Contains(element_matcher). 
-template <typename M> 
-class ContainsMatcher { 
- public: 
-  explicit ContainsMatcher(M m) : inner_matcher_(m) {} 
- 
-  template <typename Container> 
-  operator Matcher<Container>() const { 
+    return this->MatchAndExplainImpl(true, container, listener);
+  }
+};
+
+// Implements polymorphic Contains(element_matcher).
+template <typename M>
+class ContainsMatcher {
+ public:
+  explicit ContainsMatcher(M m) : inner_matcher_(m) {}
+
+  template <typename Container>
+  operator Matcher<Container>() const {
     return Matcher<Container>(
         new ContainsMatcherImpl<const Container&>(inner_matcher_));
-  } 
- 
- private: 
-  const M inner_matcher_; 
-}; 
- 
-// Implements polymorphic Each(element_matcher). 
-template <typename M> 
-class EachMatcher { 
- public: 
-  explicit EachMatcher(M m) : inner_matcher_(m) {} 
- 
-  template <typename Container> 
-  operator Matcher<Container>() const { 
+  }
+
+ private:
+  const M inner_matcher_;
+};
+
+// Implements polymorphic Each(element_matcher).
+template <typename M>
+class EachMatcher {
+ public:
+  explicit EachMatcher(M m) : inner_matcher_(m) {}
+
+  template <typename Container>
+  operator Matcher<Container>() const {
     return Matcher<Container>(
         new EachMatcherImpl<const Container&>(inner_matcher_));
-  } 
- 
- private: 
-  const M inner_matcher_; 
-}; 
- 
+  }
+
+ private:
+  const M inner_matcher_;
+};
+
 struct Rank1 {};
 struct Rank0 : Rank1 {};
 
@@ -2765,68 +2765,68 @@ auto Second(T& x, Rank0) -> decltype((x.second)) {  // NOLINT
 }
 }  // namespace pair_getters
 
-// Implements Key(inner_matcher) for the given argument pair type. 
-// Key(inner_matcher) matches an std::pair whose 'first' field matches 
-// inner_matcher.  For example, Contains(Key(Ge(5))) can be used to match an 
-// std::map that contains at least one element whose key is >= 5. 
-template <typename PairType> 
-class KeyMatcherImpl : public MatcherInterface<PairType> { 
- public: 
-  typedef GTEST_REMOVE_REFERENCE_AND_CONST_(PairType) RawPairType; 
-  typedef typename RawPairType::first_type KeyType; 
- 
-  template <typename InnerMatcher> 
-  explicit KeyMatcherImpl(InnerMatcher inner_matcher) 
-      : inner_matcher_( 
-          testing::SafeMatcherCast<const KeyType&>(inner_matcher)) { 
-  } 
- 
+// Implements Key(inner_matcher) for the given argument pair type.
+// Key(inner_matcher) matches an std::pair whose 'first' field matches
+// inner_matcher.  For example, Contains(Key(Ge(5))) can be used to match an
+// std::map that contains at least one element whose key is >= 5.
+template <typename PairType>
+class KeyMatcherImpl : public MatcherInterface<PairType> {
+ public:
+  typedef GTEST_REMOVE_REFERENCE_AND_CONST_(PairType) RawPairType;
+  typedef typename RawPairType::first_type KeyType;
+
+  template <typename InnerMatcher>
+  explicit KeyMatcherImpl(InnerMatcher inner_matcher)
+      : inner_matcher_(
+          testing::SafeMatcherCast<const KeyType&>(inner_matcher)) {
+  }
+
   // Returns true if and only if 'key_value.first' (the key) matches the inner
   // matcher.
   bool MatchAndExplain(PairType key_value,
                        MatchResultListener* listener) const override {
-    StringMatchResultListener inner_listener; 
+    StringMatchResultListener inner_listener;
     const bool match = inner_matcher_.MatchAndExplain(
         pair_getters::First(key_value, Rank0()), &inner_listener);
     const std::string explanation = inner_listener.str();
-    if (explanation != "") { 
-      *listener << "whose first field is a value " << explanation; 
-    } 
-    return match; 
-  } 
- 
-  // Describes what this matcher does. 
+    if (explanation != "") {
+      *listener << "whose first field is a value " << explanation;
+    }
+    return match;
+  }
+
+  // Describes what this matcher does.
   void DescribeTo(::std::ostream* os) const override {
-    *os << "has a key that "; 
-    inner_matcher_.DescribeTo(os); 
-  } 
- 
-  // Describes what the negation of this matcher does. 
+    *os << "has a key that ";
+    inner_matcher_.DescribeTo(os);
+  }
+
+  // Describes what the negation of this matcher does.
   void DescribeNegationTo(::std::ostream* os) const override {
-    *os << "doesn't have a key that "; 
-    inner_matcher_.DescribeTo(os); 
-  } 
- 
- private: 
-  const Matcher<const KeyType&> inner_matcher_; 
-}; 
- 
-// Implements polymorphic Key(matcher_for_key). 
-template <typename M> 
-class KeyMatcher { 
- public: 
-  explicit KeyMatcher(M m) : matcher_for_key_(m) {} 
- 
-  template <typename PairType> 
-  operator Matcher<PairType>() const { 
+    *os << "doesn't have a key that ";
+    inner_matcher_.DescribeTo(os);
+  }
+
+ private:
+  const Matcher<const KeyType&> inner_matcher_;
+};
+
+// Implements polymorphic Key(matcher_for_key).
+template <typename M>
+class KeyMatcher {
+ public:
+  explicit KeyMatcher(M m) : matcher_for_key_(m) {}
+
+  template <typename PairType>
+  operator Matcher<PairType>() const {
     return Matcher<PairType>(
         new KeyMatcherImpl<const PairType&>(matcher_for_key_));
-  } 
- 
- private: 
-  const M matcher_for_key_; 
-}; 
- 
+  }
+
+ private:
+  const M matcher_for_key_;
+};
+
 // Implements polymorphic Address(matcher_for_address).
 template <typename InnerMatcher>
 class AddressMatcher {
@@ -2870,109 +2870,109 @@ class AddressMatcher {
   const InnerMatcher matcher_;
 };
 
-// Implements Pair(first_matcher, second_matcher) for the given argument pair 
-// type with its two matchers. See Pair() function below. 
-template <typename PairType> 
-class PairMatcherImpl : public MatcherInterface<PairType> { 
- public: 
-  typedef GTEST_REMOVE_REFERENCE_AND_CONST_(PairType) RawPairType; 
-  typedef typename RawPairType::first_type FirstType; 
-  typedef typename RawPairType::second_type SecondType; 
- 
-  template <typename FirstMatcher, typename SecondMatcher> 
-  PairMatcherImpl(FirstMatcher first_matcher, SecondMatcher second_matcher) 
-      : first_matcher_( 
-            testing::SafeMatcherCast<const FirstType&>(first_matcher)), 
-        second_matcher_( 
-            testing::SafeMatcherCast<const SecondType&>(second_matcher)) { 
-  } 
- 
-  // Describes what this matcher does. 
+// Implements Pair(first_matcher, second_matcher) for the given argument pair
+// type with its two matchers. See Pair() function below.
+template <typename PairType>
+class PairMatcherImpl : public MatcherInterface<PairType> {
+ public:
+  typedef GTEST_REMOVE_REFERENCE_AND_CONST_(PairType) RawPairType;
+  typedef typename RawPairType::first_type FirstType;
+  typedef typename RawPairType::second_type SecondType;
+
+  template <typename FirstMatcher, typename SecondMatcher>
+  PairMatcherImpl(FirstMatcher first_matcher, SecondMatcher second_matcher)
+      : first_matcher_(
+            testing::SafeMatcherCast<const FirstType&>(first_matcher)),
+        second_matcher_(
+            testing::SafeMatcherCast<const SecondType&>(second_matcher)) {
+  }
+
+  // Describes what this matcher does.
   void DescribeTo(::std::ostream* os) const override {
-    *os << "has a first field that "; 
-    first_matcher_.DescribeTo(os); 
-    *os << ", and has a second field that "; 
-    second_matcher_.DescribeTo(os); 
-  } 
- 
-  // Describes what the negation of this matcher does. 
+    *os << "has a first field that ";
+    first_matcher_.DescribeTo(os);
+    *os << ", and has a second field that ";
+    second_matcher_.DescribeTo(os);
+  }
+
+  // Describes what the negation of this matcher does.
   void DescribeNegationTo(::std::ostream* os) const override {
-    *os << "has a first field that "; 
-    first_matcher_.DescribeNegationTo(os); 
-    *os << ", or has a second field that "; 
-    second_matcher_.DescribeNegationTo(os); 
-  } 
- 
+    *os << "has a first field that ";
+    first_matcher_.DescribeNegationTo(os);
+    *os << ", or has a second field that ";
+    second_matcher_.DescribeNegationTo(os);
+  }
+
   // Returns true if and only if 'a_pair.first' matches first_matcher and
   // 'a_pair.second' matches second_matcher.
   bool MatchAndExplain(PairType a_pair,
                        MatchResultListener* listener) const override {
-    if (!listener->IsInterested()) { 
-      // If the listener is not interested, we don't need to construct the 
-      // explanation. 
+    if (!listener->IsInterested()) {
+      // If the listener is not interested, we don't need to construct the
+      // explanation.
       return first_matcher_.Matches(pair_getters::First(a_pair, Rank0())) &&
              second_matcher_.Matches(pair_getters::Second(a_pair, Rank0()));
-    } 
-    StringMatchResultListener first_inner_listener; 
+    }
+    StringMatchResultListener first_inner_listener;
     if (!first_matcher_.MatchAndExplain(pair_getters::First(a_pair, Rank0()),
-                                        &first_inner_listener)) { 
-      *listener << "whose first field does not match"; 
-      PrintIfNotEmpty(first_inner_listener.str(), listener->stream()); 
-      return false; 
-    } 
-    StringMatchResultListener second_inner_listener; 
+                                        &first_inner_listener)) {
+      *listener << "whose first field does not match";
+      PrintIfNotEmpty(first_inner_listener.str(), listener->stream());
+      return false;
+    }
+    StringMatchResultListener second_inner_listener;
     if (!second_matcher_.MatchAndExplain(pair_getters::Second(a_pair, Rank0()),
-                                         &second_inner_listener)) { 
-      *listener << "whose second field does not match"; 
-      PrintIfNotEmpty(second_inner_listener.str(), listener->stream()); 
-      return false; 
-    } 
-    ExplainSuccess(first_inner_listener.str(), second_inner_listener.str(), 
-                   listener); 
-    return true; 
-  } 
- 
- private: 
+                                         &second_inner_listener)) {
+      *listener << "whose second field does not match";
+      PrintIfNotEmpty(second_inner_listener.str(), listener->stream());
+      return false;
+    }
+    ExplainSuccess(first_inner_listener.str(), second_inner_listener.str(),
+                   listener);
+    return true;
+  }
+
+ private:
   void ExplainSuccess(const std::string& first_explanation,
                       const std::string& second_explanation,
-                      MatchResultListener* listener) const { 
-    *listener << "whose both fields match"; 
-    if (first_explanation != "") { 
-      *listener << ", where the first field is a value " << first_explanation; 
-    } 
-    if (second_explanation != "") { 
-      *listener << ", "; 
-      if (first_explanation != "") { 
-        *listener << "and "; 
-      } else { 
-        *listener << "where "; 
-      } 
-      *listener << "the second field is a value " << second_explanation; 
-    } 
-  } 
- 
-  const Matcher<const FirstType&> first_matcher_; 
-  const Matcher<const SecondType&> second_matcher_; 
-}; 
- 
-// Implements polymorphic Pair(first_matcher, second_matcher). 
-template <typename FirstMatcher, typename SecondMatcher> 
-class PairMatcher { 
- public: 
-  PairMatcher(FirstMatcher first_matcher, SecondMatcher second_matcher) 
-      : first_matcher_(first_matcher), second_matcher_(second_matcher) {} 
- 
-  template <typename PairType> 
-  operator Matcher<PairType> () const { 
+                      MatchResultListener* listener) const {
+    *listener << "whose both fields match";
+    if (first_explanation != "") {
+      *listener << ", where the first field is a value " << first_explanation;
+    }
+    if (second_explanation != "") {
+      *listener << ", ";
+      if (first_explanation != "") {
+        *listener << "and ";
+      } else {
+        *listener << "where ";
+      }
+      *listener << "the second field is a value " << second_explanation;
+    }
+  }
+
+  const Matcher<const FirstType&> first_matcher_;
+  const Matcher<const SecondType&> second_matcher_;
+};
+
+// Implements polymorphic Pair(first_matcher, second_matcher).
+template <typename FirstMatcher, typename SecondMatcher>
+class PairMatcher {
+ public:
+  PairMatcher(FirstMatcher first_matcher, SecondMatcher second_matcher)
+      : first_matcher_(first_matcher), second_matcher_(second_matcher) {}
+
+  template <typename PairType>
+  operator Matcher<PairType> () const {
     return Matcher<PairType>(
         new PairMatcherImpl<const PairType&>(first_matcher_, second_matcher_));
-  } 
- 
- private: 
-  const FirstMatcher first_matcher_; 
-  const SecondMatcher second_matcher_; 
-}; 
- 
+  }
+
+ private:
+  const FirstMatcher first_matcher_;
+  const SecondMatcher second_matcher_;
+};
+
 template <typename T, size_t... I>
 auto UnpackStructImpl(const T& t, IndexSequence<I...>, int)
     -> decltype(std::tie(get<I>(t)...)) {
@@ -3170,203 +3170,203 @@ class FieldsAreMatcher {
   std::tuple<Inner...> matchers_;
 };
 
-// Implements ElementsAre() and ElementsAreArray(). 
-template <typename Container> 
-class ElementsAreMatcherImpl : public MatcherInterface<Container> { 
- public: 
-  typedef GTEST_REMOVE_REFERENCE_AND_CONST_(Container) RawContainer; 
-  typedef internal::StlContainerView<RawContainer> View; 
-  typedef typename View::type StlContainer; 
-  typedef typename View::const_reference StlContainerReference; 
-  typedef typename StlContainer::value_type Element; 
- 
-  // Constructs the matcher from a sequence of element values or 
-  // element matchers. 
-  template <typename InputIter> 
-  ElementsAreMatcherImpl(InputIter first, InputIter last) { 
-    while (first != last) { 
-      matchers_.push_back(MatcherCast<const Element&>(*first++)); 
-    } 
-  } 
- 
-  // Describes what this matcher does. 
+// Implements ElementsAre() and ElementsAreArray().
+template <typename Container>
+class ElementsAreMatcherImpl : public MatcherInterface<Container> {
+ public:
+  typedef GTEST_REMOVE_REFERENCE_AND_CONST_(Container) RawContainer;
+  typedef internal::StlContainerView<RawContainer> View;
+  typedef typename View::type StlContainer;
+  typedef typename View::const_reference StlContainerReference;
+  typedef typename StlContainer::value_type Element;
+
+  // Constructs the matcher from a sequence of element values or
+  // element matchers.
+  template <typename InputIter>
+  ElementsAreMatcherImpl(InputIter first, InputIter last) {
+    while (first != last) {
+      matchers_.push_back(MatcherCast<const Element&>(*first++));
+    }
+  }
+
+  // Describes what this matcher does.
   void DescribeTo(::std::ostream* os) const override {
-    if (count() == 0) { 
-      *os << "is empty"; 
-    } else if (count() == 1) { 
-      *os << "has 1 element that "; 
-      matchers_[0].DescribeTo(os); 
-    } else { 
-      *os << "has " << Elements(count()) << " where\n"; 
-      for (size_t i = 0; i != count(); ++i) { 
-        *os << "element #" << i << " "; 
-        matchers_[i].DescribeTo(os); 
-        if (i + 1 < count()) { 
-          *os << ",\n"; 
-        } 
-      } 
-    } 
-  } 
- 
-  // Describes what the negation of this matcher does. 
+    if (count() == 0) {
+      *os << "is empty";
+    } else if (count() == 1) {
+      *os << "has 1 element that ";
+      matchers_[0].DescribeTo(os);
+    } else {
+      *os << "has " << Elements(count()) << " where\n";
+      for (size_t i = 0; i != count(); ++i) {
+        *os << "element #" << i << " ";
+        matchers_[i].DescribeTo(os);
+        if (i + 1 < count()) {
+          *os << ",\n";
+        }
+      }
+    }
+  }
+
+  // Describes what the negation of this matcher does.
   void DescribeNegationTo(::std::ostream* os) const override {
-    if (count() == 0) { 
-      *os << "isn't empty"; 
-      return; 
-    } 
- 
-    *os << "doesn't have " << Elements(count()) << ", or\n"; 
-    for (size_t i = 0; i != count(); ++i) { 
-      *os << "element #" << i << " "; 
-      matchers_[i].DescribeNegationTo(os); 
-      if (i + 1 < count()) { 
-        *os << ", or\n"; 
-      } 
-    } 
-  } 
- 
+    if (count() == 0) {
+      *os << "isn't empty";
+      return;
+    }
+
+    *os << "doesn't have " << Elements(count()) << ", or\n";
+    for (size_t i = 0; i != count(); ++i) {
+      *os << "element #" << i << " ";
+      matchers_[i].DescribeNegationTo(os);
+      if (i + 1 < count()) {
+        *os << ", or\n";
+      }
+    }
+  }
+
   bool MatchAndExplain(Container container,
                        MatchResultListener* listener) const override {
-    // To work with stream-like "containers", we must only walk 
-    // through the elements in one pass. 
- 
-    const bool listener_interested = listener->IsInterested(); 
- 
-    // explanations[i] is the explanation of the element at index i. 
+    // To work with stream-like "containers", we must only walk
+    // through the elements in one pass.
+
+    const bool listener_interested = listener->IsInterested();
+
+    // explanations[i] is the explanation of the element at index i.
     ::std::vector<std::string> explanations(count());
-    StlContainerReference stl_container = View::ConstReference(container); 
-    typename StlContainer::const_iterator it = stl_container.begin(); 
-    size_t exam_pos = 0; 
-    bool mismatch_found = false;  // Have we found a mismatched element yet? 
- 
-    // Go through the elements and matchers in pairs, until we reach 
-    // the end of either the elements or the matchers, or until we find a 
-    // mismatch. 
-    for (; it != stl_container.end() && exam_pos != count(); ++it, ++exam_pos) { 
-      bool match;  // Does the current element match the current matcher? 
-      if (listener_interested) { 
-        StringMatchResultListener s; 
-        match = matchers_[exam_pos].MatchAndExplain(*it, &s); 
-        explanations[exam_pos] = s.str(); 
-      } else { 
-        match = matchers_[exam_pos].Matches(*it); 
-      } 
- 
-      if (!match) { 
-        mismatch_found = true; 
-        break; 
-      } 
-    } 
-    // If mismatch_found is true, 'exam_pos' is the index of the mismatch. 
- 
-    // Find how many elements the actual container has.  We avoid 
-    // calling size() s.t. this code works for stream-like "containers" 
-    // that don't define size(). 
-    size_t actual_count = exam_pos; 
-    for (; it != stl_container.end(); ++it) { 
-      ++actual_count; 
-    } 
- 
-    if (actual_count != count()) { 
-      // The element count doesn't match.  If the container is empty, 
-      // there's no need to explain anything as Google Mock already 
-      // prints the empty container.  Otherwise we just need to show 
-      // how many elements there actually are. 
-      if (listener_interested && (actual_count != 0)) { 
-        *listener << "which has " << Elements(actual_count); 
-      } 
-      return false; 
-    } 
- 
-    if (mismatch_found) { 
-      // The element count matches, but the exam_pos-th element doesn't match. 
-      if (listener_interested) { 
-        *listener << "whose element #" << exam_pos << " doesn't match"; 
-        PrintIfNotEmpty(explanations[exam_pos], listener->stream()); 
-      } 
-      return false; 
-    } 
- 
-    // Every element matches its expectation.  We need to explain why 
-    // (the obvious ones can be skipped). 
-    if (listener_interested) { 
-      bool reason_printed = false; 
-      for (size_t i = 0; i != count(); ++i) { 
+    StlContainerReference stl_container = View::ConstReference(container);
+    typename StlContainer::const_iterator it = stl_container.begin();
+    size_t exam_pos = 0;
+    bool mismatch_found = false;  // Have we found a mismatched element yet?
+
+    // Go through the elements and matchers in pairs, until we reach
+    // the end of either the elements or the matchers, or until we find a
+    // mismatch.
+    for (; it != stl_container.end() && exam_pos != count(); ++it, ++exam_pos) {
+      bool match;  // Does the current element match the current matcher?
+      if (listener_interested) {
+        StringMatchResultListener s;
+        match = matchers_[exam_pos].MatchAndExplain(*it, &s);
+        explanations[exam_pos] = s.str();
+      } else {
+        match = matchers_[exam_pos].Matches(*it);
+      }
+
+      if (!match) {
+        mismatch_found = true;
+        break;
+      }
+    }
+    // If mismatch_found is true, 'exam_pos' is the index of the mismatch.
+
+    // Find how many elements the actual container has.  We avoid
+    // calling size() s.t. this code works for stream-like "containers"
+    // that don't define size().
+    size_t actual_count = exam_pos;
+    for (; it != stl_container.end(); ++it) {
+      ++actual_count;
+    }
+
+    if (actual_count != count()) {
+      // The element count doesn't match.  If the container is empty,
+      // there's no need to explain anything as Google Mock already
+      // prints the empty container.  Otherwise we just need to show
+      // how many elements there actually are.
+      if (listener_interested && (actual_count != 0)) {
+        *listener << "which has " << Elements(actual_count);
+      }
+      return false;
+    }
+
+    if (mismatch_found) {
+      // The element count matches, but the exam_pos-th element doesn't match.
+      if (listener_interested) {
+        *listener << "whose element #" << exam_pos << " doesn't match";
+        PrintIfNotEmpty(explanations[exam_pos], listener->stream());
+      }
+      return false;
+    }
+
+    // Every element matches its expectation.  We need to explain why
+    // (the obvious ones can be skipped).
+    if (listener_interested) {
+      bool reason_printed = false;
+      for (size_t i = 0; i != count(); ++i) {
         const std::string& s = explanations[i];
-        if (!s.empty()) { 
-          if (reason_printed) { 
-            *listener << ",\nand "; 
-          } 
-          *listener << "whose element #" << i << " matches, " << s; 
-          reason_printed = true; 
-        } 
-      } 
-    } 
-    return true; 
-  } 
- 
- private: 
-  static Message Elements(size_t count) { 
-    return Message() << count << (count == 1 ? " element" : " elements"); 
-  } 
- 
-  size_t count() const { return matchers_.size(); } 
- 
-  ::std::vector<Matcher<const Element&> > matchers_; 
-}; 
- 
-// Connectivity matrix of (elements X matchers), in element-major order. 
-// Initially, there are no edges. 
-// Use NextGraph() to iterate over all possible edge configurations. 
-// Use Randomize() to generate a random edge configuration. 
-class GTEST_API_ MatchMatrix { 
- public: 
-  MatchMatrix(size_t num_elements, size_t num_matchers) 
-      : num_elements_(num_elements), 
-        num_matchers_(num_matchers), 
-        matched_(num_elements_* num_matchers_, 0) { 
-  } 
- 
-  size_t LhsSize() const { return num_elements_; } 
-  size_t RhsSize() const { return num_matchers_; } 
-  bool HasEdge(size_t ilhs, size_t irhs) const { 
-    return matched_[SpaceIndex(ilhs, irhs)] == 1; 
-  } 
-  void SetEdge(size_t ilhs, size_t irhs, bool b) { 
-    matched_[SpaceIndex(ilhs, irhs)] = b ? 1 : 0; 
-  } 
- 
-  // Treating the connectivity matrix as a (LhsSize()*RhsSize())-bit number, 
-  // adds 1 to that number; returns false if incrementing the graph left it 
-  // empty. 
-  bool NextGraph(); 
- 
-  void Randomize(); 
- 
+        if (!s.empty()) {
+          if (reason_printed) {
+            *listener << ",\nand ";
+          }
+          *listener << "whose element #" << i << " matches, " << s;
+          reason_printed = true;
+        }
+      }
+    }
+    return true;
+  }
+
+ private:
+  static Message Elements(size_t count) {
+    return Message() << count << (count == 1 ? " element" : " elements");
+  }
+
+  size_t count() const { return matchers_.size(); }
+
+  ::std::vector<Matcher<const Element&> > matchers_;
+};
+
+// Connectivity matrix of (elements X matchers), in element-major order.
+// Initially, there are no edges.
+// Use NextGraph() to iterate over all possible edge configurations.
+// Use Randomize() to generate a random edge configuration.
+class GTEST_API_ MatchMatrix {
+ public:
+  MatchMatrix(size_t num_elements, size_t num_matchers)
+      : num_elements_(num_elements),
+        num_matchers_(num_matchers),
+        matched_(num_elements_* num_matchers_, 0) {
+  }
+
+  size_t LhsSize() const { return num_elements_; }
+  size_t RhsSize() const { return num_matchers_; }
+  bool HasEdge(size_t ilhs, size_t irhs) const {
+    return matched_[SpaceIndex(ilhs, irhs)] == 1;
+  }
+  void SetEdge(size_t ilhs, size_t irhs, bool b) {
+    matched_[SpaceIndex(ilhs, irhs)] = b ? 1 : 0;
+  }
+
+  // Treating the connectivity matrix as a (LhsSize()*RhsSize())-bit number,
+  // adds 1 to that number; returns false if incrementing the graph left it
+  // empty.
+  bool NextGraph();
+
+  void Randomize();
+
   std::string DebugString() const;
- 
- private: 
-  size_t SpaceIndex(size_t ilhs, size_t irhs) const { 
-    return ilhs * num_matchers_ + irhs; 
-  } 
- 
-  size_t num_elements_; 
-  size_t num_matchers_; 
- 
-  // Each element is a char interpreted as bool. They are stored as a 
-  // flattened array in lhs-major order, use 'SpaceIndex()' to translate 
-  // a (ilhs, irhs) matrix coordinate into an offset. 
-  ::std::vector<char> matched_; 
-}; 
- 
-typedef ::std::pair<size_t, size_t> ElementMatcherPair; 
-typedef ::std::vector<ElementMatcherPair> ElementMatcherPairs; 
- 
-// Returns a maximum bipartite matching for the specified graph 'g'. 
-// The matching is represented as a vector of {element, matcher} pairs. 
-GTEST_API_ ElementMatcherPairs 
-FindMaxBipartiteMatching(const MatchMatrix& g); 
- 
+
+ private:
+  size_t SpaceIndex(size_t ilhs, size_t irhs) const {
+    return ilhs * num_matchers_ + irhs;
+  }
+
+  size_t num_elements_;
+  size_t num_matchers_;
+
+  // Each element is a char interpreted as bool. They are stored as a
+  // flattened array in lhs-major order, use 'SpaceIndex()' to translate
+  // a (ilhs, irhs) matrix coordinate into an offset.
+  ::std::vector<char> matched_;
+};
+
+typedef ::std::pair<size_t, size_t> ElementMatcherPair;
+typedef ::std::vector<ElementMatcherPair> ElementMatcherPairs;
+
+// Returns a maximum bipartite matching for the specified graph 'g'.
+// The matching is represented as a vector of {element, matcher} pairs.
+GTEST_API_ ElementMatcherPairs
+FindMaxBipartiteMatching(const MatchMatrix& g);
+
 struct UnorderedMatcherRequire {
   enum Flags {
     Superset = 1 << 0,
@@ -3374,96 +3374,96 @@ struct UnorderedMatcherRequire {
     ExactMatch = Superset | Subset,
   };
 };
- 
-// Untyped base class for implementing UnorderedElementsAre.  By 
-// putting logic that's not specific to the element type here, we 
-// reduce binary bloat and increase compilation speed. 
-class GTEST_API_ UnorderedElementsAreMatcherImplBase { 
- protected: 
+
+// Untyped base class for implementing UnorderedElementsAre.  By
+// putting logic that's not specific to the element type here, we
+// reduce binary bloat and increase compilation speed.
+class GTEST_API_ UnorderedElementsAreMatcherImplBase {
+ protected:
   explicit UnorderedElementsAreMatcherImplBase(
       UnorderedMatcherRequire::Flags matcher_flags)
       : match_flags_(matcher_flags) {}
 
-  // A vector of matcher describers, one for each element matcher. 
-  // Does not own the describers (and thus can be used only when the 
-  // element matchers are alive). 
-  typedef ::std::vector<const MatcherDescriberInterface*> MatcherDescriberVec; 
- 
-  // Describes this UnorderedElementsAre matcher. 
-  void DescribeToImpl(::std::ostream* os) const; 
- 
-  // Describes the negation of this UnorderedElementsAre matcher. 
-  void DescribeNegationToImpl(::std::ostream* os) const; 
- 
+  // A vector of matcher describers, one for each element matcher.
+  // Does not own the describers (and thus can be used only when the
+  // element matchers are alive).
+  typedef ::std::vector<const MatcherDescriberInterface*> MatcherDescriberVec;
+
+  // Describes this UnorderedElementsAre matcher.
+  void DescribeToImpl(::std::ostream* os) const;
+
+  // Describes the negation of this UnorderedElementsAre matcher.
+  void DescribeNegationToImpl(::std::ostream* os) const;
+
   bool VerifyMatchMatrix(const ::std::vector<std::string>& element_printouts,
                          const MatchMatrix& matrix,
                          MatchResultListener* listener) const;
- 
+
   bool FindPairing(const MatchMatrix& matrix,
                    MatchResultListener* listener) const;
 
-  MatcherDescriberVec& matcher_describers() { 
-    return matcher_describers_; 
-  } 
- 
-  static Message Elements(size_t n) { 
-    return Message() << n << " element" << (n == 1 ? "" : "s"); 
-  } 
- 
+  MatcherDescriberVec& matcher_describers() {
+    return matcher_describers_;
+  }
+
+  static Message Elements(size_t n) {
+    return Message() << n << " element" << (n == 1 ? "" : "s");
+  }
+
   UnorderedMatcherRequire::Flags match_flags() const { return match_flags_; }
 
- private: 
+ private:
   UnorderedMatcherRequire::Flags match_flags_;
-  MatcherDescriberVec matcher_describers_; 
-}; 
- 
+  MatcherDescriberVec matcher_describers_;
+};
+
 // Implements UnorderedElementsAre, UnorderedElementsAreArray, IsSubsetOf, and
 // IsSupersetOf.
-template <typename Container> 
-class UnorderedElementsAreMatcherImpl 
-    : public MatcherInterface<Container>, 
-      public UnorderedElementsAreMatcherImplBase { 
- public: 
-  typedef GTEST_REMOVE_REFERENCE_AND_CONST_(Container) RawContainer; 
-  typedef internal::StlContainerView<RawContainer> View; 
-  typedef typename View::type StlContainer; 
-  typedef typename View::const_reference StlContainerReference; 
-  typedef typename StlContainer::const_iterator StlContainerConstIterator; 
-  typedef typename StlContainer::value_type Element; 
- 
-  template <typename InputIter> 
+template <typename Container>
+class UnorderedElementsAreMatcherImpl
+    : public MatcherInterface<Container>,
+      public UnorderedElementsAreMatcherImplBase {
+ public:
+  typedef GTEST_REMOVE_REFERENCE_AND_CONST_(Container) RawContainer;
+  typedef internal::StlContainerView<RawContainer> View;
+  typedef typename View::type StlContainer;
+  typedef typename View::const_reference StlContainerReference;
+  typedef typename StlContainer::const_iterator StlContainerConstIterator;
+  typedef typename StlContainer::value_type Element;
+
+  template <typename InputIter>
   UnorderedElementsAreMatcherImpl(UnorderedMatcherRequire::Flags matcher_flags,
                                   InputIter first, InputIter last)
       : UnorderedElementsAreMatcherImplBase(matcher_flags) {
-    for (; first != last; ++first) { 
-      matchers_.push_back(MatcherCast<const Element&>(*first)); 
-    } 
+    for (; first != last; ++first) {
+      matchers_.push_back(MatcherCast<const Element&>(*first));
+    }
     for (const auto& m : matchers_) {
       matcher_describers().push_back(m.GetDescriber());
     }
-  } 
- 
-  // Describes what this matcher does. 
+  }
+
+  // Describes what this matcher does.
   void DescribeTo(::std::ostream* os) const override {
-    return UnorderedElementsAreMatcherImplBase::DescribeToImpl(os); 
-  } 
- 
-  // Describes what the negation of this matcher does. 
+    return UnorderedElementsAreMatcherImplBase::DescribeToImpl(os);
+  }
+
+  // Describes what the negation of this matcher does.
   void DescribeNegationTo(::std::ostream* os) const override {
-    return UnorderedElementsAreMatcherImplBase::DescribeNegationToImpl(os); 
-  } 
- 
+    return UnorderedElementsAreMatcherImplBase::DescribeNegationToImpl(os);
+  }
+
   bool MatchAndExplain(Container container,
                        MatchResultListener* listener) const override {
-    StlContainerReference stl_container = View::ConstReference(container); 
+    StlContainerReference stl_container = View::ConstReference(container);
     ::std::vector<std::string> element_printouts;
     MatchMatrix matrix =
         AnalyzeElements(stl_container.begin(), stl_container.end(),
                         &element_printouts, listener);
- 
+
     if (matrix.LhsSize() == 0 && matrix.RhsSize() == 0) {
-      return true; 
-    } 
+      return true;
+    }
 
     if (match_flags() == UnorderedMatcherRequire::ExactMatch) {
       if (matrix.LhsSize() != matrix.RhsSize()) {
@@ -3475,237 +3475,237 @@ class UnorderedElementsAreMatcherImpl
           *listener << "which has " << Elements(matrix.LhsSize());
         }
         return false;
-      } 
-    } 
- 
+      }
+    }
+
     return VerifyMatchMatrix(element_printouts, matrix, listener) &&
-           FindPairing(matrix, listener); 
-  } 
- 
- private: 
-  template <typename ElementIter> 
-  MatchMatrix AnalyzeElements(ElementIter elem_first, ElementIter elem_last, 
+           FindPairing(matrix, listener);
+  }
+
+ private:
+  template <typename ElementIter>
+  MatchMatrix AnalyzeElements(ElementIter elem_first, ElementIter elem_last,
                               ::std::vector<std::string>* element_printouts,
-                              MatchResultListener* listener) const { 
-    element_printouts->clear(); 
-    ::std::vector<char> did_match; 
-    size_t num_elements = 0; 
+                              MatchResultListener* listener) const {
+    element_printouts->clear();
+    ::std::vector<char> did_match;
+    size_t num_elements = 0;
     DummyMatchResultListener dummy;
-    for (; elem_first != elem_last; ++num_elements, ++elem_first) { 
-      if (listener->IsInterested()) { 
-        element_printouts->push_back(PrintToString(*elem_first)); 
-      } 
-      for (size_t irhs = 0; irhs != matchers_.size(); ++irhs) { 
+    for (; elem_first != elem_last; ++num_elements, ++elem_first) {
+      if (listener->IsInterested()) {
+        element_printouts->push_back(PrintToString(*elem_first));
+      }
+      for (size_t irhs = 0; irhs != matchers_.size(); ++irhs) {
         did_match.push_back(
             matchers_[irhs].MatchAndExplain(*elem_first, &dummy));
-      } 
-    } 
- 
-    MatchMatrix matrix(num_elements, matchers_.size()); 
-    ::std::vector<char>::const_iterator did_match_iter = did_match.begin(); 
-    for (size_t ilhs = 0; ilhs != num_elements; ++ilhs) { 
-      for (size_t irhs = 0; irhs != matchers_.size(); ++irhs) { 
-        matrix.SetEdge(ilhs, irhs, *did_match_iter++ != 0); 
-      } 
-    } 
-    return matrix; 
-  } 
- 
+      }
+    }
+
+    MatchMatrix matrix(num_elements, matchers_.size());
+    ::std::vector<char>::const_iterator did_match_iter = did_match.begin();
+    for (size_t ilhs = 0; ilhs != num_elements; ++ilhs) {
+      for (size_t irhs = 0; irhs != matchers_.size(); ++irhs) {
+        matrix.SetEdge(ilhs, irhs, *did_match_iter++ != 0);
+      }
+    }
+    return matrix;
+  }
+
   ::std::vector<Matcher<const Element&> > matchers_;
-}; 
- 
-// Functor for use in TransformTuple. 
-// Performs MatcherCast<Target> on an input argument of any type. 
-template <typename Target> 
-struct CastAndAppendTransform { 
-  template <typename Arg> 
-  Matcher<Target> operator()(const Arg& a) const { 
-    return MatcherCast<Target>(a); 
-  } 
-}; 
- 
-// Implements UnorderedElementsAre. 
-template <typename MatcherTuple> 
-class UnorderedElementsAreMatcher { 
- public: 
-  explicit UnorderedElementsAreMatcher(const MatcherTuple& args) 
-      : matchers_(args) {} 
- 
-  template <typename Container> 
-  operator Matcher<Container>() const { 
-    typedef GTEST_REMOVE_REFERENCE_AND_CONST_(Container) RawContainer; 
-    typedef typename internal::StlContainerView<RawContainer>::type View; 
-    typedef typename View::value_type Element; 
-    typedef ::std::vector<Matcher<const Element&> > MatcherVec; 
-    MatcherVec matchers; 
+};
+
+// Functor for use in TransformTuple.
+// Performs MatcherCast<Target> on an input argument of any type.
+template <typename Target>
+struct CastAndAppendTransform {
+  template <typename Arg>
+  Matcher<Target> operator()(const Arg& a) const {
+    return MatcherCast<Target>(a);
+  }
+};
+
+// Implements UnorderedElementsAre.
+template <typename MatcherTuple>
+class UnorderedElementsAreMatcher {
+ public:
+  explicit UnorderedElementsAreMatcher(const MatcherTuple& args)
+      : matchers_(args) {}
+
+  template <typename Container>
+  operator Matcher<Container>() const {
+    typedef GTEST_REMOVE_REFERENCE_AND_CONST_(Container) RawContainer;
+    typedef typename internal::StlContainerView<RawContainer>::type View;
+    typedef typename View::value_type Element;
+    typedef ::std::vector<Matcher<const Element&> > MatcherVec;
+    MatcherVec matchers;
     matchers.reserve(::std::tuple_size<MatcherTuple>::value);
-    TransformTupleValues(CastAndAppendTransform<const Element&>(), matchers_, 
-                         ::std::back_inserter(matchers)); 
+    TransformTupleValues(CastAndAppendTransform<const Element&>(), matchers_,
+                         ::std::back_inserter(matchers));
     return Matcher<Container>(
         new UnorderedElementsAreMatcherImpl<const Container&>(
             UnorderedMatcherRequire::ExactMatch, matchers.begin(),
             matchers.end()));
-  } 
- 
- private: 
-  const MatcherTuple matchers_; 
-}; 
- 
-// Implements ElementsAre. 
-template <typename MatcherTuple> 
-class ElementsAreMatcher { 
- public: 
-  explicit ElementsAreMatcher(const MatcherTuple& args) : matchers_(args) {} 
- 
-  template <typename Container> 
-  operator Matcher<Container>() const { 
+  }
+
+ private:
+  const MatcherTuple matchers_;
+};
+
+// Implements ElementsAre.
+template <typename MatcherTuple>
+class ElementsAreMatcher {
+ public:
+  explicit ElementsAreMatcher(const MatcherTuple& args) : matchers_(args) {}
+
+  template <typename Container>
+  operator Matcher<Container>() const {
     GTEST_COMPILE_ASSERT_(
         !IsHashTable<GTEST_REMOVE_REFERENCE_AND_CONST_(Container)>::value ||
             ::std::tuple_size<MatcherTuple>::value < 2,
         use_UnorderedElementsAre_with_hash_tables);
 
-    typedef GTEST_REMOVE_REFERENCE_AND_CONST_(Container) RawContainer; 
-    typedef typename internal::StlContainerView<RawContainer>::type View; 
-    typedef typename View::value_type Element; 
-    typedef ::std::vector<Matcher<const Element&> > MatcherVec; 
-    MatcherVec matchers; 
+    typedef GTEST_REMOVE_REFERENCE_AND_CONST_(Container) RawContainer;
+    typedef typename internal::StlContainerView<RawContainer>::type View;
+    typedef typename View::value_type Element;
+    typedef ::std::vector<Matcher<const Element&> > MatcherVec;
+    MatcherVec matchers;
     matchers.reserve(::std::tuple_size<MatcherTuple>::value);
-    TransformTupleValues(CastAndAppendTransform<const Element&>(), matchers_, 
-                         ::std::back_inserter(matchers)); 
+    TransformTupleValues(CastAndAppendTransform<const Element&>(), matchers_,
+                         ::std::back_inserter(matchers));
     return Matcher<Container>(new ElementsAreMatcherImpl<const Container&>(
         matchers.begin(), matchers.end()));
-  } 
- 
- private: 
-  const MatcherTuple matchers_; 
-}; 
- 
+  }
+
+ private:
+  const MatcherTuple matchers_;
+};
+
 // Implements UnorderedElementsAreArray(), IsSubsetOf(), and IsSupersetOf().
-template <typename T> 
-class UnorderedElementsAreArrayMatcher { 
- public: 
-  template <typename Iter> 
+template <typename T>
+class UnorderedElementsAreArrayMatcher {
+ public:
+  template <typename Iter>
   UnorderedElementsAreArrayMatcher(UnorderedMatcherRequire::Flags match_flags,
                                    Iter first, Iter last)
       : match_flags_(match_flags), matchers_(first, last) {}
- 
-  template <typename Container> 
-  operator Matcher<Container>() const { 
+
+  template <typename Container>
+  operator Matcher<Container>() const {
     return Matcher<Container>(
         new UnorderedElementsAreMatcherImpl<const Container&>(
             match_flags_, matchers_.begin(), matchers_.end()));
-  } 
- 
- private: 
+  }
+
+ private:
   UnorderedMatcherRequire::Flags match_flags_;
-  ::std::vector<T> matchers_; 
-}; 
- 
-// Implements ElementsAreArray(). 
-template <typename T> 
-class ElementsAreArrayMatcher { 
- public: 
-  template <typename Iter> 
-  ElementsAreArrayMatcher(Iter first, Iter last) : matchers_(first, last) {} 
- 
-  template <typename Container> 
-  operator Matcher<Container>() const { 
+  ::std::vector<T> matchers_;
+};
+
+// Implements ElementsAreArray().
+template <typename T>
+class ElementsAreArrayMatcher {
+ public:
+  template <typename Iter>
+  ElementsAreArrayMatcher(Iter first, Iter last) : matchers_(first, last) {}
+
+  template <typename Container>
+  operator Matcher<Container>() const {
     GTEST_COMPILE_ASSERT_(
         !IsHashTable<GTEST_REMOVE_REFERENCE_AND_CONST_(Container)>::value,
         use_UnorderedElementsAreArray_with_hash_tables);
 
     return Matcher<Container>(new ElementsAreMatcherImpl<const Container&>(
-        matchers_.begin(), matchers_.end())); 
-  } 
- 
- private: 
-  const ::std::vector<T> matchers_; 
-}; 
- 
-// Given a 2-tuple matcher tm of type Tuple2Matcher and a value second 
-// of type Second, BoundSecondMatcher<Tuple2Matcher, Second>(tm, 
+        matchers_.begin(), matchers_.end()));
+  }
+
+ private:
+  const ::std::vector<T> matchers_;
+};
+
+// Given a 2-tuple matcher tm of type Tuple2Matcher and a value second
+// of type Second, BoundSecondMatcher<Tuple2Matcher, Second>(tm,
 // second) is a polymorphic matcher that matches a value x if and only if
 // tm matches tuple (x, second).  Useful for implementing
-// UnorderedPointwise() in terms of UnorderedElementsAreArray(). 
-// 
-// BoundSecondMatcher is copyable and assignable, as we need to put 
-// instances of this class in a vector when implementing 
-// UnorderedPointwise(). 
-template <typename Tuple2Matcher, typename Second> 
-class BoundSecondMatcher { 
- public: 
-  BoundSecondMatcher(const Tuple2Matcher& tm, const Second& second) 
-      : tuple2_matcher_(tm), second_value_(second) {} 
- 
+// UnorderedPointwise() in terms of UnorderedElementsAreArray().
+//
+// BoundSecondMatcher is copyable and assignable, as we need to put
+// instances of this class in a vector when implementing
+// UnorderedPointwise().
+template <typename Tuple2Matcher, typename Second>
+class BoundSecondMatcher {
+ public:
+  BoundSecondMatcher(const Tuple2Matcher& tm, const Second& second)
+      : tuple2_matcher_(tm), second_value_(second) {}
+
   BoundSecondMatcher(const BoundSecondMatcher& other) = default;
 
-  template <typename T> 
-  operator Matcher<T>() const { 
-    return MakeMatcher(new Impl<T>(tuple2_matcher_, second_value_)); 
-  } 
- 
-  // We have to define this for UnorderedPointwise() to compile in 
-  // C++98 mode, as it puts BoundSecondMatcher instances in a vector, 
-  // which requires the elements to be assignable in C++98.  The 
-  // compiler cannot generate the operator= for us, as Tuple2Matcher 
-  // and Second may not be assignable. 
-  // 
-  // However, this should never be called, so the implementation just 
-  // need to assert. 
-  void operator=(const BoundSecondMatcher& /*rhs*/) { 
-    GTEST_LOG_(FATAL) << "BoundSecondMatcher should never be assigned."; 
-  } 
- 
- private: 
-  template <typename T> 
-  class Impl : public MatcherInterface<T> { 
-   public: 
+  template <typename T>
+  operator Matcher<T>() const {
+    return MakeMatcher(new Impl<T>(tuple2_matcher_, second_value_));
+  }
+
+  // We have to define this for UnorderedPointwise() to compile in
+  // C++98 mode, as it puts BoundSecondMatcher instances in a vector,
+  // which requires the elements to be assignable in C++98.  The
+  // compiler cannot generate the operator= for us, as Tuple2Matcher
+  // and Second may not be assignable.
+  //
+  // However, this should never be called, so the implementation just
+  // need to assert.
+  void operator=(const BoundSecondMatcher& /*rhs*/) {
+    GTEST_LOG_(FATAL) << "BoundSecondMatcher should never be assigned.";
+  }
+
+ private:
+  template <typename T>
+  class Impl : public MatcherInterface<T> {
+   public:
     typedef ::std::tuple<T, Second> ArgTuple;
- 
-    Impl(const Tuple2Matcher& tm, const Second& second) 
-        : mono_tuple2_matcher_(SafeMatcherCast<const ArgTuple&>(tm)), 
-          second_value_(second) {} 
- 
+
+    Impl(const Tuple2Matcher& tm, const Second& second)
+        : mono_tuple2_matcher_(SafeMatcherCast<const ArgTuple&>(tm)),
+          second_value_(second) {}
+
     void DescribeTo(::std::ostream* os) const override {
-      *os << "and "; 
-      UniversalPrint(second_value_, os); 
-      *os << " "; 
-      mono_tuple2_matcher_.DescribeTo(os); 
-    } 
- 
+      *os << "and ";
+      UniversalPrint(second_value_, os);
+      *os << " ";
+      mono_tuple2_matcher_.DescribeTo(os);
+    }
+
     bool MatchAndExplain(T x, MatchResultListener* listener) const override {
-      return mono_tuple2_matcher_.MatchAndExplain(ArgTuple(x, second_value_), 
-                                                  listener); 
-    } 
- 
-   private: 
-    const Matcher<const ArgTuple&> mono_tuple2_matcher_; 
-    const Second second_value_; 
-  }; 
- 
-  const Tuple2Matcher tuple2_matcher_; 
-  const Second second_value_; 
-}; 
- 
-// Given a 2-tuple matcher tm and a value second, 
-// MatcherBindSecond(tm, second) returns a matcher that matches a 
+      return mono_tuple2_matcher_.MatchAndExplain(ArgTuple(x, second_value_),
+                                                  listener);
+    }
+
+   private:
+    const Matcher<const ArgTuple&> mono_tuple2_matcher_;
+    const Second second_value_;
+  };
+
+  const Tuple2Matcher tuple2_matcher_;
+  const Second second_value_;
+};
+
+// Given a 2-tuple matcher tm and a value second,
+// MatcherBindSecond(tm, second) returns a matcher that matches a
 // value x if and only if tm matches tuple (x, second).  Useful for
 // implementing UnorderedPointwise() in terms of UnorderedElementsAreArray().
-template <typename Tuple2Matcher, typename Second> 
-BoundSecondMatcher<Tuple2Matcher, Second> MatcherBindSecond( 
-    const Tuple2Matcher& tm, const Second& second) { 
-  return BoundSecondMatcher<Tuple2Matcher, Second>(tm, second); 
-} 
- 
-// Returns the description for a matcher defined using the MATCHER*() 
-// macro where the user-supplied description string is "", if 
-// 'negation' is false; otherwise returns the description of the 
-// negation of the matcher.  'param_values' contains a list of strings 
-// that are the print-out of the matcher's parameters. 
+template <typename Tuple2Matcher, typename Second>
+BoundSecondMatcher<Tuple2Matcher, Second> MatcherBindSecond(
+    const Tuple2Matcher& tm, const Second& second) {
+  return BoundSecondMatcher<Tuple2Matcher, Second>(tm, second);
+}
+
+// Returns the description for a matcher defined using the MATCHER*()
+// macro where the user-supplied description string is "", if
+// 'negation' is false; otherwise returns the description of the
+// negation of the matcher.  'param_values' contains a list of strings
+// that are the print-out of the matcher's parameters.
 GTEST_API_ std::string FormatMatcherDescription(bool negation,
                                                 const char* matcher_name,
                                                 const Strings& param_values);
- 
+
 // Implements a matcher that checks the value of a optional<> type variable.
 template <typename ValueMatcher>
 class OptionalMatcher {
@@ -3955,61 +3955,61 @@ class ArgsMatcher {
   InnerMatcher inner_matcher_;
 };
 
-}  // namespace internal 
- 
+}  // namespace internal
+
 // ElementsAreArray(iterator_first, iterator_last)
-// ElementsAreArray(pointer, count) 
-// ElementsAreArray(array) 
-// ElementsAreArray(container) 
-// ElementsAreArray({ e1, e2, ..., en }) 
-// 
-// The ElementsAreArray() functions are like ElementsAre(...), except 
-// that they are given a homogeneous sequence rather than taking each 
-// element as a function argument. The sequence can be specified as an 
-// array, a pointer and count, a vector, an initializer list, or an 
-// STL iterator range. In each of these cases, the underlying sequence 
-// can be either a sequence of values or a sequence of matchers. 
-// 
-// All forms of ElementsAreArray() make a copy of the input matcher sequence. 
- 
-template <typename Iter> 
-inline internal::ElementsAreArrayMatcher< 
-    typename ::std::iterator_traits<Iter>::value_type> 
-ElementsAreArray(Iter first, Iter last) { 
-  typedef typename ::std::iterator_traits<Iter>::value_type T; 
-  return internal::ElementsAreArrayMatcher<T>(first, last); 
-} 
- 
-template <typename T> 
-inline internal::ElementsAreArrayMatcher<T> ElementsAreArray( 
-    const T* pointer, size_t count) { 
-  return ElementsAreArray(pointer, pointer + count); 
-} 
- 
-template <typename T, size_t N> 
-inline internal::ElementsAreArrayMatcher<T> ElementsAreArray( 
-    const T (&array)[N]) { 
-  return ElementsAreArray(array, N); 
-} 
- 
-template <typename Container> 
-inline internal::ElementsAreArrayMatcher<typename Container::value_type> 
-ElementsAreArray(const Container& container) { 
-  return ElementsAreArray(container.begin(), container.end()); 
-} 
- 
-template <typename T> 
-inline internal::ElementsAreArrayMatcher<T> 
-ElementsAreArray(::std::initializer_list<T> xs) { 
-  return ElementsAreArray(xs.begin(), xs.end()); 
-} 
- 
+// ElementsAreArray(pointer, count)
+// ElementsAreArray(array)
+// ElementsAreArray(container)
+// ElementsAreArray({ e1, e2, ..., en })
+//
+// The ElementsAreArray() functions are like ElementsAre(...), except
+// that they are given a homogeneous sequence rather than taking each
+// element as a function argument. The sequence can be specified as an
+// array, a pointer and count, a vector, an initializer list, or an
+// STL iterator range. In each of these cases, the underlying sequence
+// can be either a sequence of values or a sequence of matchers.
+//
+// All forms of ElementsAreArray() make a copy of the input matcher sequence.
+
+template <typename Iter>
+inline internal::ElementsAreArrayMatcher<
+    typename ::std::iterator_traits<Iter>::value_type>
+ElementsAreArray(Iter first, Iter last) {
+  typedef typename ::std::iterator_traits<Iter>::value_type T;
+  return internal::ElementsAreArrayMatcher<T>(first, last);
+}
+
+template <typename T>
+inline internal::ElementsAreArrayMatcher<T> ElementsAreArray(
+    const T* pointer, size_t count) {
+  return ElementsAreArray(pointer, pointer + count);
+}
+
+template <typename T, size_t N>
+inline internal::ElementsAreArrayMatcher<T> ElementsAreArray(
+    const T (&array)[N]) {
+  return ElementsAreArray(array, N);
+}
+
+template <typename Container>
+inline internal::ElementsAreArrayMatcher<typename Container::value_type>
+ElementsAreArray(const Container& container) {
+  return ElementsAreArray(container.begin(), container.end());
+}
+
+template <typename T>
+inline internal::ElementsAreArrayMatcher<T>
+ElementsAreArray(::std::initializer_list<T> xs) {
+  return ElementsAreArray(xs.begin(), xs.end());
+}
+
 // UnorderedElementsAreArray(iterator_first, iterator_last)
-// UnorderedElementsAreArray(pointer, count) 
-// UnorderedElementsAreArray(array) 
-// UnorderedElementsAreArray(container) 
-// UnorderedElementsAreArray({ e1, e2, ..., en }) 
-// 
+// UnorderedElementsAreArray(pointer, count)
+// UnorderedElementsAreArray(array)
+// UnorderedElementsAreArray(container)
+// UnorderedElementsAreArray({ e1, e2, ..., en })
+//
 // UnorderedElementsAreArray() verifies that a bijective mapping onto a
 // collection of matchers exists.
 //
@@ -4017,189 +4017,189 @@ ElementsAreArray(::std::initializer_list<T> xs) {
 // an initializer list, or an STL iterator range. In each of these cases, the
 // underlying matchers can be either values or matchers.
 
-template <typename Iter> 
-inline internal::UnorderedElementsAreArrayMatcher< 
-    typename ::std::iterator_traits<Iter>::value_type> 
-UnorderedElementsAreArray(Iter first, Iter last) { 
-  typedef typename ::std::iterator_traits<Iter>::value_type T; 
+template <typename Iter>
+inline internal::UnorderedElementsAreArrayMatcher<
+    typename ::std::iterator_traits<Iter>::value_type>
+UnorderedElementsAreArray(Iter first, Iter last) {
+  typedef typename ::std::iterator_traits<Iter>::value_type T;
   return internal::UnorderedElementsAreArrayMatcher<T>(
       internal::UnorderedMatcherRequire::ExactMatch, first, last);
-} 
- 
-template <typename T> 
-inline internal::UnorderedElementsAreArrayMatcher<T> 
-UnorderedElementsAreArray(const T* pointer, size_t count) { 
-  return UnorderedElementsAreArray(pointer, pointer + count); 
-} 
- 
-template <typename T, size_t N> 
-inline internal::UnorderedElementsAreArrayMatcher<T> 
-UnorderedElementsAreArray(const T (&array)[N]) { 
-  return UnorderedElementsAreArray(array, N); 
-} 
- 
-template <typename Container> 
-inline internal::UnorderedElementsAreArrayMatcher< 
-    typename Container::value_type> 
-UnorderedElementsAreArray(const Container& container) { 
-  return UnorderedElementsAreArray(container.begin(), container.end()); 
-} 
- 
-template <typename T> 
-inline internal::UnorderedElementsAreArrayMatcher<T> 
-UnorderedElementsAreArray(::std::initializer_list<T> xs) { 
-  return UnorderedElementsAreArray(xs.begin(), xs.end()); 
-} 
- 
-// _ is a matcher that matches anything of any type. 
-// 
-// This definition is fine as: 
-// 
-//   1. The C++ standard permits using the name _ in a namespace that 
-//      is not the global namespace or ::std. 
-//   2. The AnythingMatcher class has no data member or constructor, 
-//      so it's OK to create global variables of this type. 
-//   3. c-style has approved of using _ in this case. 
-const internal::AnythingMatcher _ = {}; 
-// Creates a matcher that matches any value of the given type T. 
-template <typename T> 
+}
+
+template <typename T>
+inline internal::UnorderedElementsAreArrayMatcher<T>
+UnorderedElementsAreArray(const T* pointer, size_t count) {
+  return UnorderedElementsAreArray(pointer, pointer + count);
+}
+
+template <typename T, size_t N>
+inline internal::UnorderedElementsAreArrayMatcher<T>
+UnorderedElementsAreArray(const T (&array)[N]) {
+  return UnorderedElementsAreArray(array, N);
+}
+
+template <typename Container>
+inline internal::UnorderedElementsAreArrayMatcher<
+    typename Container::value_type>
+UnorderedElementsAreArray(const Container& container) {
+  return UnorderedElementsAreArray(container.begin(), container.end());
+}
+
+template <typename T>
+inline internal::UnorderedElementsAreArrayMatcher<T>
+UnorderedElementsAreArray(::std::initializer_list<T> xs) {
+  return UnorderedElementsAreArray(xs.begin(), xs.end());
+}
+
+// _ is a matcher that matches anything of any type.
+//
+// This definition is fine as:
+//
+//   1. The C++ standard permits using the name _ in a namespace that
+//      is not the global namespace or ::std.
+//   2. The AnythingMatcher class has no data member or constructor,
+//      so it's OK to create global variables of this type.
+//   3. c-style has approved of using _ in this case.
+const internal::AnythingMatcher _ = {};
+// Creates a matcher that matches any value of the given type T.
+template <typename T>
 inline Matcher<T> A() {
   return _;
 }
- 
-// Creates a matcher that matches any value of the given type T. 
-template <typename T> 
+
+// Creates a matcher that matches any value of the given type T.
+template <typename T>
 inline Matcher<T> An() {
   return _;
 }
- 
+
 template <typename T, typename M>
 Matcher<T> internal::MatcherCastImpl<T, M>::CastImpl(
     const M& value, std::false_type /* convertible_to_matcher */,
     std::false_type /* convertible_to_T */) {
   return Eq(value);
-} 
- 
-// Creates a polymorphic matcher that matches any NULL pointer. 
-inline PolymorphicMatcher<internal::IsNullMatcher > IsNull() { 
-  return MakePolymorphicMatcher(internal::IsNullMatcher()); 
-} 
- 
-// Creates a polymorphic matcher that matches any non-NULL pointer. 
-// This is convenient as Not(NULL) doesn't compile (the compiler 
-// thinks that that expression is comparing a pointer with an integer). 
-inline PolymorphicMatcher<internal::NotNullMatcher > NotNull() { 
-  return MakePolymorphicMatcher(internal::NotNullMatcher()); 
-} 
- 
-// Creates a polymorphic matcher that matches any argument that 
-// references variable x. 
-template <typename T> 
-inline internal::RefMatcher<T&> Ref(T& x) {  // NOLINT 
-  return internal::RefMatcher<T&>(x); 
-} 
- 
+}
+
+// Creates a polymorphic matcher that matches any NULL pointer.
+inline PolymorphicMatcher<internal::IsNullMatcher > IsNull() {
+  return MakePolymorphicMatcher(internal::IsNullMatcher());
+}
+
+// Creates a polymorphic matcher that matches any non-NULL pointer.
+// This is convenient as Not(NULL) doesn't compile (the compiler
+// thinks that that expression is comparing a pointer with an integer).
+inline PolymorphicMatcher<internal::NotNullMatcher > NotNull() {
+  return MakePolymorphicMatcher(internal::NotNullMatcher());
+}
+
+// Creates a polymorphic matcher that matches any argument that
+// references variable x.
+template <typename T>
+inline internal::RefMatcher<T&> Ref(T& x) {  // NOLINT
+  return internal::RefMatcher<T&>(x);
+}
+
 // Creates a polymorphic matcher that matches any NaN floating point.
 inline PolymorphicMatcher<internal::IsNanMatcher> IsNan() {
   return MakePolymorphicMatcher(internal::IsNanMatcher());
 }
 
-// Creates a matcher that matches any double argument approximately 
-// equal to rhs, where two NANs are considered unequal. 
-inline internal::FloatingEqMatcher<double> DoubleEq(double rhs) { 
-  return internal::FloatingEqMatcher<double>(rhs, false); 
-} 
- 
-// Creates a matcher that matches any double argument approximately 
-// equal to rhs, including NaN values when rhs is NaN. 
-inline internal::FloatingEqMatcher<double> NanSensitiveDoubleEq(double rhs) { 
-  return internal::FloatingEqMatcher<double>(rhs, true); 
-} 
- 
-// Creates a matcher that matches any double argument approximately equal to 
-// rhs, up to the specified max absolute error bound, where two NANs are 
-// considered unequal.  The max absolute error bound must be non-negative. 
-inline internal::FloatingEqMatcher<double> DoubleNear( 
-    double rhs, double max_abs_error) { 
-  return internal::FloatingEqMatcher<double>(rhs, false, max_abs_error); 
-} 
- 
-// Creates a matcher that matches any double argument approximately equal to 
-// rhs, up to the specified max absolute error bound, including NaN values when 
-// rhs is NaN.  The max absolute error bound must be non-negative. 
-inline internal::FloatingEqMatcher<double> NanSensitiveDoubleNear( 
-    double rhs, double max_abs_error) { 
-  return internal::FloatingEqMatcher<double>(rhs, true, max_abs_error); 
-} 
- 
-// Creates a matcher that matches any float argument approximately 
-// equal to rhs, where two NANs are considered unequal. 
-inline internal::FloatingEqMatcher<float> FloatEq(float rhs) { 
-  return internal::FloatingEqMatcher<float>(rhs, false); 
-} 
- 
-// Creates a matcher that matches any float argument approximately 
-// equal to rhs, including NaN values when rhs is NaN. 
-inline internal::FloatingEqMatcher<float> NanSensitiveFloatEq(float rhs) { 
-  return internal::FloatingEqMatcher<float>(rhs, true); 
-} 
- 
-// Creates a matcher that matches any float argument approximately equal to 
-// rhs, up to the specified max absolute error bound, where two NANs are 
-// considered unequal.  The max absolute error bound must be non-negative. 
-inline internal::FloatingEqMatcher<float> FloatNear( 
-    float rhs, float max_abs_error) { 
-  return internal::FloatingEqMatcher<float>(rhs, false, max_abs_error); 
-} 
- 
-// Creates a matcher that matches any float argument approximately equal to 
-// rhs, up to the specified max absolute error bound, including NaN values when 
-// rhs is NaN.  The max absolute error bound must be non-negative. 
-inline internal::FloatingEqMatcher<float> NanSensitiveFloatNear( 
-    float rhs, float max_abs_error) { 
-  return internal::FloatingEqMatcher<float>(rhs, true, max_abs_error); 
-} 
- 
-// Creates a matcher that matches a pointer (raw or smart) that points 
-// to a value that matches inner_matcher. 
-template <typename InnerMatcher> 
-inline internal::PointeeMatcher<InnerMatcher> Pointee( 
-    const InnerMatcher& inner_matcher) { 
-  return internal::PointeeMatcher<InnerMatcher>(inner_matcher); 
-} 
- 
+// Creates a matcher that matches any double argument approximately
+// equal to rhs, where two NANs are considered unequal.
+inline internal::FloatingEqMatcher<double> DoubleEq(double rhs) {
+  return internal::FloatingEqMatcher<double>(rhs, false);
+}
+
+// Creates a matcher that matches any double argument approximately
+// equal to rhs, including NaN values when rhs is NaN.
+inline internal::FloatingEqMatcher<double> NanSensitiveDoubleEq(double rhs) {
+  return internal::FloatingEqMatcher<double>(rhs, true);
+}
+
+// Creates a matcher that matches any double argument approximately equal to
+// rhs, up to the specified max absolute error bound, where two NANs are
+// considered unequal.  The max absolute error bound must be non-negative.
+inline internal::FloatingEqMatcher<double> DoubleNear(
+    double rhs, double max_abs_error) {
+  return internal::FloatingEqMatcher<double>(rhs, false, max_abs_error);
+}
+
+// Creates a matcher that matches any double argument approximately equal to
+// rhs, up to the specified max absolute error bound, including NaN values when
+// rhs is NaN.  The max absolute error bound must be non-negative.
+inline internal::FloatingEqMatcher<double> NanSensitiveDoubleNear(
+    double rhs, double max_abs_error) {
+  return internal::FloatingEqMatcher<double>(rhs, true, max_abs_error);
+}
+
+// Creates a matcher that matches any float argument approximately
+// equal to rhs, where two NANs are considered unequal.
+inline internal::FloatingEqMatcher<float> FloatEq(float rhs) {
+  return internal::FloatingEqMatcher<float>(rhs, false);
+}
+
+// Creates a matcher that matches any float argument approximately
+// equal to rhs, including NaN values when rhs is NaN.
+inline internal::FloatingEqMatcher<float> NanSensitiveFloatEq(float rhs) {
+  return internal::FloatingEqMatcher<float>(rhs, true);
+}
+
+// Creates a matcher that matches any float argument approximately equal to
+// rhs, up to the specified max absolute error bound, where two NANs are
+// considered unequal.  The max absolute error bound must be non-negative.
+inline internal::FloatingEqMatcher<float> FloatNear(
+    float rhs, float max_abs_error) {
+  return internal::FloatingEqMatcher<float>(rhs, false, max_abs_error);
+}
+
+// Creates a matcher that matches any float argument approximately equal to
+// rhs, up to the specified max absolute error bound, including NaN values when
+// rhs is NaN.  The max absolute error bound must be non-negative.
+inline internal::FloatingEqMatcher<float> NanSensitiveFloatNear(
+    float rhs, float max_abs_error) {
+  return internal::FloatingEqMatcher<float>(rhs, true, max_abs_error);
+}
+
+// Creates a matcher that matches a pointer (raw or smart) that points
+// to a value that matches inner_matcher.
+template <typename InnerMatcher>
+inline internal::PointeeMatcher<InnerMatcher> Pointee(
+    const InnerMatcher& inner_matcher) {
+  return internal::PointeeMatcher<InnerMatcher>(inner_matcher);
+}
+
 #if GTEST_HAS_RTTI
-// Creates a matcher that matches a pointer or reference that matches 
-// inner_matcher when dynamic_cast<To> is applied. 
-// The result of dynamic_cast<To> is forwarded to the inner matcher. 
-// If To is a pointer and the cast fails, the inner matcher will receive NULL. 
-// If To is a reference and the cast fails, this matcher returns false 
-// immediately. 
-template <typename To> 
-inline PolymorphicMatcher<internal::WhenDynamicCastToMatcher<To> > 
-WhenDynamicCastTo(const Matcher<To>& inner_matcher) { 
-  return MakePolymorphicMatcher( 
-      internal::WhenDynamicCastToMatcher<To>(inner_matcher)); 
-} 
+// Creates a matcher that matches a pointer or reference that matches
+// inner_matcher when dynamic_cast<To> is applied.
+// The result of dynamic_cast<To> is forwarded to the inner matcher.
+// If To is a pointer and the cast fails, the inner matcher will receive NULL.
+// If To is a reference and the cast fails, this matcher returns false
+// immediately.
+template <typename To>
+inline PolymorphicMatcher<internal::WhenDynamicCastToMatcher<To> >
+WhenDynamicCastTo(const Matcher<To>& inner_matcher) {
+  return MakePolymorphicMatcher(
+      internal::WhenDynamicCastToMatcher<To>(inner_matcher));
+}
 #endif  // GTEST_HAS_RTTI
- 
-// Creates a matcher that matches an object whose given field matches 
-// 'matcher'.  For example, 
-//   Field(&Foo::number, Ge(5)) 
+
+// Creates a matcher that matches an object whose given field matches
+// 'matcher'.  For example,
+//   Field(&Foo::number, Ge(5))
 // matches a Foo object x if and only if x.number >= 5.
-template <typename Class, typename FieldType, typename FieldMatcher> 
-inline PolymorphicMatcher< 
-  internal::FieldMatcher<Class, FieldType> > Field( 
-    FieldType Class::*field, const FieldMatcher& matcher) { 
-  return MakePolymorphicMatcher( 
-      internal::FieldMatcher<Class, FieldType>( 
-          field, MatcherCast<const FieldType&>(matcher))); 
-  // The call to MatcherCast() is required for supporting inner 
-  // matchers of compatible types.  For example, it allows 
-  //   Field(&Foo::bar, m) 
-  // to compile where bar is an int32 and m is a matcher for int64. 
-} 
- 
+template <typename Class, typename FieldType, typename FieldMatcher>
+inline PolymorphicMatcher<
+  internal::FieldMatcher<Class, FieldType> > Field(
+    FieldType Class::*field, const FieldMatcher& matcher) {
+  return MakePolymorphicMatcher(
+      internal::FieldMatcher<Class, FieldType>(
+          field, MatcherCast<const FieldType&>(matcher)));
+  // The call to MatcherCast() is required for supporting inner
+  // matchers of compatible types.  For example, it allows
+  //   Field(&Foo::bar, m)
+  // to compile where bar is an int32 and m is a matcher for int64.
+}
+
 // Same as Field() but also takes the name of the field to provide better error
 // messages.
 template <typename Class, typename FieldType, typename FieldMatcher>
@@ -4210,25 +4210,25 @@ inline PolymorphicMatcher<internal::FieldMatcher<Class, FieldType> > Field(
       field_name, field, MatcherCast<const FieldType&>(matcher)));
 }
 
-// Creates a matcher that matches an object whose given property 
-// matches 'matcher'.  For example, 
-//   Property(&Foo::str, StartsWith("hi")) 
+// Creates a matcher that matches an object whose given property
+// matches 'matcher'.  For example,
+//   Property(&Foo::str, StartsWith("hi"))
 // matches a Foo object x if and only if x.str() starts with "hi".
-template <typename Class, typename PropertyType, typename PropertyMatcher> 
+template <typename Class, typename PropertyType, typename PropertyMatcher>
 inline PolymorphicMatcher<internal::PropertyMatcher<
     Class, PropertyType, PropertyType (Class::*)() const> >
 Property(PropertyType (Class::*property)() const,
          const PropertyMatcher& matcher) {
-  return MakePolymorphicMatcher( 
+  return MakePolymorphicMatcher(
       internal::PropertyMatcher<Class, PropertyType,
                                 PropertyType (Class::*)() const>(
           property, MatcherCast<const PropertyType&>(matcher)));
-  // The call to MatcherCast() is required for supporting inner 
-  // matchers of compatible types.  For example, it allows 
-  //   Property(&Foo::bar, m) 
-  // to compile where bar() returns an int32 and m is a matcher for int64. 
-} 
- 
+  // The call to MatcherCast() is required for supporting inner
+  // matchers of compatible types.  For example, it allows
+  //   Property(&Foo::bar, m)
+  // to compile where bar() returns an int32 and m is a matcher for int64.
+}
+
 // Same as Property() above, but also takes the name of the property to provide
 // better error messages.
 template <typename Class, typename PropertyType, typename PropertyMatcher>
@@ -4270,7 +4270,7 @@ Property(const std::string& property_name,
 
 // Creates a matcher that matches an object if and only if the result of
 // applying a callable to x matches 'matcher'. For example,
-//   ResultOf(f, StartsWith("hi")) 
+//   ResultOf(f, StartsWith("hi"))
 // matches a Foo object x if and only if f(x) starts with "hi".
 // `callable` parameter can be a function, function pointer, or a functor. It is
 // required to keep no state affecting the results of the calls on it and make
@@ -4281,146 +4281,146 @@ internal::ResultOfMatcher<Callable, InnerMatcher> ResultOf(
     Callable callable, InnerMatcher matcher) {
   return internal::ResultOfMatcher<Callable, InnerMatcher>(
       std::move(callable), std::move(matcher));
-} 
- 
-// String matchers. 
- 
-// Matches a string equal to str. 
+}
+
+// String matchers.
+
+// Matches a string equal to str.
 template <typename T = std::string>
 PolymorphicMatcher<internal::StrEqualityMatcher<std::string> > StrEq(
     const internal::StringLike<T>& str) {
   return MakePolymorphicMatcher(
       internal::StrEqualityMatcher<std::string>(std::string(str), true, true));
-} 
- 
-// Matches a string not equal to str. 
+}
+
+// Matches a string not equal to str.
 template <typename T = std::string>
 PolymorphicMatcher<internal::StrEqualityMatcher<std::string> > StrNe(
     const internal::StringLike<T>& str) {
   return MakePolymorphicMatcher(
       internal::StrEqualityMatcher<std::string>(std::string(str), false, true));
-} 
- 
-// Matches a string equal to str, ignoring case. 
+}
+
+// Matches a string equal to str, ignoring case.
 template <typename T = std::string>
 PolymorphicMatcher<internal::StrEqualityMatcher<std::string> > StrCaseEq(
     const internal::StringLike<T>& str) {
   return MakePolymorphicMatcher(
       internal::StrEqualityMatcher<std::string>(std::string(str), true, false));
-} 
- 
-// Matches a string not equal to str, ignoring case. 
+}
+
+// Matches a string not equal to str, ignoring case.
 template <typename T = std::string>
 PolymorphicMatcher<internal::StrEqualityMatcher<std::string> > StrCaseNe(
     const internal::StringLike<T>& str) {
   return MakePolymorphicMatcher(internal::StrEqualityMatcher<std::string>(
       std::string(str), false, false));
-} 
- 
-// Creates a matcher that matches any string, std::string, or C string 
-// that contains the given substring. 
+}
+
+// Creates a matcher that matches any string, std::string, or C string
+// that contains the given substring.
 template <typename T = std::string>
 PolymorphicMatcher<internal::HasSubstrMatcher<std::string> > HasSubstr(
     const internal::StringLike<T>& substring) {
   return MakePolymorphicMatcher(
       internal::HasSubstrMatcher<std::string>(std::string(substring)));
-} 
- 
-// Matches a string that starts with 'prefix' (case-sensitive). 
+}
+
+// Matches a string that starts with 'prefix' (case-sensitive).
 template <typename T = std::string>
 PolymorphicMatcher<internal::StartsWithMatcher<std::string> > StartsWith(
     const internal::StringLike<T>& prefix) {
   return MakePolymorphicMatcher(
       internal::StartsWithMatcher<std::string>(std::string(prefix)));
-} 
- 
-// Matches a string that ends with 'suffix' (case-sensitive). 
+}
+
+// Matches a string that ends with 'suffix' (case-sensitive).
 template <typename T = std::string>
 PolymorphicMatcher<internal::EndsWithMatcher<std::string> > EndsWith(
     const internal::StringLike<T>& suffix) {
   return MakePolymorphicMatcher(
       internal::EndsWithMatcher<std::string>(std::string(suffix)));
-} 
- 
+}
+
 #if GTEST_HAS_STD_WSTRING
-// Wide string matchers. 
- 
-// Matches a string equal to str. 
+// Wide string matchers.
+
+// Matches a string equal to str.
 inline PolymorphicMatcher<internal::StrEqualityMatcher<std::wstring> > StrEq(
     const std::wstring& str) {
   return MakePolymorphicMatcher(
       internal::StrEqualityMatcher<std::wstring>(str, true, true));
-} 
- 
-// Matches a string not equal to str. 
+}
+
+// Matches a string not equal to str.
 inline PolymorphicMatcher<internal::StrEqualityMatcher<std::wstring> > StrNe(
     const std::wstring& str) {
   return MakePolymorphicMatcher(
       internal::StrEqualityMatcher<std::wstring>(str, false, true));
-} 
- 
-// Matches a string equal to str, ignoring case. 
+}
+
+// Matches a string equal to str, ignoring case.
 inline PolymorphicMatcher<internal::StrEqualityMatcher<std::wstring> >
 StrCaseEq(const std::wstring& str) {
   return MakePolymorphicMatcher(
       internal::StrEqualityMatcher<std::wstring>(str, true, false));
-} 
- 
-// Matches a string not equal to str, ignoring case. 
+}
+
+// Matches a string not equal to str, ignoring case.
 inline PolymorphicMatcher<internal::StrEqualityMatcher<std::wstring> >
 StrCaseNe(const std::wstring& str) {
   return MakePolymorphicMatcher(
       internal::StrEqualityMatcher<std::wstring>(str, false, false));
-} 
- 
+}
+
 // Creates a matcher that matches any ::wstring, std::wstring, or C wide string
-// that contains the given substring. 
+// that contains the given substring.
 inline PolymorphicMatcher<internal::HasSubstrMatcher<std::wstring> > HasSubstr(
     const std::wstring& substring) {
   return MakePolymorphicMatcher(
       internal::HasSubstrMatcher<std::wstring>(substring));
-} 
- 
-// Matches a string that starts with 'prefix' (case-sensitive). 
+}
+
+// Matches a string that starts with 'prefix' (case-sensitive).
 inline PolymorphicMatcher<internal::StartsWithMatcher<std::wstring> >
 StartsWith(const std::wstring& prefix) {
   return MakePolymorphicMatcher(
       internal::StartsWithMatcher<std::wstring>(prefix));
-} 
- 
-// Matches a string that ends with 'suffix' (case-sensitive). 
+}
+
+// Matches a string that ends with 'suffix' (case-sensitive).
 inline PolymorphicMatcher<internal::EndsWithMatcher<std::wstring> > EndsWith(
     const std::wstring& suffix) {
   return MakePolymorphicMatcher(
       internal::EndsWithMatcher<std::wstring>(suffix));
-} 
- 
+}
+
 #endif  // GTEST_HAS_STD_WSTRING
- 
-// Creates a polymorphic matcher that matches a 2-tuple where the 
-// first field == the second field. 
-inline internal::Eq2Matcher Eq() { return internal::Eq2Matcher(); } 
- 
-// Creates a polymorphic matcher that matches a 2-tuple where the 
-// first field >= the second field. 
-inline internal::Ge2Matcher Ge() { return internal::Ge2Matcher(); } 
- 
-// Creates a polymorphic matcher that matches a 2-tuple where the 
-// first field > the second field. 
-inline internal::Gt2Matcher Gt() { return internal::Gt2Matcher(); } 
- 
-// Creates a polymorphic matcher that matches a 2-tuple where the 
-// first field <= the second field. 
-inline internal::Le2Matcher Le() { return internal::Le2Matcher(); } 
- 
-// Creates a polymorphic matcher that matches a 2-tuple where the 
-// first field < the second field. 
-inline internal::Lt2Matcher Lt() { return internal::Lt2Matcher(); } 
- 
-// Creates a polymorphic matcher that matches a 2-tuple where the 
-// first field != the second field. 
-inline internal::Ne2Matcher Ne() { return internal::Ne2Matcher(); } 
- 
+
+// Creates a polymorphic matcher that matches a 2-tuple where the
+// first field == the second field.
+inline internal::Eq2Matcher Eq() { return internal::Eq2Matcher(); }
+
+// Creates a polymorphic matcher that matches a 2-tuple where the
+// first field >= the second field.
+inline internal::Ge2Matcher Ge() { return internal::Ge2Matcher(); }
+
+// Creates a polymorphic matcher that matches a 2-tuple where the
+// first field > the second field.
+inline internal::Gt2Matcher Gt() { return internal::Gt2Matcher(); }
+
+// Creates a polymorphic matcher that matches a 2-tuple where the
+// first field <= the second field.
+inline internal::Le2Matcher Le() { return internal::Le2Matcher(); }
+
+// Creates a polymorphic matcher that matches a 2-tuple where the
+// first field < the second field.
+inline internal::Lt2Matcher Lt() { return internal::Lt2Matcher(); }
+
+// Creates a polymorphic matcher that matches a 2-tuple where the
+// first field != the second field.
+inline internal::Ne2Matcher Ne() { return internal::Ne2Matcher(); }
+
 // Creates a polymorphic matcher that matches a 2-tuple where
 // FloatEq(first field) matches the second field.
 inline internal::FloatingEq2Matcher<float> FloatEq() {
@@ -4473,172 +4473,172 @@ inline internal::FloatingEq2Matcher<double> NanSensitiveDoubleNear(
   return internal::FloatingEq2Matcher<double>(max_abs_error, true);
 }
 
-// Creates a matcher that matches any value of type T that m doesn't 
-// match. 
-template <typename InnerMatcher> 
-inline internal::NotMatcher<InnerMatcher> Not(InnerMatcher m) { 
-  return internal::NotMatcher<InnerMatcher>(m); 
-} 
- 
-// Returns a matcher that matches anything that satisfies the given 
-// predicate.  The predicate can be any unary function or functor 
-// whose return type can be implicitly converted to bool. 
-template <typename Predicate> 
-inline PolymorphicMatcher<internal::TrulyMatcher<Predicate> > 
-Truly(Predicate pred) { 
-  return MakePolymorphicMatcher(internal::TrulyMatcher<Predicate>(pred)); 
-} 
- 
-// Returns a matcher that matches the container size. The container must 
-// support both size() and size_type which all STL-like containers provide. 
-// Note that the parameter 'size' can be a value of type size_type as well as 
-// matcher. For instance: 
-//   EXPECT_THAT(container, SizeIs(2));     // Checks container has 2 elements. 
-//   EXPECT_THAT(container, SizeIs(Le(2));  // Checks container has at most 2. 
-template <typename SizeMatcher> 
-inline internal::SizeIsMatcher<SizeMatcher> 
-SizeIs(const SizeMatcher& size_matcher) { 
-  return internal::SizeIsMatcher<SizeMatcher>(size_matcher); 
-} 
- 
-// Returns a matcher that matches the distance between the container's begin() 
-// iterator and its end() iterator, i.e. the size of the container. This matcher 
-// can be used instead of SizeIs with containers such as std::forward_list which 
-// do not implement size(). The container must provide const_iterator (with 
-// valid iterator_traits), begin() and end(). 
-template <typename DistanceMatcher> 
-inline internal::BeginEndDistanceIsMatcher<DistanceMatcher> 
-BeginEndDistanceIs(const DistanceMatcher& distance_matcher) { 
-  return internal::BeginEndDistanceIsMatcher<DistanceMatcher>(distance_matcher); 
-} 
- 
-// Returns a matcher that matches an equal container. 
-// This matcher behaves like Eq(), but in the event of mismatch lists the 
-// values that are included in one container but not the other. (Duplicate 
-// values and order differences are not explained.) 
-template <typename Container> 
+// Creates a matcher that matches any value of type T that m doesn't
+// match.
+template <typename InnerMatcher>
+inline internal::NotMatcher<InnerMatcher> Not(InnerMatcher m) {
+  return internal::NotMatcher<InnerMatcher>(m);
+}
+
+// Returns a matcher that matches anything that satisfies the given
+// predicate.  The predicate can be any unary function or functor
+// whose return type can be implicitly converted to bool.
+template <typename Predicate>
+inline PolymorphicMatcher<internal::TrulyMatcher<Predicate> >
+Truly(Predicate pred) {
+  return MakePolymorphicMatcher(internal::TrulyMatcher<Predicate>(pred));
+}
+
+// Returns a matcher that matches the container size. The container must
+// support both size() and size_type which all STL-like containers provide.
+// Note that the parameter 'size' can be a value of type size_type as well as
+// matcher. For instance:
+//   EXPECT_THAT(container, SizeIs(2));     // Checks container has 2 elements.
+//   EXPECT_THAT(container, SizeIs(Le(2));  // Checks container has at most 2.
+template <typename SizeMatcher>
+inline internal::SizeIsMatcher<SizeMatcher>
+SizeIs(const SizeMatcher& size_matcher) {
+  return internal::SizeIsMatcher<SizeMatcher>(size_matcher);
+}
+
+// Returns a matcher that matches the distance between the container's begin()
+// iterator and its end() iterator, i.e. the size of the container. This matcher
+// can be used instead of SizeIs with containers such as std::forward_list which
+// do not implement size(). The container must provide const_iterator (with
+// valid iterator_traits), begin() and end().
+template <typename DistanceMatcher>
+inline internal::BeginEndDistanceIsMatcher<DistanceMatcher>
+BeginEndDistanceIs(const DistanceMatcher& distance_matcher) {
+  return internal::BeginEndDistanceIsMatcher<DistanceMatcher>(distance_matcher);
+}
+
+// Returns a matcher that matches an equal container.
+// This matcher behaves like Eq(), but in the event of mismatch lists the
+// values that are included in one container but not the other. (Duplicate
+// values and order differences are not explained.)
+template <typename Container>
 inline PolymorphicMatcher<internal::ContainerEqMatcher<
     typename std::remove_const<Container>::type>>
 ContainerEq(const Container& rhs) {
   return MakePolymorphicMatcher(internal::ContainerEqMatcher<Container>(rhs));
-} 
- 
-// Returns a matcher that matches a container that, when sorted using 
-// the given comparator, matches container_matcher. 
-template <typename Comparator, typename ContainerMatcher> 
-inline internal::WhenSortedByMatcher<Comparator, ContainerMatcher> 
-WhenSortedBy(const Comparator& comparator, 
-             const ContainerMatcher& container_matcher) { 
-  return internal::WhenSortedByMatcher<Comparator, ContainerMatcher>( 
-      comparator, container_matcher); 
-} 
- 
-// Returns a matcher that matches a container that, when sorted using 
-// the < operator, matches container_matcher. 
-template <typename ContainerMatcher> 
-inline internal::WhenSortedByMatcher<internal::LessComparator, ContainerMatcher> 
-WhenSorted(const ContainerMatcher& container_matcher) { 
-  return 
-      internal::WhenSortedByMatcher<internal::LessComparator, ContainerMatcher>( 
-          internal::LessComparator(), container_matcher); 
-} 
- 
-// Matches an STL-style container or a native array that contains the 
-// same number of elements as in rhs, where its i-th element and rhs's 
-// i-th element (as a pair) satisfy the given pair matcher, for all i. 
+}
+
+// Returns a matcher that matches a container that, when sorted using
+// the given comparator, matches container_matcher.
+template <typename Comparator, typename ContainerMatcher>
+inline internal::WhenSortedByMatcher<Comparator, ContainerMatcher>
+WhenSortedBy(const Comparator& comparator,
+             const ContainerMatcher& container_matcher) {
+  return internal::WhenSortedByMatcher<Comparator, ContainerMatcher>(
+      comparator, container_matcher);
+}
+
+// Returns a matcher that matches a container that, when sorted using
+// the < operator, matches container_matcher.
+template <typename ContainerMatcher>
+inline internal::WhenSortedByMatcher<internal::LessComparator, ContainerMatcher>
+WhenSorted(const ContainerMatcher& container_matcher) {
+  return
+      internal::WhenSortedByMatcher<internal::LessComparator, ContainerMatcher>(
+          internal::LessComparator(), container_matcher);
+}
+
+// Matches an STL-style container or a native array that contains the
+// same number of elements as in rhs, where its i-th element and rhs's
+// i-th element (as a pair) satisfy the given pair matcher, for all i.
 // TupleMatcher must be able to be safely cast to Matcher<std::tuple<const
-// T1&, const T2&> >, where T1 and T2 are the types of elements in the 
-// LHS container and the RHS container respectively. 
-template <typename TupleMatcher, typename Container> 
-inline internal::PointwiseMatcher<TupleMatcher, 
+// T1&, const T2&> >, where T1 and T2 are the types of elements in the
+// LHS container and the RHS container respectively.
+template <typename TupleMatcher, typename Container>
+inline internal::PointwiseMatcher<TupleMatcher,
                                   typename std::remove_const<Container>::type>
-Pointwise(const TupleMatcher& tuple_matcher, const Container& rhs) { 
+Pointwise(const TupleMatcher& tuple_matcher, const Container& rhs) {
   return internal::PointwiseMatcher<TupleMatcher, Container>(tuple_matcher,
                                                              rhs);
-} 
- 
- 
-// Supports the Pointwise(m, {a, b, c}) syntax. 
-template <typename TupleMatcher, typename T> 
-inline internal::PointwiseMatcher<TupleMatcher, std::vector<T> > Pointwise( 
-    const TupleMatcher& tuple_matcher, std::initializer_list<T> rhs) { 
-  return Pointwise(tuple_matcher, std::vector<T>(rhs)); 
-} 
- 
- 
-// UnorderedPointwise(pair_matcher, rhs) matches an STL-style 
-// container or a native array that contains the same number of 
-// elements as in rhs, where in some permutation of the container, its 
-// i-th element and rhs's i-th element (as a pair) satisfy the given 
-// pair matcher, for all i.  Tuple2Matcher must be able to be safely 
+}
+
+
+// Supports the Pointwise(m, {a, b, c}) syntax.
+template <typename TupleMatcher, typename T>
+inline internal::PointwiseMatcher<TupleMatcher, std::vector<T> > Pointwise(
+    const TupleMatcher& tuple_matcher, std::initializer_list<T> rhs) {
+  return Pointwise(tuple_matcher, std::vector<T>(rhs));
+}
+
+
+// UnorderedPointwise(pair_matcher, rhs) matches an STL-style
+// container or a native array that contains the same number of
+// elements as in rhs, where in some permutation of the container, its
+// i-th element and rhs's i-th element (as a pair) satisfy the given
+// pair matcher, for all i.  Tuple2Matcher must be able to be safely
 // cast to Matcher<std::tuple<const T1&, const T2&> >, where T1 and T2 are
-// the types of elements in the LHS container and the RHS container 
-// respectively. 
-// 
-// This is like Pointwise(pair_matcher, rhs), except that the element 
-// order doesn't matter. 
-template <typename Tuple2Matcher, typename RhsContainer> 
-inline internal::UnorderedElementsAreArrayMatcher< 
-    typename internal::BoundSecondMatcher< 
+// the types of elements in the LHS container and the RHS container
+// respectively.
+//
+// This is like Pointwise(pair_matcher, rhs), except that the element
+// order doesn't matter.
+template <typename Tuple2Matcher, typename RhsContainer>
+inline internal::UnorderedElementsAreArrayMatcher<
+    typename internal::BoundSecondMatcher<
         Tuple2Matcher,
         typename internal::StlContainerView<
             typename std::remove_const<RhsContainer>::type>::type::value_type>>
-UnorderedPointwise(const Tuple2Matcher& tuple2_matcher, 
-                   const RhsContainer& rhs_container) { 
-  // RhsView allows the same code to handle RhsContainer being a 
-  // STL-style container and it being a native C-style array. 
+UnorderedPointwise(const Tuple2Matcher& tuple2_matcher,
+                   const RhsContainer& rhs_container) {
+  // RhsView allows the same code to handle RhsContainer being a
+  // STL-style container and it being a native C-style array.
   typedef typename internal::StlContainerView<RhsContainer> RhsView;
-  typedef typename RhsView::type RhsStlContainer; 
-  typedef typename RhsStlContainer::value_type Second; 
-  const RhsStlContainer& rhs_stl_container = 
-      RhsView::ConstReference(rhs_container); 
- 
-  // Create a matcher for each element in rhs_container. 
-  ::std::vector<internal::BoundSecondMatcher<Tuple2Matcher, Second> > matchers; 
-  for (typename RhsStlContainer::const_iterator it = rhs_stl_container.begin(); 
-       it != rhs_stl_container.end(); ++it) { 
-    matchers.push_back( 
-        internal::MatcherBindSecond(tuple2_matcher, *it)); 
-  } 
- 
-  // Delegate the work to UnorderedElementsAreArray(). 
-  return UnorderedElementsAreArray(matchers); 
-} 
- 
- 
-// Supports the UnorderedPointwise(m, {a, b, c}) syntax. 
-template <typename Tuple2Matcher, typename T> 
-inline internal::UnorderedElementsAreArrayMatcher< 
-    typename internal::BoundSecondMatcher<Tuple2Matcher, T> > 
-UnorderedPointwise(const Tuple2Matcher& tuple2_matcher, 
-                   std::initializer_list<T> rhs) { 
-  return UnorderedPointwise(tuple2_matcher, std::vector<T>(rhs)); 
-} 
- 
- 
-// Matches an STL-style container or a native array that contains at 
-// least one element matching the given value or matcher. 
-// 
-// Examples: 
-//   ::std::set<int> page_ids; 
-//   page_ids.insert(3); 
-//   page_ids.insert(1); 
-//   EXPECT_THAT(page_ids, Contains(1)); 
-//   EXPECT_THAT(page_ids, Contains(Gt(2))); 
-//   EXPECT_THAT(page_ids, Not(Contains(4))); 
-// 
-//   ::std::map<int, size_t> page_lengths; 
-//   page_lengths[1] = 100; 
-//   EXPECT_THAT(page_lengths, 
-//               Contains(::std::pair<const int, size_t>(1, 100))); 
-// 
-//   const char* user_ids[] = { "joe", "mike", "tom" }; 
-//   EXPECT_THAT(user_ids, Contains(Eq(::std::string("tom")))); 
-template <typename M> 
-inline internal::ContainsMatcher<M> Contains(M matcher) { 
-  return internal::ContainsMatcher<M>(matcher); 
-} 
- 
+  typedef typename RhsView::type RhsStlContainer;
+  typedef typename RhsStlContainer::value_type Second;
+  const RhsStlContainer& rhs_stl_container =
+      RhsView::ConstReference(rhs_container);
+
+  // Create a matcher for each element in rhs_container.
+  ::std::vector<internal::BoundSecondMatcher<Tuple2Matcher, Second> > matchers;
+  for (typename RhsStlContainer::const_iterator it = rhs_stl_container.begin();
+       it != rhs_stl_container.end(); ++it) {
+    matchers.push_back(
+        internal::MatcherBindSecond(tuple2_matcher, *it));
+  }
+
+  // Delegate the work to UnorderedElementsAreArray().
+  return UnorderedElementsAreArray(matchers);
+}
+
+
+// Supports the UnorderedPointwise(m, {a, b, c}) syntax.
+template <typename Tuple2Matcher, typename T>
+inline internal::UnorderedElementsAreArrayMatcher<
+    typename internal::BoundSecondMatcher<Tuple2Matcher, T> >
+UnorderedPointwise(const Tuple2Matcher& tuple2_matcher,
+                   std::initializer_list<T> rhs) {
+  return UnorderedPointwise(tuple2_matcher, std::vector<T>(rhs));
+}
+
+
+// Matches an STL-style container or a native array that contains at
+// least one element matching the given value or matcher.
+//
+// Examples:
+//   ::std::set<int> page_ids;
+//   page_ids.insert(3);
+//   page_ids.insert(1);
+//   EXPECT_THAT(page_ids, Contains(1));
+//   EXPECT_THAT(page_ids, Contains(Gt(2)));
+//   EXPECT_THAT(page_ids, Not(Contains(4)));
+//
+//   ::std::map<int, size_t> page_lengths;
+//   page_lengths[1] = 100;
+//   EXPECT_THAT(page_lengths,
+//               Contains(::std::pair<const int, size_t>(1, 100)));
+//
+//   const char* user_ids[] = { "joe", "mike", "tom" };
+//   EXPECT_THAT(user_ids, Contains(Eq(::std::string("tom"))));
+template <typename M>
+inline internal::ContainsMatcher<M> Contains(M matcher) {
+  return internal::ContainsMatcher<M>(matcher);
+}
+
 // IsSupersetOf(iterator_first, iterator_last)
 // IsSupersetOf(pointer, count)
 // IsSupersetOf(array)
@@ -4757,58 +4757,58 @@ inline internal::UnorderedElementsAreArrayMatcher<T> IsSubsetOf(
   return IsSubsetOf(xs.begin(), xs.end());
 }
 
-// Matches an STL-style container or a native array that contains only 
-// elements matching the given value or matcher. 
-// 
-// Each(m) is semantically equivalent to Not(Contains(Not(m))). Only 
-// the messages are different. 
-// 
-// Examples: 
-//   ::std::set<int> page_ids; 
-//   // Each(m) matches an empty container, regardless of what m is. 
-//   EXPECT_THAT(page_ids, Each(Eq(1))); 
-//   EXPECT_THAT(page_ids, Each(Eq(77))); 
-// 
-//   page_ids.insert(3); 
-//   EXPECT_THAT(page_ids, Each(Gt(0))); 
-//   EXPECT_THAT(page_ids, Not(Each(Gt(4)))); 
-//   page_ids.insert(1); 
-//   EXPECT_THAT(page_ids, Not(Each(Lt(2)))); 
-// 
-//   ::std::map<int, size_t> page_lengths; 
-//   page_lengths[1] = 100; 
-//   page_lengths[2] = 200; 
-//   page_lengths[3] = 300; 
-//   EXPECT_THAT(page_lengths, Not(Each(Pair(1, 100)))); 
-//   EXPECT_THAT(page_lengths, Each(Key(Le(3)))); 
-// 
-//   const char* user_ids[] = { "joe", "mike", "tom" }; 
-//   EXPECT_THAT(user_ids, Not(Each(Eq(::std::string("tom"))))); 
-template <typename M> 
-inline internal::EachMatcher<M> Each(M matcher) { 
-  return internal::EachMatcher<M>(matcher); 
-} 
- 
-// Key(inner_matcher) matches an std::pair whose 'first' field matches 
-// inner_matcher.  For example, Contains(Key(Ge(5))) can be used to match an 
-// std::map that contains at least one element whose key is >= 5. 
-template <typename M> 
-inline internal::KeyMatcher<M> Key(M inner_matcher) { 
-  return internal::KeyMatcher<M>(inner_matcher); 
-} 
- 
-// Pair(first_matcher, second_matcher) matches a std::pair whose 'first' field 
-// matches first_matcher and whose 'second' field matches second_matcher.  For 
-// example, EXPECT_THAT(map_type, ElementsAre(Pair(Ge(5), "foo"))) can be used 
-// to match a std::map<int, string> that contains exactly one element whose key 
-// is >= 5 and whose value equals "foo". 
-template <typename FirstMatcher, typename SecondMatcher> 
-inline internal::PairMatcher<FirstMatcher, SecondMatcher> 
-Pair(FirstMatcher first_matcher, SecondMatcher second_matcher) { 
-  return internal::PairMatcher<FirstMatcher, SecondMatcher>( 
-      first_matcher, second_matcher); 
-} 
- 
+// Matches an STL-style container or a native array that contains only
+// elements matching the given value or matcher.
+//
+// Each(m) is semantically equivalent to Not(Contains(Not(m))). Only
+// the messages are different.
+//
+// Examples:
+//   ::std::set<int> page_ids;
+//   // Each(m) matches an empty container, regardless of what m is.
+//   EXPECT_THAT(page_ids, Each(Eq(1)));
+//   EXPECT_THAT(page_ids, Each(Eq(77)));
+//
+//   page_ids.insert(3);
+//   EXPECT_THAT(page_ids, Each(Gt(0)));
+//   EXPECT_THAT(page_ids, Not(Each(Gt(4))));
+//   page_ids.insert(1);
+//   EXPECT_THAT(page_ids, Not(Each(Lt(2))));
+//
+//   ::std::map<int, size_t> page_lengths;
+//   page_lengths[1] = 100;
+//   page_lengths[2] = 200;
+//   page_lengths[3] = 300;
+//   EXPECT_THAT(page_lengths, Not(Each(Pair(1, 100))));
+//   EXPECT_THAT(page_lengths, Each(Key(Le(3))));
+//
+//   const char* user_ids[] = { "joe", "mike", "tom" };
+//   EXPECT_THAT(user_ids, Not(Each(Eq(::std::string("tom")))));
+template <typename M>
+inline internal::EachMatcher<M> Each(M matcher) {
+  return internal::EachMatcher<M>(matcher);
+}
+
+// Key(inner_matcher) matches an std::pair whose 'first' field matches
+// inner_matcher.  For example, Contains(Key(Ge(5))) can be used to match an
+// std::map that contains at least one element whose key is >= 5.
+template <typename M>
+inline internal::KeyMatcher<M> Key(M inner_matcher) {
+  return internal::KeyMatcher<M>(inner_matcher);
+}
+
+// Pair(first_matcher, second_matcher) matches a std::pair whose 'first' field
+// matches first_matcher and whose 'second' field matches second_matcher.  For
+// example, EXPECT_THAT(map_type, ElementsAre(Pair(Ge(5), "foo"))) can be used
+// to match a std::map<int, string> that contains exactly one element whose key
+// is >= 5 and whose value equals "foo".
+template <typename FirstMatcher, typename SecondMatcher>
+inline internal::PairMatcher<FirstMatcher, SecondMatcher>
+Pair(FirstMatcher first_matcher, SecondMatcher second_matcher) {
+  return internal::PairMatcher<FirstMatcher, SecondMatcher>(
+      first_matcher, second_matcher);
+}
+
 namespace no_adl {
 // FieldsAre(matchers...) matches piecewise the fields of compatible structs.
 // These include those that support `get<I>(obj)`, and when structured bindings
@@ -4838,27 +4838,27 @@ inline internal::AddressMatcher<InnerMatcher> Address(
 }
 }  // namespace no_adl
 
-// Returns a predicate that is satisfied by anything that matches the 
-// given matcher. 
-template <typename M> 
-inline internal::MatcherAsPredicate<M> Matches(M matcher) { 
-  return internal::MatcherAsPredicate<M>(matcher); 
-} 
- 
+// Returns a predicate that is satisfied by anything that matches the
+// given matcher.
+template <typename M>
+inline internal::MatcherAsPredicate<M> Matches(M matcher) {
+  return internal::MatcherAsPredicate<M>(matcher);
+}
+
 // Returns true if and only if the value matches the matcher.
-template <typename T, typename M> 
-inline bool Value(const T& value, M matcher) { 
-  return testing::Matches(matcher)(value); 
-} 
- 
-// Matches the value against the given matcher and explains the match 
-// result to listener. 
-template <typename T, typename M> 
-inline bool ExplainMatchResult( 
-    M matcher, const T& value, MatchResultListener* listener) { 
-  return SafeMatcherCast<const T&>(matcher).MatchAndExplain(value, listener); 
-} 
- 
+template <typename T, typename M>
+inline bool Value(const T& value, M matcher) {
+  return testing::Matches(matcher)(value);
+}
+
+// Matches the value against the given matcher and explains the match
+// result to listener.
+template <typename T, typename M>
+inline bool ExplainMatchResult(
+    M matcher, const T& value, MatchResultListener* listener) {
+  return SafeMatcherCast<const T&>(matcher).MatchAndExplain(value, listener);
+}
+
 // Returns a string representation of the given matcher.  Useful for description
 // strings of matchers defined using MATCHER_P* macros that accept matchers as
 // their arguments.  For example:
@@ -4881,24 +4881,24 @@ std::string DescribeMatcher(const M& matcher, bool negation = false) {
   return ss.str();
 }
 
-template <typename... Args> 
+template <typename... Args>
 internal::ElementsAreMatcher<
     std::tuple<typename std::decay<const Args&>::type...>>
 ElementsAre(const Args&... matchers) {
   return internal::ElementsAreMatcher<
       std::tuple<typename std::decay<const Args&>::type...>>(
       std::make_tuple(matchers...));
-} 
- 
-template <typename... Args> 
+}
+
+template <typename... Args>
 internal::UnorderedElementsAreMatcher<
     std::tuple<typename std::decay<const Args&>::type...>>
 UnorderedElementsAre(const Args&... matchers) {
   return internal::UnorderedElementsAreMatcher<
       std::tuple<typename std::decay<const Args&>::type...>>(
       std::make_tuple(matchers...));
-} 
- 
+}
+
 // Define variadic matcher versions.
 template <typename... Args>
 internal::AllOfMatcher<typename std::decay<const Args&>::type...> AllOf(
@@ -4906,7 +4906,7 @@ internal::AllOfMatcher<typename std::decay<const Args&>::type...> AllOf(
   return internal::AllOfMatcher<typename std::decay<const Args&>::type...>(
       matchers...);
 }
- 
+
 template <typename... Args>
 internal::AnyOfMatcher<typename std::decay<const Args&>::type...> AnyOf(
     const Args&... matchers) {
@@ -5006,16 +5006,16 @@ internal::ArgsMatcher<typename std::decay<InnerMatcher>::type, k...> Args(
       std::forward<InnerMatcher>(matcher));
 }
 
-// AllArgs(m) is a synonym of m.  This is useful in 
-// 
-//   EXPECT_CALL(foo, Bar(_, _)).With(AllArgs(Eq())); 
-// 
-// which is easier to read than 
-// 
-//   EXPECT_CALL(foo, Bar(_, _)).With(Eq()); 
-template <typename InnerMatcher> 
-inline InnerMatcher AllArgs(const InnerMatcher& matcher) { return matcher; } 
- 
+// AllArgs(m) is a synonym of m.  This is useful in
+//
+//   EXPECT_CALL(foo, Bar(_, _)).With(AllArgs(Eq()));
+//
+// which is easier to read than
+//
+//   EXPECT_CALL(foo, Bar(_, _)).With(Eq());
+template <typename InnerMatcher>
+inline InnerMatcher AllArgs(const InnerMatcher& matcher) { return matcher; }
+
 // Returns a matcher that matches the value of an optional<> type variable.
 // The matcher implementation only uses '!arg' and requires that the optional<>
 // type has a 'value_type' member type and that '*arg' is of type 'value_type'
@@ -5218,15 +5218,15 @@ PolymorphicMatcher<internal::ExceptionMatcherImpl<Err>> ThrowsMessage(
 
 #endif  // GTEST_HAS_EXCEPTIONS
 
-// These macros allow using matchers to check values in Google Test 
-// tests.  ASSERT_THAT(value, matcher) and EXPECT_THAT(value, matcher) 
+// These macros allow using matchers to check values in Google Test
+// tests.  ASSERT_THAT(value, matcher) and EXPECT_THAT(value, matcher)
 // succeed if and only if the value matches the matcher.  If the assertion
 // fails, the value and the description of the matcher will be printed.
-#define ASSERT_THAT(value, matcher) ASSERT_PRED_FORMAT1(\ 
-    ::testing::internal::MakePredicateFormatterFromMatcher(matcher), value) 
-#define EXPECT_THAT(value, matcher) EXPECT_PRED_FORMAT1(\ 
-    ::testing::internal::MakePredicateFormatterFromMatcher(matcher), value) 
- 
+#define ASSERT_THAT(value, matcher) ASSERT_PRED_FORMAT1(\
+    ::testing::internal::MakePredicateFormatterFromMatcher(matcher), value)
+#define EXPECT_THAT(value, matcher) EXPECT_PRED_FORMAT1(\
+    ::testing::internal::MakePredicateFormatterFromMatcher(matcher), value)
+
 // MATCHER* macroses itself are listed below.
 #define MATCHER(name, description)                                             \
   class name##Matcher                                                          \
@@ -5380,13 +5380,13 @@ PolymorphicMatcher<internal::ExceptionMatcherImpl<Err>> ThrowsMessage(
 // To prevent ADL on certain functions we put them on a separate namespace.
 using namespace no_adl;  // NOLINT
 
-}  // namespace testing 
- 
+}  // namespace testing
+
 GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251 5046
 
-// Include any custom callback matchers added by the local installation. 
-// We must include this header at the end to make sure it can use the 
-// declarations from this file. 
-#include "gmock/internal/custom/gmock-matchers.h" 
+// Include any custom callback matchers added by the local installation.
+// We must include this header at the end to make sure it can use the
+// declarations from this file.
+#include "gmock/internal/custom/gmock-matchers.h"
 
 #endif  // GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_MATCHERS_H_
diff --git a/contrib/restricted/googletest/googlemock/include/gmock/gmock-more-actions.h b/contrib/restricted/googletest/googlemock/include/gmock/gmock-more-actions.h
index 37e200b1cb..fd293358a2 100644
--- a/contrib/restricted/googletest/googlemock/include/gmock/gmock-more-actions.h
+++ b/contrib/restricted/googletest/googlemock/include/gmock/gmock-more-actions.h
@@ -1,51 +1,51 @@
-// Copyright 2007, Google Inc. 
-// All rights reserved. 
-// 
-// Redistribution and use in source and binary forms, with or without 
-// modification, are permitted provided that the following conditions are 
-// met: 
-// 
-//     * Redistributions of source code must retain the above copyright 
-// notice, this list of conditions and the following disclaimer. 
-//     * Redistributions in binary form must reproduce the above 
-// copyright notice, this list of conditions and the following disclaimer 
-// in the documentation and/or other materials provided with the 
-// distribution. 
-//     * Neither the name of Google Inc. nor the names of its 
-// contributors may be used to endorse or promote products derived from 
-// this software without specific prior written permission. 
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- 
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-// Google Mock - a framework for writing C++ mock classes. 
-// 
+
+// Google Mock - a framework for writing C++ mock classes.
+//
 // This file implements some commonly used variadic actions.
- 
+
 // GOOGLETEST_CM0002 DO NOT DELETE
 
 #ifndef GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_MORE_ACTIONS_H_
 #define GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_MORE_ACTIONS_H_
- 
+
 #include <memory>
 #include <utility>
- 
+
 #include "gmock/gmock-actions.h"
 #include "gmock/internal/gmock-port.h"
- 
+
 // Include any custom callback actions added by the local installation.
 #include "gmock/internal/custom/gmock-generated-actions.h"
- 
+
 // Sometimes you want to give an action explicit template parameters
 // that cannot be inferred from its value parameters.  ACTION() and
 // ACTION_P*() don't support that.  ACTION_TEMPLATE() remedies that
@@ -126,7 +126,7 @@
 // the maximum number of template/value parameters supported.  Without
 // using it, we'd have to devote O(N^2) amount of code to implement all
 // combinations of m and n.
- 
+
 // Declares the template parameters.
 #define GMOCK_INTERNAL_DECL_HAS_1_TEMPLATE_PARAMS(kind0, name0) kind0 name0
 #define GMOCK_INTERNAL_DECL_HAS_2_TEMPLATE_PARAMS(kind0, name0, kind1, \
@@ -160,7 +160,7 @@
     name6, kind7, name7, kind8, name8, kind9, name9) kind0 name0, \
     kind1 name1, kind2 name2, kind3 name3, kind4 name4, kind5 name5, \
     kind6 name6, kind7 name7, kind8 name8, kind9 name9
- 
+
 // Lists the template parameters.
 #define GMOCK_INTERNAL_LIST_HAS_1_TEMPLATE_PARAMS(kind0, name0) name0
 #define GMOCK_INTERNAL_LIST_HAS_2_TEMPLATE_PARAMS(kind0, name0, kind1, \
@@ -189,7 +189,7 @@
     name1, kind2, name2, kind3, name3, kind4, name4, kind5, name5, kind6, \
     name6, kind7, name7, kind8, name8, kind9, name9) name0, name1, name2, \
     name3, name4, name5, name6, name7, name8, name9
- 
+
 // Declares the types of value parameters.
 #define GMOCK_INTERNAL_DECL_TYPE_AND_0_VALUE_PARAMS()
 #define GMOCK_INTERNAL_DECL_TYPE_AND_1_VALUE_PARAMS(p0) , typename p0##_type
@@ -489,18 +489,18 @@
 
 namespace testing {
 
-// The ACTION*() macros trigger warning C4100 (unreferenced formal 
-// parameter) in MSVC with -W4.  Unfortunately they cannot be fixed in 
-// the macro definition, as the warnings are generated when the macro 
-// is expanded and macro expansion cannot contain #pragma.  Therefore 
-// we suppress them here. 
-#ifdef _MSC_VER 
-# pragma warning(push) 
-# pragma warning(disable:4100) 
-#endif 
- 
+// The ACTION*() macros trigger warning C4100 (unreferenced formal
+// parameter) in MSVC with -W4.  Unfortunately they cannot be fixed in
+// the macro definition, as the warnings are generated when the macro
+// is expanded and macro expansion cannot contain #pragma.  Therefore
+// we suppress them here.
+#ifdef _MSC_VER
+# pragma warning(push)
+# pragma warning(disable:4100)
+#endif
+
 namespace internal {
- 
+
 // internal::InvokeArgument - a helper for InvokeArgument action.
 // The basic overloads are provided here for generic functors.
 // Overloads for other custom-callables are provided in the
@@ -508,8 +508,8 @@ namespace internal {
 template <typename F, typename... Args>
 auto InvokeArgument(F f, Args... args) -> decltype(f(args...)) {
   return f(args...);
-} 
- 
+}
+
 template <std::size_t index, typename... Params>
 struct InvokeArgumentAction {
   template <typename... Args>
@@ -524,12 +524,12 @@ struct InvokeArgumentAction {
           std::forward<decltype(callable)>(callable), unpacked_params...);
     });
   }
- 
+
   internal::FlatTuple<Params...> params;
 };
- 
+
 }  // namespace internal
- 
+
 // The InvokeArgument<N>(a1, a2, ..., a_k) action invokes the N-th
 // (0-based) argument, which must be a k-ary callable, of the mock
 // function, with arguments a1, a2, ..., a_k.
@@ -562,12 +562,12 @@ internal::InvokeArgumentAction<index, typename std::decay<Params>::type...>
 InvokeArgument(Params&&... params) {
   return {internal::FlatTuple<typename std::decay<Params>::type...>(
       internal::FlatTupleConstructTag{}, std::forward<Params>(params)...)};
-} 
- 
-#ifdef _MSC_VER 
-# pragma warning(pop) 
-#endif 
- 
-}  // namespace testing 
- 
+}
+
+#ifdef _MSC_VER
+# pragma warning(pop)
+#endif
+
+}  // namespace testing
+
 #endif  // GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_MORE_ACTIONS_H_
diff --git a/contrib/restricted/googletest/googlemock/include/gmock/gmock-more-matchers.h b/contrib/restricted/googletest/googlemock/include/gmock/gmock-more-matchers.h
index 9dcc66e332..dfc77e359c 100644
--- a/contrib/restricted/googletest/googlemock/include/gmock/gmock-more-matchers.h
+++ b/contrib/restricted/googletest/googlemock/include/gmock/gmock-more-matchers.h
@@ -1,49 +1,49 @@
-// Copyright 2013, Google Inc. 
-// All rights reserved. 
-// 
-// Redistribution and use in source and binary forms, with or without 
-// modification, are permitted provided that the following conditions are 
-// met: 
-// 
-//     * Redistributions of source code must retain the above copyright 
-// notice, this list of conditions and the following disclaimer. 
-//     * Redistributions in binary form must reproduce the above 
-// copyright notice, this list of conditions and the following disclaimer 
-// in the documentation and/or other materials provided with the 
-// distribution. 
-//     * Neither the name of Google Inc. nor the names of its 
-// contributors may be used to endorse or promote products derived from 
-// this software without specific prior written permission. 
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- 
+// Copyright 2013, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-// Google Mock - a framework for writing C++ mock classes. 
-// 
+
+// Google Mock - a framework for writing C++ mock classes.
+//
 // This file implements some matchers that depend on gmock-matchers.h.
-// 
-// Note that tests are implemented in gmock-matchers_test.cc rather than 
-// gmock-more-matchers-test.cc. 
- 
+//
+// Note that tests are implemented in gmock-matchers_test.cc rather than
+// gmock-more-matchers-test.cc.
+
 // GOOGLETEST_CM0002 DO NOT DELETE
- 
+
 #ifndef GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_MORE_MATCHERS_H_
 #define GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_MORE_MATCHERS_H_
 
 #include "gmock/gmock-matchers.h"
- 
-namespace testing { 
- 
+
+namespace testing {
+
 // Silence C4100 (unreferenced formal
 // parameter) for MSVC
 #ifdef _MSC_VER
@@ -56,16 +56,16 @@ namespace testing {
   #endif
 #endif
 
-// Defines a matcher that matches an empty container. The container must 
-// support both size() and empty(), which all STL-like containers provide. 
-MATCHER(IsEmpty, negation ? "isn't empty" : "is empty") { 
-  if (arg.empty()) { 
-    return true; 
-  } 
-  *result_listener << "whose size is " << arg.size(); 
-  return false; 
-} 
- 
+// Defines a matcher that matches an empty container. The container must
+// support both size() and empty(), which all STL-like containers provide.
+MATCHER(IsEmpty, negation ? "isn't empty" : "is empty") {
+  if (arg.empty()) {
+    return true;
+  }
+  *result_listener << "whose size is " << arg.size();
+  return false;
+}
+
 // Define a matcher that matches a value that evaluates in boolean
 // context to true.  Useful for types that define "explicit operator
 // bool" operators and so can't be compared for equality with true
@@ -87,6 +87,6 @@ MATCHER(IsFalse, negation ? "is true" : "is false") {
 #endif
 
 
-}  // namespace testing 
- 
+}  // namespace testing
+
 #endif  // GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_MORE_MATCHERS_H_
diff --git a/contrib/restricted/googletest/googlemock/include/gmock/gmock-spec-builders.h b/contrib/restricted/googletest/googlemock/include/gmock/gmock-spec-builders.h
index f2e77dda3c..41323c1cc0 100644
--- a/contrib/restricted/googletest/googlemock/include/gmock/gmock-spec-builders.h
+++ b/contrib/restricted/googletest/googlemock/include/gmock/gmock-spec-builders.h
@@ -1,82 +1,82 @@
-// Copyright 2007, Google Inc. 
-// All rights reserved. 
-// 
-// Redistribution and use in source and binary forms, with or without 
-// modification, are permitted provided that the following conditions are 
-// met: 
-// 
-//     * Redistributions of source code must retain the above copyright 
-// notice, this list of conditions and the following disclaimer. 
-//     * Redistributions in binary form must reproduce the above 
-// copyright notice, this list of conditions and the following disclaimer 
-// in the documentation and/or other materials provided with the 
-// distribution. 
-//     * Neither the name of Google Inc. nor the names of its 
-// contributors may be used to endorse or promote products derived from 
-// this software without specific prior written permission. 
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- 
-
-// Google Mock - a framework for writing C++ mock classes. 
-// 
-// This file implements the ON_CALL() and EXPECT_CALL() macros. 
-// 
-// A user can use the ON_CALL() macro to specify the default action of 
-// a mock method.  The syntax is: 
-// 
-//   ON_CALL(mock_object, Method(argument-matchers)) 
-//       .With(multi-argument-matcher) 
-//       .WillByDefault(action); 
-// 
-//  where the .With() clause is optional. 
-// 
-// A user can use the EXPECT_CALL() macro to specify an expectation on 
-// a mock method.  The syntax is: 
-// 
-//   EXPECT_CALL(mock_object, Method(argument-matchers)) 
-//       .With(multi-argument-matchers) 
-//       .Times(cardinality) 
-//       .InSequence(sequences) 
-//       .After(expectations) 
-//       .WillOnce(action) 
-//       .WillRepeatedly(action) 
-//       .RetiresOnSaturation(); 
-// 
-// where all clauses are optional, and .InSequence()/.After()/ 
-// .WillOnce() can appear any number of times. 
- 
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+// Google Mock - a framework for writing C++ mock classes.
+//
+// This file implements the ON_CALL() and EXPECT_CALL() macros.
+//
+// A user can use the ON_CALL() macro to specify the default action of
+// a mock method.  The syntax is:
+//
+//   ON_CALL(mock_object, Method(argument-matchers))
+//       .With(multi-argument-matcher)
+//       .WillByDefault(action);
+//
+//  where the .With() clause is optional.
+//
+// A user can use the EXPECT_CALL() macro to specify an expectation on
+// a mock method.  The syntax is:
+//
+//   EXPECT_CALL(mock_object, Method(argument-matchers))
+//       .With(multi-argument-matchers)
+//       .Times(cardinality)
+//       .InSequence(sequences)
+//       .After(expectations)
+//       .WillOnce(action)
+//       .WillRepeatedly(action)
+//       .RetiresOnSaturation();
+//
+// where all clauses are optional, and .InSequence()/.After()/
+// .WillOnce() can appear any number of times.
+
 // GOOGLETEST_CM0002 DO NOT DELETE
 
 #ifndef GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_SPEC_BUILDERS_H_
 #define GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_SPEC_BUILDERS_H_
- 
+
 #include <functional>
-#include <map> 
+#include <map>
 #include <memory>
-#include <set> 
-#include <sstream> 
-#include <string> 
+#include <set>
+#include <sstream>
+#include <string>
 #include <type_traits>
 #include <utility>
-#include <vector> 
-#include "gmock/gmock-actions.h" 
-#include "gmock/gmock-cardinalities.h" 
-#include "gmock/gmock-matchers.h" 
-#include "gmock/internal/gmock-internal-utils.h" 
-#include "gmock/internal/gmock-port.h" 
-#include "gtest/gtest.h" 
- 
+#include <vector>
+#include "gmock/gmock-actions.h"
+#include "gmock/gmock-cardinalities.h"
+#include "gmock/gmock-matchers.h"
+#include "gmock/internal/gmock-internal-utils.h"
+#include "gmock/internal/gmock-port.h"
+#include "gtest/gtest.h"
+
 #if GTEST_HAS_EXCEPTIONS
 # include <stdexcept>  // NOLINT
 #endif
@@ -84,30 +84,30 @@
 GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
 /* class A needs to have dll-interface to be used by clients of class B */)
 
-namespace testing { 
- 
-// An abstract handle of an expectation. 
-class Expectation; 
- 
-// A set of expectation handles. 
-class ExpectationSet; 
- 
-// Anything inside the 'internal' namespace IS INTERNAL IMPLEMENTATION 
-// and MUST NOT BE USED IN USER CODE!!! 
-namespace internal { 
- 
-// Implements a mock function. 
-template <typename F> class FunctionMocker; 
- 
-// Base class for expectations. 
-class ExpectationBase; 
- 
-// Implements an expectation. 
-template <typename F> class TypedExpectation; 
- 
-// Helper class for testing the Expectation class template. 
-class ExpectationTester; 
- 
+namespace testing {
+
+// An abstract handle of an expectation.
+class Expectation;
+
+// A set of expectation handles.
+class ExpectationSet;
+
+// Anything inside the 'internal' namespace IS INTERNAL IMPLEMENTATION
+// and MUST NOT BE USED IN USER CODE!!!
+namespace internal {
+
+// Implements a mock function.
+template <typename F> class FunctionMocker;
+
+// Base class for expectations.
+class ExpectationBase;
+
+// Implements an expectation.
+template <typename F> class TypedExpectation;
+
+// Helper class for testing the Expectation class template.
+class ExpectationTester;
+
 // Helper classes for implementing NiceMock, StrictMock, and NaggyMock.
 template <typename MockClass>
 class NiceMockImpl;
@@ -116,135 +116,135 @@ class StrictMockImpl;
 template <typename MockClass>
 class NaggyMockImpl;
 
-// Protects the mock object registry (in class Mock), all function 
-// mockers, and all expectations. 
-// 
-// The reason we don't use more fine-grained protection is: when a 
-// mock function Foo() is called, it needs to consult its expectations 
-// to see which one should be picked.  If another thread is allowed to 
-// call a mock function (either Foo() or a different one) at the same 
-// time, it could affect the "retired" attributes of Foo()'s 
-// expectations when InSequence() is used, and thus affect which 
-// expectation gets picked.  Therefore, we sequence all mock function 
-// calls to ensure the integrity of the mock objects' states. 
-GTEST_API_ GTEST_DECLARE_STATIC_MUTEX_(g_gmock_mutex); 
- 
-// Untyped base class for ActionResultHolder<R>. 
-class UntypedActionResultHolderBase; 
- 
+// Protects the mock object registry (in class Mock), all function
+// mockers, and all expectations.
+//
+// The reason we don't use more fine-grained protection is: when a
+// mock function Foo() is called, it needs to consult its expectations
+// to see which one should be picked.  If another thread is allowed to
+// call a mock function (either Foo() or a different one) at the same
+// time, it could affect the "retired" attributes of Foo()'s
+// expectations when InSequence() is used, and thus affect which
+// expectation gets picked.  Therefore, we sequence all mock function
+// calls to ensure the integrity of the mock objects' states.
+GTEST_API_ GTEST_DECLARE_STATIC_MUTEX_(g_gmock_mutex);
+
+// Untyped base class for ActionResultHolder<R>.
+class UntypedActionResultHolderBase;
+
 // Abstract base class of FunctionMocker.  This is the
-// type-agnostic part of the function mocker interface.  Its pure 
+// type-agnostic part of the function mocker interface.  Its pure
 // virtual methods are implemented by FunctionMocker.
-class GTEST_API_ UntypedFunctionMockerBase { 
- public: 
-  UntypedFunctionMockerBase(); 
-  virtual ~UntypedFunctionMockerBase(); 
- 
-  // Verifies that all expectations on this mock function have been 
-  // satisfied.  Reports one or more Google Test non-fatal failures 
-  // and returns false if not. 
-  bool VerifyAndClearExpectationsLocked() 
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex); 
- 
-  // Clears the ON_CALL()s set on this mock function. 
-  virtual void ClearDefaultActionsLocked() 
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) = 0; 
- 
-  // In all of the following Untyped* functions, it's the caller's 
-  // responsibility to guarantee the correctness of the arguments' 
-  // types. 
- 
-  // Performs the default action with the given arguments and returns 
-  // the action's result.  The call description string will be used in 
-  // the error message to describe the call in the case the default 
-  // action fails. 
-  // L = * 
-  virtual UntypedActionResultHolderBase* UntypedPerformDefaultAction( 
+class GTEST_API_ UntypedFunctionMockerBase {
+ public:
+  UntypedFunctionMockerBase();
+  virtual ~UntypedFunctionMockerBase();
+
+  // Verifies that all expectations on this mock function have been
+  // satisfied.  Reports one or more Google Test non-fatal failures
+  // and returns false if not.
+  bool VerifyAndClearExpectationsLocked()
+      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex);
+
+  // Clears the ON_CALL()s set on this mock function.
+  virtual void ClearDefaultActionsLocked()
+      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) = 0;
+
+  // In all of the following Untyped* functions, it's the caller's
+  // responsibility to guarantee the correctness of the arguments'
+  // types.
+
+  // Performs the default action with the given arguments and returns
+  // the action's result.  The call description string will be used in
+  // the error message to describe the call in the case the default
+  // action fails.
+  // L = *
+  virtual UntypedActionResultHolderBase* UntypedPerformDefaultAction(
       void* untyped_args, const std::string& call_description) const = 0;
- 
-  // Performs the given action with the given arguments and returns 
-  // the action's result. 
-  // L = * 
-  virtual UntypedActionResultHolderBase* UntypedPerformAction( 
+
+  // Performs the given action with the given arguments and returns
+  // the action's result.
+  // L = *
+  virtual UntypedActionResultHolderBase* UntypedPerformAction(
       const void* untyped_action, void* untyped_args) const = 0;
- 
-  // Writes a message that the call is uninteresting (i.e. neither 
-  // explicitly expected nor explicitly unexpected) to the given 
-  // ostream. 
-  virtual void UntypedDescribeUninterestingCall( 
-      const void* untyped_args, 
-      ::std::ostream* os) const 
-          GTEST_LOCK_EXCLUDED_(g_gmock_mutex) = 0; 
- 
-  // Returns the expectation that matches the given function arguments 
-  // (or NULL is there's no match); when a match is found, 
-  // untyped_action is set to point to the action that should be 
-  // performed (or NULL if the action is "do default"), and 
-  // is_excessive is modified to indicate whether the call exceeds the 
-  // expected number. 
-  virtual const ExpectationBase* UntypedFindMatchingExpectation( 
-      const void* untyped_args, 
-      const void** untyped_action, bool* is_excessive, 
-      ::std::ostream* what, ::std::ostream* why) 
-          GTEST_LOCK_EXCLUDED_(g_gmock_mutex) = 0; 
- 
-  // Prints the given function arguments to the ostream. 
-  virtual void UntypedPrintArgs(const void* untyped_args, 
-                                ::std::ostream* os) const = 0; 
- 
-  // Sets the mock object this mock method belongs to, and registers 
-  // this information in the global mock registry.  Will be called 
-  // whenever an EXPECT_CALL() or ON_CALL() is executed on this mock 
-  // method. 
-  void RegisterOwner(const void* mock_obj) 
-      GTEST_LOCK_EXCLUDED_(g_gmock_mutex); 
- 
-  // Sets the mock object this mock method belongs to, and sets the 
-  // name of the mock function.  Will be called upon each invocation 
-  // of this mock function. 
-  void SetOwnerAndName(const void* mock_obj, const char* name) 
-      GTEST_LOCK_EXCLUDED_(g_gmock_mutex); 
- 
-  // Returns the mock object this mock method belongs to.  Must be 
-  // called after RegisterOwner() or SetOwnerAndName() has been 
-  // called. 
-  const void* MockObject() const 
-      GTEST_LOCK_EXCLUDED_(g_gmock_mutex); 
- 
-  // Returns the name of this mock method.  Must be called after 
-  // SetOwnerAndName() has been called. 
-  const char* Name() const 
-      GTEST_LOCK_EXCLUDED_(g_gmock_mutex); 
- 
-  // Returns the result of invoking this mock function with the given 
-  // arguments.  This function can be safely called from multiple 
-  // threads concurrently.  The caller is responsible for deleting the 
-  // result. 
+
+  // Writes a message that the call is uninteresting (i.e. neither
+  // explicitly expected nor explicitly unexpected) to the given
+  // ostream.
+  virtual void UntypedDescribeUninterestingCall(
+      const void* untyped_args,
+      ::std::ostream* os) const
+          GTEST_LOCK_EXCLUDED_(g_gmock_mutex) = 0;
+
+  // Returns the expectation that matches the given function arguments
+  // (or NULL is there's no match); when a match is found,
+  // untyped_action is set to point to the action that should be
+  // performed (or NULL if the action is "do default"), and
+  // is_excessive is modified to indicate whether the call exceeds the
+  // expected number.
+  virtual const ExpectationBase* UntypedFindMatchingExpectation(
+      const void* untyped_args,
+      const void** untyped_action, bool* is_excessive,
+      ::std::ostream* what, ::std::ostream* why)
+          GTEST_LOCK_EXCLUDED_(g_gmock_mutex) = 0;
+
+  // Prints the given function arguments to the ostream.
+  virtual void UntypedPrintArgs(const void* untyped_args,
+                                ::std::ostream* os) const = 0;
+
+  // Sets the mock object this mock method belongs to, and registers
+  // this information in the global mock registry.  Will be called
+  // whenever an EXPECT_CALL() or ON_CALL() is executed on this mock
+  // method.
+  void RegisterOwner(const void* mock_obj)
+      GTEST_LOCK_EXCLUDED_(g_gmock_mutex);
+
+  // Sets the mock object this mock method belongs to, and sets the
+  // name of the mock function.  Will be called upon each invocation
+  // of this mock function.
+  void SetOwnerAndName(const void* mock_obj, const char* name)
+      GTEST_LOCK_EXCLUDED_(g_gmock_mutex);
+
+  // Returns the mock object this mock method belongs to.  Must be
+  // called after RegisterOwner() or SetOwnerAndName() has been
+  // called.
+  const void* MockObject() const
+      GTEST_LOCK_EXCLUDED_(g_gmock_mutex);
+
+  // Returns the name of this mock method.  Must be called after
+  // SetOwnerAndName() has been called.
+  const char* Name() const
+      GTEST_LOCK_EXCLUDED_(g_gmock_mutex);
+
+  // Returns the result of invoking this mock function with the given
+  // arguments.  This function can be safely called from multiple
+  // threads concurrently.  The caller is responsible for deleting the
+  // result.
   UntypedActionResultHolderBase* UntypedInvokeWith(void* untyped_args)
       GTEST_LOCK_EXCLUDED_(g_gmock_mutex);
- 
- protected: 
-  typedef std::vector<const void*> UntypedOnCallSpecs; 
- 
+
+ protected:
+  typedef std::vector<const void*> UntypedOnCallSpecs;
+
   using UntypedExpectations = std::vector<std::shared_ptr<ExpectationBase>>;
- 
-  // Returns an Expectation object that references and co-owns exp, 
-  // which must be an expectation on this mock function. 
-  Expectation GetHandleOf(ExpectationBase* exp); 
- 
-  // Address of the mock object this mock method belongs to.  Only 
-  // valid after this mock method has been called or 
-  // ON_CALL/EXPECT_CALL has been invoked on it. 
-  const void* mock_obj_;  // Protected by g_gmock_mutex. 
- 
-  // Name of the function being mocked.  Only valid after this mock 
-  // method has been called. 
-  const char* name_;  // Protected by g_gmock_mutex. 
- 
-  // All default action specs for this function mocker. 
-  UntypedOnCallSpecs untyped_on_call_specs_; 
- 
-  // All expectations for this function mocker. 
+
+  // Returns an Expectation object that references and co-owns exp,
+  // which must be an expectation on this mock function.
+  Expectation GetHandleOf(ExpectationBase* exp);
+
+  // Address of the mock object this mock method belongs to.  Only
+  // valid after this mock method has been called or
+  // ON_CALL/EXPECT_CALL has been invoked on it.
+  const void* mock_obj_;  // Protected by g_gmock_mutex.
+
+  // Name of the function being mocked.  Only valid after this mock
+  // method has been called.
+  const char* name_;  // Protected by g_gmock_mutex.
+
+  // All default action specs for this function mocker.
+  UntypedOnCallSpecs untyped_on_call_specs_;
+
+  // All expectations for this function mocker.
   //
   // It's undefined behavior to interleave expectations (EXPECT_CALLs
   // or ON_CALLs) and mock function calls.  Also, the order of
@@ -253,156 +253,156 @@ class GTEST_API_ UntypedFunctionMockerBase {
   // tools like tsan to catch concurrent read/write accesses to
   // untyped_expectations, we deliberately leave accesses to it
   // unprotected.
-  UntypedExpectations untyped_expectations_; 
-};  // class UntypedFunctionMockerBase 
- 
-// Untyped base class for OnCallSpec<F>. 
-class UntypedOnCallSpecBase { 
- public: 
-  // The arguments are the location of the ON_CALL() statement. 
-  UntypedOnCallSpecBase(const char* a_file, int a_line) 
-      : file_(a_file), line_(a_line), last_clause_(kNone) {} 
- 
-  // Where in the source file was the default action spec defined? 
-  const char* file() const { return file_; } 
-  int line() const { return line_; } 
- 
- protected: 
-  // Gives each clause in the ON_CALL() statement a name. 
-  enum Clause { 
-    // Do not change the order of the enum members!  The run-time 
-    // syntax checking relies on it. 
-    kNone, 
-    kWith, 
-    kWillByDefault 
-  }; 
- 
-  // Asserts that the ON_CALL() statement has a certain property. 
+  UntypedExpectations untyped_expectations_;
+};  // class UntypedFunctionMockerBase
+
+// Untyped base class for OnCallSpec<F>.
+class UntypedOnCallSpecBase {
+ public:
+  // The arguments are the location of the ON_CALL() statement.
+  UntypedOnCallSpecBase(const char* a_file, int a_line)
+      : file_(a_file), line_(a_line), last_clause_(kNone) {}
+
+  // Where in the source file was the default action spec defined?
+  const char* file() const { return file_; }
+  int line() const { return line_; }
+
+ protected:
+  // Gives each clause in the ON_CALL() statement a name.
+  enum Clause {
+    // Do not change the order of the enum members!  The run-time
+    // syntax checking relies on it.
+    kNone,
+    kWith,
+    kWillByDefault
+  };
+
+  // Asserts that the ON_CALL() statement has a certain property.
   void AssertSpecProperty(bool property,
                           const std::string& failure_message) const {
-    Assert(property, file_, line_, failure_message); 
-  } 
- 
-  // Expects that the ON_CALL() statement has a certain property. 
+    Assert(property, file_, line_, failure_message);
+  }
+
+  // Expects that the ON_CALL() statement has a certain property.
   void ExpectSpecProperty(bool property,
                           const std::string& failure_message) const {
-    Expect(property, file_, line_, failure_message); 
-  } 
- 
-  const char* file_; 
-  int line_; 
- 
-  // The last clause in the ON_CALL() statement as seen so far. 
-  // Initially kNone and changes as the statement is parsed. 
-  Clause last_clause_; 
-};  // class UntypedOnCallSpecBase 
- 
-// This template class implements an ON_CALL spec. 
-template <typename F> 
-class OnCallSpec : public UntypedOnCallSpecBase { 
- public: 
-  typedef typename Function<F>::ArgumentTuple ArgumentTuple; 
-  typedef typename Function<F>::ArgumentMatcherTuple ArgumentMatcherTuple; 
- 
-  // Constructs an OnCallSpec object from the information inside 
-  // the parenthesis of an ON_CALL() statement. 
-  OnCallSpec(const char* a_file, int a_line, 
-             const ArgumentMatcherTuple& matchers) 
-      : UntypedOnCallSpecBase(a_file, a_line), 
-        matchers_(matchers), 
-        // By default, extra_matcher_ should match anything.  However, 
+    Expect(property, file_, line_, failure_message);
+  }
+
+  const char* file_;
+  int line_;
+
+  // The last clause in the ON_CALL() statement as seen so far.
+  // Initially kNone and changes as the statement is parsed.
+  Clause last_clause_;
+};  // class UntypedOnCallSpecBase
+
+// This template class implements an ON_CALL spec.
+template <typename F>
+class OnCallSpec : public UntypedOnCallSpecBase {
+ public:
+  typedef typename Function<F>::ArgumentTuple ArgumentTuple;
+  typedef typename Function<F>::ArgumentMatcherTuple ArgumentMatcherTuple;
+
+  // Constructs an OnCallSpec object from the information inside
+  // the parenthesis of an ON_CALL() statement.
+  OnCallSpec(const char* a_file, int a_line,
+             const ArgumentMatcherTuple& matchers)
+      : UntypedOnCallSpecBase(a_file, a_line),
+        matchers_(matchers),
+        // By default, extra_matcher_ should match anything.  However,
         // we cannot initialize it with _ as that causes ambiguity between
         // Matcher's copy and move constructor for some argument types.
         extra_matcher_(A<const ArgumentTuple&>()) {}
- 
-  // Implements the .With() clause. 
-  OnCallSpec& With(const Matcher<const ArgumentTuple&>& m) { 
-    // Makes sure this is called at most once. 
-    ExpectSpecProperty(last_clause_ < kWith, 
-                       ".With() cannot appear " 
-                       "more than once in an ON_CALL()."); 
-    last_clause_ = kWith; 
- 
-    extra_matcher_ = m; 
-    return *this; 
-  } 
- 
-  // Implements the .WillByDefault() clause. 
-  OnCallSpec& WillByDefault(const Action<F>& action) { 
-    ExpectSpecProperty(last_clause_ < kWillByDefault, 
-                       ".WillByDefault() must appear " 
-                       "exactly once in an ON_CALL()."); 
-    last_clause_ = kWillByDefault; 
- 
-    ExpectSpecProperty(!action.IsDoDefault(), 
-                       "DoDefault() cannot be used in ON_CALL()."); 
-    action_ = action; 
-    return *this; 
-  } 
- 
+
+  // Implements the .With() clause.
+  OnCallSpec& With(const Matcher<const ArgumentTuple&>& m) {
+    // Makes sure this is called at most once.
+    ExpectSpecProperty(last_clause_ < kWith,
+                       ".With() cannot appear "
+                       "more than once in an ON_CALL().");
+    last_clause_ = kWith;
+
+    extra_matcher_ = m;
+    return *this;
+  }
+
+  // Implements the .WillByDefault() clause.
+  OnCallSpec& WillByDefault(const Action<F>& action) {
+    ExpectSpecProperty(last_clause_ < kWillByDefault,
+                       ".WillByDefault() must appear "
+                       "exactly once in an ON_CALL().");
+    last_clause_ = kWillByDefault;
+
+    ExpectSpecProperty(!action.IsDoDefault(),
+                       "DoDefault() cannot be used in ON_CALL().");
+    action_ = action;
+    return *this;
+  }
+
   // Returns true if and only if the given arguments match the matchers.
-  bool Matches(const ArgumentTuple& args) const { 
-    return TupleMatches(matchers_, args) && extra_matcher_.Matches(args); 
-  } 
- 
-  // Returns the action specified by the user. 
-  const Action<F>& GetAction() const { 
-    AssertSpecProperty(last_clause_ == kWillByDefault, 
-                       ".WillByDefault() must appear exactly " 
-                       "once in an ON_CALL()."); 
-    return action_; 
-  } 
- 
- private: 
-  // The information in statement 
-  // 
-  //   ON_CALL(mock_object, Method(matchers)) 
-  //       .With(multi-argument-matcher) 
-  //       .WillByDefault(action); 
-  // 
-  // is recorded in the data members like this: 
-  // 
-  //   source file that contains the statement => file_ 
-  //   line number of the statement            => line_ 
-  //   matchers                                => matchers_ 
-  //   multi-argument-matcher                  => extra_matcher_ 
-  //   action                                  => action_ 
-  ArgumentMatcherTuple matchers_; 
-  Matcher<const ArgumentTuple&> extra_matcher_; 
-  Action<F> action_; 
-};  // class OnCallSpec 
- 
-// Possible reactions on uninteresting calls. 
-enum CallReaction { 
-  kAllow, 
-  kWarn, 
-  kFail, 
-}; 
- 
-}  // namespace internal 
- 
-// Utilities for manipulating mock objects. 
-class GTEST_API_ Mock { 
- public: 
-  // The following public methods can be called concurrently. 
- 
-  // Tells Google Mock to ignore mock_obj when checking for leaked 
-  // mock objects. 
-  static void AllowLeak(const void* mock_obj) 
-      GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex); 
- 
-  // Verifies and clears all expectations on the given mock object. 
-  // If the expectations aren't satisfied, generates one or more 
-  // Google Test non-fatal failures and returns false. 
-  static bool VerifyAndClearExpectations(void* mock_obj) 
-      GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex); 
- 
-  // Verifies all expectations on the given mock object and clears its 
+  bool Matches(const ArgumentTuple& args) const {
+    return TupleMatches(matchers_, args) && extra_matcher_.Matches(args);
+  }
+
+  // Returns the action specified by the user.
+  const Action<F>& GetAction() const {
+    AssertSpecProperty(last_clause_ == kWillByDefault,
+                       ".WillByDefault() must appear exactly "
+                       "once in an ON_CALL().");
+    return action_;
+  }
+
+ private:
+  // The information in statement
+  //
+  //   ON_CALL(mock_object, Method(matchers))
+  //       .With(multi-argument-matcher)
+  //       .WillByDefault(action);
+  //
+  // is recorded in the data members like this:
+  //
+  //   source file that contains the statement => file_
+  //   line number of the statement            => line_
+  //   matchers                                => matchers_
+  //   multi-argument-matcher                  => extra_matcher_
+  //   action                                  => action_
+  ArgumentMatcherTuple matchers_;
+  Matcher<const ArgumentTuple&> extra_matcher_;
+  Action<F> action_;
+};  // class OnCallSpec
+
+// Possible reactions on uninteresting calls.
+enum CallReaction {
+  kAllow,
+  kWarn,
+  kFail,
+};
+
+}  // namespace internal
+
+// Utilities for manipulating mock objects.
+class GTEST_API_ Mock {
+ public:
+  // The following public methods can be called concurrently.
+
+  // Tells Google Mock to ignore mock_obj when checking for leaked
+  // mock objects.
+  static void AllowLeak(const void* mock_obj)
+      GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
+
+  // Verifies and clears all expectations on the given mock object.
+  // If the expectations aren't satisfied, generates one or more
+  // Google Test non-fatal failures and returns false.
+  static bool VerifyAndClearExpectations(void* mock_obj)
+      GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
+
+  // Verifies all expectations on the given mock object and clears its
   // default actions and expectations.  Returns true if and only if the
-  // verification was successful. 
-  static bool VerifyAndClear(void* mock_obj) 
-      GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex); 
- 
+  // verification was successful.
+  static bool VerifyAndClear(void* mock_obj)
+      GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
+
   // Returns whether the mock was created as a naggy mock (default)
   static bool IsNaggy(void* mock_obj)
       GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
@@ -413,880 +413,880 @@ class GTEST_API_ Mock {
   static bool IsStrict(void* mock_obj)
       GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
 
- private: 
-  friend class internal::UntypedFunctionMockerBase; 
- 
-  // Needed for a function mocker to register itself (so that we know 
-  // how to clear a mock object). 
-  template <typename F> 
+ private:
+  friend class internal::UntypedFunctionMockerBase;
+
+  // Needed for a function mocker to register itself (so that we know
+  // how to clear a mock object).
+  template <typename F>
   friend class internal::FunctionMocker;
- 
+
   template <typename MockClass>
   friend class internal::NiceMockImpl;
   template <typename MockClass>
   friend class internal::NaggyMockImpl;
   template <typename MockClass>
   friend class internal::StrictMockImpl;
- 
-  // Tells Google Mock to allow uninteresting calls on the given mock 
-  // object. 
-  static void AllowUninterestingCalls(const void* mock_obj) 
-      GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex); 
- 
-  // Tells Google Mock to warn the user about uninteresting calls on 
-  // the given mock object. 
-  static void WarnUninterestingCalls(const void* mock_obj) 
-      GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex); 
- 
-  // Tells Google Mock to fail uninteresting calls on the given mock 
-  // object. 
-  static void FailUninterestingCalls(const void* mock_obj) 
-      GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex); 
- 
-  // Tells Google Mock the given mock object is being destroyed and 
-  // its entry in the call-reaction table should be removed. 
-  static void UnregisterCallReaction(const void* mock_obj) 
-      GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex); 
- 
-  // Returns the reaction Google Mock will have on uninteresting calls 
-  // made on the given mock object. 
-  static internal::CallReaction GetReactionOnUninterestingCalls( 
-      const void* mock_obj) 
-          GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex); 
- 
-  // Verifies that all expectations on the given mock object have been 
-  // satisfied.  Reports one or more Google Test non-fatal failures 
-  // and returns false if not. 
-  static bool VerifyAndClearExpectationsLocked(void* mock_obj) 
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(internal::g_gmock_mutex); 
- 
-  // Clears all ON_CALL()s set on the given mock object. 
-  static void ClearDefaultActionsLocked(void* mock_obj) 
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(internal::g_gmock_mutex); 
- 
-  // Registers a mock object and a mock method it owns. 
-  static void Register( 
-      const void* mock_obj, 
-      internal::UntypedFunctionMockerBase* mocker) 
-          GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex); 
- 
-  // Tells Google Mock where in the source code mock_obj is used in an 
-  // ON_CALL or EXPECT_CALL.  In case mock_obj is leaked, this 
-  // information helps the user identify which object it is. 
-  static void RegisterUseByOnCallOrExpectCall( 
-      const void* mock_obj, const char* file, int line) 
-          GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex); 
- 
-  // Unregisters a mock method; removes the owning mock object from 
-  // the registry when the last mock method associated with it has 
-  // been unregistered.  This is called only in the destructor of 
+
+  // Tells Google Mock to allow uninteresting calls on the given mock
+  // object.
+  static void AllowUninterestingCalls(const void* mock_obj)
+      GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
+
+  // Tells Google Mock to warn the user about uninteresting calls on
+  // the given mock object.
+  static void WarnUninterestingCalls(const void* mock_obj)
+      GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
+
+  // Tells Google Mock to fail uninteresting calls on the given mock
+  // object.
+  static void FailUninterestingCalls(const void* mock_obj)
+      GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
+
+  // Tells Google Mock the given mock object is being destroyed and
+  // its entry in the call-reaction table should be removed.
+  static void UnregisterCallReaction(const void* mock_obj)
+      GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
+
+  // Returns the reaction Google Mock will have on uninteresting calls
+  // made on the given mock object.
+  static internal::CallReaction GetReactionOnUninterestingCalls(
+      const void* mock_obj)
+          GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
+
+  // Verifies that all expectations on the given mock object have been
+  // satisfied.  Reports one or more Google Test non-fatal failures
+  // and returns false if not.
+  static bool VerifyAndClearExpectationsLocked(void* mock_obj)
+      GTEST_EXCLUSIVE_LOCK_REQUIRED_(internal::g_gmock_mutex);
+
+  // Clears all ON_CALL()s set on the given mock object.
+  static void ClearDefaultActionsLocked(void* mock_obj)
+      GTEST_EXCLUSIVE_LOCK_REQUIRED_(internal::g_gmock_mutex);
+
+  // Registers a mock object and a mock method it owns.
+  static void Register(
+      const void* mock_obj,
+      internal::UntypedFunctionMockerBase* mocker)
+          GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
+
+  // Tells Google Mock where in the source code mock_obj is used in an
+  // ON_CALL or EXPECT_CALL.  In case mock_obj is leaked, this
+  // information helps the user identify which object it is.
+  static void RegisterUseByOnCallOrExpectCall(
+      const void* mock_obj, const char* file, int line)
+          GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
+
+  // Unregisters a mock method; removes the owning mock object from
+  // the registry when the last mock method associated with it has
+  // been unregistered.  This is called only in the destructor of
   // FunctionMocker.
-  static void UnregisterLocked(internal::UntypedFunctionMockerBase* mocker) 
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(internal::g_gmock_mutex); 
-};  // class Mock 
- 
-// An abstract handle of an expectation.  Useful in the .After() 
-// clause of EXPECT_CALL() for setting the (partial) order of 
-// expectations.  The syntax: 
-// 
-//   Expectation e1 = EXPECT_CALL(...)...; 
-//   EXPECT_CALL(...).After(e1)...; 
-// 
-// sets two expectations where the latter can only be matched after 
-// the former has been satisfied. 
-// 
-// Notes: 
-//   - This class is copyable and has value semantics. 
-//   - Constness is shallow: a const Expectation object itself cannot 
-//     be modified, but the mutable methods of the ExpectationBase 
-//     object it references can be called via expectation_base(). 
-
-class GTEST_API_ Expectation { 
- public: 
-  // Constructs a null object that doesn't reference any expectation. 
-  Expectation(); 
+  static void UnregisterLocked(internal::UntypedFunctionMockerBase* mocker)
+      GTEST_EXCLUSIVE_LOCK_REQUIRED_(internal::g_gmock_mutex);
+};  // class Mock
+
+// An abstract handle of an expectation.  Useful in the .After()
+// clause of EXPECT_CALL() for setting the (partial) order of
+// expectations.  The syntax:
+//
+//   Expectation e1 = EXPECT_CALL(...)...;
+//   EXPECT_CALL(...).After(e1)...;
+//
+// sets two expectations where the latter can only be matched after
+// the former has been satisfied.
+//
+// Notes:
+//   - This class is copyable and has value semantics.
+//   - Constness is shallow: a const Expectation object itself cannot
+//     be modified, but the mutable methods of the ExpectationBase
+//     object it references can be called via expectation_base().
+
+class GTEST_API_ Expectation {
+ public:
+  // Constructs a null object that doesn't reference any expectation.
+  Expectation();
   Expectation(Expectation&&) = default;
   Expectation(const Expectation&) = default;
   Expectation& operator=(Expectation&&) = default;
   Expectation& operator=(const Expectation&) = default;
-  ~Expectation(); 
- 
-  // This single-argument ctor must not be explicit, in order to support the 
-  //   Expectation e = EXPECT_CALL(...); 
-  // syntax. 
-  // 
-  // A TypedExpectation object stores its pre-requisites as 
-  // Expectation objects, and needs to call the non-const Retire() 
-  // method on the ExpectationBase objects they reference.  Therefore 
-  // Expectation must receive a *non-const* reference to the 
-  // ExpectationBase object. 
-  Expectation(internal::ExpectationBase& exp);  // NOLINT 
- 
-  // The compiler-generated copy ctor and operator= work exactly as 
-  // intended, so we don't need to define our own. 
- 
+  ~Expectation();
+
+  // This single-argument ctor must not be explicit, in order to support the
+  //   Expectation e = EXPECT_CALL(...);
+  // syntax.
+  //
+  // A TypedExpectation object stores its pre-requisites as
+  // Expectation objects, and needs to call the non-const Retire()
+  // method on the ExpectationBase objects they reference.  Therefore
+  // Expectation must receive a *non-const* reference to the
+  // ExpectationBase object.
+  Expectation(internal::ExpectationBase& exp);  // NOLINT
+
+  // The compiler-generated copy ctor and operator= work exactly as
+  // intended, so we don't need to define our own.
+
   // Returns true if and only if rhs references the same expectation as this
   // object does.
-  bool operator==(const Expectation& rhs) const { 
-    return expectation_base_ == rhs.expectation_base_; 
-  } 
- 
-  bool operator!=(const Expectation& rhs) const { return !(*this == rhs); } 
- 
- private: 
-  friend class ExpectationSet; 
-  friend class Sequence; 
-  friend class ::testing::internal::ExpectationBase; 
-  friend class ::testing::internal::UntypedFunctionMockerBase; 
- 
-  template <typename F> 
+  bool operator==(const Expectation& rhs) const {
+    return expectation_base_ == rhs.expectation_base_;
+  }
+
+  bool operator!=(const Expectation& rhs) const { return !(*this == rhs); }
+
+ private:
+  friend class ExpectationSet;
+  friend class Sequence;
+  friend class ::testing::internal::ExpectationBase;
+  friend class ::testing::internal::UntypedFunctionMockerBase;
+
+  template <typename F>
   friend class ::testing::internal::FunctionMocker;
- 
-  template <typename F> 
-  friend class ::testing::internal::TypedExpectation; 
- 
-  // This comparator is needed for putting Expectation objects into a set. 
-  class Less { 
-   public: 
-    bool operator()(const Expectation& lhs, const Expectation& rhs) const { 
-      return lhs.expectation_base_.get() < rhs.expectation_base_.get(); 
-    } 
-  }; 
- 
-  typedef ::std::set<Expectation, Less> Set; 
- 
-  Expectation( 
+
+  template <typename F>
+  friend class ::testing::internal::TypedExpectation;
+
+  // This comparator is needed for putting Expectation objects into a set.
+  class Less {
+   public:
+    bool operator()(const Expectation& lhs, const Expectation& rhs) const {
+      return lhs.expectation_base_.get() < rhs.expectation_base_.get();
+    }
+  };
+
+  typedef ::std::set<Expectation, Less> Set;
+
+  Expectation(
       const std::shared_ptr<internal::ExpectationBase>& expectation_base);
- 
-  // Returns the expectation this object references. 
+
+  // Returns the expectation this object references.
   const std::shared_ptr<internal::ExpectationBase>& expectation_base() const {
-    return expectation_base_; 
-  } 
- 
+    return expectation_base_;
+  }
+
   // A shared_ptr that co-owns the expectation this handle references.
   std::shared_ptr<internal::ExpectationBase> expectation_base_;
-}; 
- 
-// A set of expectation handles.  Useful in the .After() clause of 
-// EXPECT_CALL() for setting the (partial) order of expectations.  The 
-// syntax: 
-// 
-//   ExpectationSet es; 
-//   es += EXPECT_CALL(...)...; 
-//   es += EXPECT_CALL(...)...; 
-//   EXPECT_CALL(...).After(es)...; 
-// 
-// sets three expectations where the last one can only be matched 
-// after the first two have both been satisfied. 
-// 
-// This class is copyable and has value semantics. 
-class ExpectationSet { 
- public: 
-  // A bidirectional iterator that can read a const element in the set. 
-  typedef Expectation::Set::const_iterator const_iterator; 
- 
-  // An object stored in the set.  This is an alias of Expectation. 
-  typedef Expectation::Set::value_type value_type; 
- 
-  // Constructs an empty set. 
-  ExpectationSet() {} 
- 
-  // This single-argument ctor must not be explicit, in order to support the 
-  //   ExpectationSet es = EXPECT_CALL(...); 
-  // syntax. 
-  ExpectationSet(internal::ExpectationBase& exp) {  // NOLINT 
-    *this += Expectation(exp); 
-  } 
- 
-  // This single-argument ctor implements implicit conversion from 
-  // Expectation and thus must not be explicit.  This allows either an 
-  // Expectation or an ExpectationSet to be used in .After(). 
-  ExpectationSet(const Expectation& e) {  // NOLINT 
-    *this += e; 
-  } 
- 
-  // The compiler-generator ctor and operator= works exactly as 
-  // intended, so we don't need to define our own. 
- 
+};
+
+// A set of expectation handles.  Useful in the .After() clause of
+// EXPECT_CALL() for setting the (partial) order of expectations.  The
+// syntax:
+//
+//   ExpectationSet es;
+//   es += EXPECT_CALL(...)...;
+//   es += EXPECT_CALL(...)...;
+//   EXPECT_CALL(...).After(es)...;
+//
+// sets three expectations where the last one can only be matched
+// after the first two have both been satisfied.
+//
+// This class is copyable and has value semantics.
+class ExpectationSet {
+ public:
+  // A bidirectional iterator that can read a const element in the set.
+  typedef Expectation::Set::const_iterator const_iterator;
+
+  // An object stored in the set.  This is an alias of Expectation.
+  typedef Expectation::Set::value_type value_type;
+
+  // Constructs an empty set.
+  ExpectationSet() {}
+
+  // This single-argument ctor must not be explicit, in order to support the
+  //   ExpectationSet es = EXPECT_CALL(...);
+  // syntax.
+  ExpectationSet(internal::ExpectationBase& exp) {  // NOLINT
+    *this += Expectation(exp);
+  }
+
+  // This single-argument ctor implements implicit conversion from
+  // Expectation and thus must not be explicit.  This allows either an
+  // Expectation or an ExpectationSet to be used in .After().
+  ExpectationSet(const Expectation& e) {  // NOLINT
+    *this += e;
+  }
+
+  // The compiler-generator ctor and operator= works exactly as
+  // intended, so we don't need to define our own.
+
   // Returns true if and only if rhs contains the same set of Expectation
   // objects as this does.
-  bool operator==(const ExpectationSet& rhs) const { 
-    return expectations_ == rhs.expectations_; 
-  } 
- 
-  bool operator!=(const ExpectationSet& rhs) const { return !(*this == rhs); } 
- 
-  // Implements the syntax 
-  //   expectation_set += EXPECT_CALL(...); 
-  ExpectationSet& operator+=(const Expectation& e) { 
-    expectations_.insert(e); 
-    return *this; 
-  } 
- 
-  int size() const { return static_cast<int>(expectations_.size()); } 
- 
-  const_iterator begin() const { return expectations_.begin(); } 
-  const_iterator end() const { return expectations_.end(); } 
- 
- private: 
-  Expectation::Set expectations_; 
-}; 
- 
- 
-// Sequence objects are used by a user to specify the relative order 
-// in which the expectations should match.  They are copyable (we rely 
-// on the compiler-defined copy constructor and assignment operator). 
-class GTEST_API_ Sequence { 
- public: 
-  // Constructs an empty sequence. 
-  Sequence() : last_expectation_(new Expectation) {} 
- 
-  // Adds an expectation to this sequence.  The caller must ensure 
-  // that no other thread is accessing this Sequence object. 
-  void AddExpectation(const Expectation& expectation) const; 
- 
- private: 
+  bool operator==(const ExpectationSet& rhs) const {
+    return expectations_ == rhs.expectations_;
+  }
+
+  bool operator!=(const ExpectationSet& rhs) const { return !(*this == rhs); }
+
+  // Implements the syntax
+  //   expectation_set += EXPECT_CALL(...);
+  ExpectationSet& operator+=(const Expectation& e) {
+    expectations_.insert(e);
+    return *this;
+  }
+
+  int size() const { return static_cast<int>(expectations_.size()); }
+
+  const_iterator begin() const { return expectations_.begin(); }
+  const_iterator end() const { return expectations_.end(); }
+
+ private:
+  Expectation::Set expectations_;
+};
+
+
+// Sequence objects are used by a user to specify the relative order
+// in which the expectations should match.  They are copyable (we rely
+// on the compiler-defined copy constructor and assignment operator).
+class GTEST_API_ Sequence {
+ public:
+  // Constructs an empty sequence.
+  Sequence() : last_expectation_(new Expectation) {}
+
+  // Adds an expectation to this sequence.  The caller must ensure
+  // that no other thread is accessing this Sequence object.
+  void AddExpectation(const Expectation& expectation) const;
+
+ private:
   // The last expectation in this sequence.
   std::shared_ptr<Expectation> last_expectation_;
-};  // class Sequence 
- 
-// An object of this type causes all EXPECT_CALL() statements 
-// encountered in its scope to be put in an anonymous sequence.  The 
-// work is done in the constructor and destructor.  You should only 
-// create an InSequence object on the stack. 
-// 
-// The sole purpose for this class is to support easy definition of 
-// sequential expectations, e.g. 
-// 
-//   { 
-//     InSequence dummy;  // The name of the object doesn't matter. 
-// 
-//     // The following expectations must match in the order they appear. 
-//     EXPECT_CALL(a, Bar())...; 
-//     EXPECT_CALL(a, Baz())...; 
-//     ... 
-//     EXPECT_CALL(b, Xyz())...; 
-//   } 
-// 
-// You can create InSequence objects in multiple threads, as long as 
-// they are used to affect different mock objects.  The idea is that 
-// each thread can create and set up its own mocks as if it's the only 
-// thread.  However, for clarity of your tests we recommend you to set 
-// up mocks in the main thread unless you have a good reason not to do 
-// so. 
-class GTEST_API_ InSequence { 
- public: 
-  InSequence(); 
-  ~InSequence(); 
- private: 
-  bool sequence_created_; 
- 
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(InSequence);  // NOLINT 
-} GTEST_ATTRIBUTE_UNUSED_; 
- 
-namespace internal { 
- 
-// Points to the implicit sequence introduced by a living InSequence 
-// object (if any) in the current thread or NULL. 
-GTEST_API_ extern ThreadLocal<Sequence*> g_gmock_implicit_sequence; 
- 
-// Base class for implementing expectations. 
-// 
-// There are two reasons for having a type-agnostic base class for 
-// Expectation: 
-// 
-//   1. We need to store collections of expectations of different 
-//   types (e.g. all pre-requisites of a particular expectation, all 
-//   expectations in a sequence).  Therefore these expectation objects 
-//   must share a common base class. 
-// 
-//   2. We can avoid binary code bloat by moving methods not depending 
-//   on the template argument of Expectation to the base class. 
-// 
-// This class is internal and mustn't be used by user code directly. 
-class GTEST_API_ ExpectationBase { 
- public: 
-  // source_text is the EXPECT_CALL(...) source that created this Expectation. 
+};  // class Sequence
+
+// An object of this type causes all EXPECT_CALL() statements
+// encountered in its scope to be put in an anonymous sequence.  The
+// work is done in the constructor and destructor.  You should only
+// create an InSequence object on the stack.
+//
+// The sole purpose for this class is to support easy definition of
+// sequential expectations, e.g.
+//
+//   {
+//     InSequence dummy;  // The name of the object doesn't matter.
+//
+//     // The following expectations must match in the order they appear.
+//     EXPECT_CALL(a, Bar())...;
+//     EXPECT_CALL(a, Baz())...;
+//     ...
+//     EXPECT_CALL(b, Xyz())...;
+//   }
+//
+// You can create InSequence objects in multiple threads, as long as
+// they are used to affect different mock objects.  The idea is that
+// each thread can create and set up its own mocks as if it's the only
+// thread.  However, for clarity of your tests we recommend you to set
+// up mocks in the main thread unless you have a good reason not to do
+// so.
+class GTEST_API_ InSequence {
+ public:
+  InSequence();
+  ~InSequence();
+ private:
+  bool sequence_created_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(InSequence);  // NOLINT
+} GTEST_ATTRIBUTE_UNUSED_;
+
+namespace internal {
+
+// Points to the implicit sequence introduced by a living InSequence
+// object (if any) in the current thread or NULL.
+GTEST_API_ extern ThreadLocal<Sequence*> g_gmock_implicit_sequence;
+
+// Base class for implementing expectations.
+//
+// There are two reasons for having a type-agnostic base class for
+// Expectation:
+//
+//   1. We need to store collections of expectations of different
+//   types (e.g. all pre-requisites of a particular expectation, all
+//   expectations in a sequence).  Therefore these expectation objects
+//   must share a common base class.
+//
+//   2. We can avoid binary code bloat by moving methods not depending
+//   on the template argument of Expectation to the base class.
+//
+// This class is internal and mustn't be used by user code directly.
+class GTEST_API_ ExpectationBase {
+ public:
+  // source_text is the EXPECT_CALL(...) source that created this Expectation.
   ExpectationBase(const char* file, int line, const std::string& source_text);
- 
-  virtual ~ExpectationBase(); 
- 
-  // Where in the source file was the expectation spec defined? 
-  const char* file() const { return file_; } 
-  int line() const { return line_; } 
-  const char* source_text() const { return source_text_.c_str(); } 
-  // Returns the cardinality specified in the expectation spec. 
-  const Cardinality& cardinality() const { return cardinality_; } 
- 
-  // Describes the source file location of this expectation. 
-  void DescribeLocationTo(::std::ostream* os) const { 
-    *os << FormatFileLocation(file(), line()) << " "; 
-  } 
- 
-  // Describes how many times a function call matching this 
-  // expectation has occurred. 
-  void DescribeCallCountTo(::std::ostream* os) const 
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex); 
- 
-  // If this mock method has an extra matcher (i.e. .With(matcher)), 
-  // describes it to the ostream. 
-  virtual void MaybeDescribeExtraMatcherTo(::std::ostream* os) = 0; 
- 
- protected: 
-  friend class ::testing::Expectation; 
-  friend class UntypedFunctionMockerBase; 
- 
-  enum Clause { 
-    // Don't change the order of the enum members! 
-    kNone, 
-    kWith, 
-    kTimes, 
-    kInSequence, 
-    kAfter, 
-    kWillOnce, 
-    kWillRepeatedly, 
-    kRetiresOnSaturation 
-  }; 
- 
-  typedef std::vector<const void*> UntypedActions; 
- 
-  // Returns an Expectation object that references and co-owns this 
-  // expectation. 
-  virtual Expectation GetHandle() = 0; 
- 
-  // Asserts that the EXPECT_CALL() statement has the given property. 
+
+  virtual ~ExpectationBase();
+
+  // Where in the source file was the expectation spec defined?
+  const char* file() const { return file_; }
+  int line() const { return line_; }
+  const char* source_text() const { return source_text_.c_str(); }
+  // Returns the cardinality specified in the expectation spec.
+  const Cardinality& cardinality() const { return cardinality_; }
+
+  // Describes the source file location of this expectation.
+  void DescribeLocationTo(::std::ostream* os) const {
+    *os << FormatFileLocation(file(), line()) << " ";
+  }
+
+  // Describes how many times a function call matching this
+  // expectation has occurred.
+  void DescribeCallCountTo(::std::ostream* os) const
+      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex);
+
+  // If this mock method has an extra matcher (i.e. .With(matcher)),
+  // describes it to the ostream.
+  virtual void MaybeDescribeExtraMatcherTo(::std::ostream* os) = 0;
+
+ protected:
+  friend class ::testing::Expectation;
+  friend class UntypedFunctionMockerBase;
+
+  enum Clause {
+    // Don't change the order of the enum members!
+    kNone,
+    kWith,
+    kTimes,
+    kInSequence,
+    kAfter,
+    kWillOnce,
+    kWillRepeatedly,
+    kRetiresOnSaturation
+  };
+
+  typedef std::vector<const void*> UntypedActions;
+
+  // Returns an Expectation object that references and co-owns this
+  // expectation.
+  virtual Expectation GetHandle() = 0;
+
+  // Asserts that the EXPECT_CALL() statement has the given property.
   void AssertSpecProperty(bool property,
                           const std::string& failure_message) const {
-    Assert(property, file_, line_, failure_message); 
-  } 
- 
-  // Expects that the EXPECT_CALL() statement has the given property. 
+    Assert(property, file_, line_, failure_message);
+  }
+
+  // Expects that the EXPECT_CALL() statement has the given property.
   void ExpectSpecProperty(bool property,
                           const std::string& failure_message) const {
-    Expect(property, file_, line_, failure_message); 
-  } 
- 
-  // Explicitly specifies the cardinality of this expectation.  Used 
-  // by the subclasses to implement the .Times() clause. 
-  void SpecifyCardinality(const Cardinality& cardinality); 
- 
+    Expect(property, file_, line_, failure_message);
+  }
+
+  // Explicitly specifies the cardinality of this expectation.  Used
+  // by the subclasses to implement the .Times() clause.
+  void SpecifyCardinality(const Cardinality& cardinality);
+
   // Returns true if and only if the user specified the cardinality
   // explicitly using a .Times().
-  bool cardinality_specified() const { return cardinality_specified_; } 
- 
-  // Sets the cardinality of this expectation spec. 
-  void set_cardinality(const Cardinality& a_cardinality) { 
-    cardinality_ = a_cardinality; 
-  } 
- 
-  // The following group of methods should only be called after the 
-  // EXPECT_CALL() statement, and only when g_gmock_mutex is held by 
-  // the current thread. 
- 
-  // Retires all pre-requisites of this expectation. 
-  void RetireAllPreRequisites() 
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex); 
- 
+  bool cardinality_specified() const { return cardinality_specified_; }
+
+  // Sets the cardinality of this expectation spec.
+  void set_cardinality(const Cardinality& a_cardinality) {
+    cardinality_ = a_cardinality;
+  }
+
+  // The following group of methods should only be called after the
+  // EXPECT_CALL() statement, and only when g_gmock_mutex is held by
+  // the current thread.
+
+  // Retires all pre-requisites of this expectation.
+  void RetireAllPreRequisites()
+      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex);
+
   // Returns true if and only if this expectation is retired.
-  bool is_retired() const 
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) { 
-    g_gmock_mutex.AssertHeld(); 
-    return retired_; 
-  } 
- 
-  // Retires this expectation. 
-  void Retire() 
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) { 
-    g_gmock_mutex.AssertHeld(); 
-    retired_ = true; 
-  } 
- 
+  bool is_retired() const
+      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+    g_gmock_mutex.AssertHeld();
+    return retired_;
+  }
+
+  // Retires this expectation.
+  void Retire()
+      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+    g_gmock_mutex.AssertHeld();
+    retired_ = true;
+  }
+
   // Returns true if and only if this expectation is satisfied.
-  bool IsSatisfied() const 
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) { 
-    g_gmock_mutex.AssertHeld(); 
-    return cardinality().IsSatisfiedByCallCount(call_count_); 
-  } 
- 
+  bool IsSatisfied() const
+      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+    g_gmock_mutex.AssertHeld();
+    return cardinality().IsSatisfiedByCallCount(call_count_);
+  }
+
   // Returns true if and only if this expectation is saturated.
-  bool IsSaturated() const 
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) { 
-    g_gmock_mutex.AssertHeld(); 
-    return cardinality().IsSaturatedByCallCount(call_count_); 
-  } 
- 
+  bool IsSaturated() const
+      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+    g_gmock_mutex.AssertHeld();
+    return cardinality().IsSaturatedByCallCount(call_count_);
+  }
+
   // Returns true if and only if this expectation is over-saturated.
-  bool IsOverSaturated() const 
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) { 
-    g_gmock_mutex.AssertHeld(); 
-    return cardinality().IsOverSaturatedByCallCount(call_count_); 
-  } 
- 
+  bool IsOverSaturated() const
+      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+    g_gmock_mutex.AssertHeld();
+    return cardinality().IsOverSaturatedByCallCount(call_count_);
+  }
+
   // Returns true if and only if all pre-requisites of this expectation are
   // satisfied.
-  bool AllPrerequisitesAreSatisfied() const 
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex); 
- 
-  // Adds unsatisfied pre-requisites of this expectation to 'result'. 
-  void FindUnsatisfiedPrerequisites(ExpectationSet* result) const 
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex); 
- 
-  // Returns the number this expectation has been invoked. 
-  int call_count() const 
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) { 
-    g_gmock_mutex.AssertHeld(); 
-    return call_count_; 
-  } 
- 
-  // Increments the number this expectation has been invoked. 
-  void IncrementCallCount() 
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) { 
-    g_gmock_mutex.AssertHeld(); 
-    call_count_++; 
-  } 
- 
-  // Checks the action count (i.e. the number of WillOnce() and 
-  // WillRepeatedly() clauses) against the cardinality if this hasn't 
-  // been done before.  Prints a warning if there are too many or too 
-  // few actions. 
-  void CheckActionCountIfNotDone() const 
-      GTEST_LOCK_EXCLUDED_(mutex_); 
- 
-  friend class ::testing::Sequence; 
-  friend class ::testing::internal::ExpectationTester; 
- 
-  template <typename Function> 
-  friend class TypedExpectation; 
- 
-  // Implements the .Times() clause. 
-  void UntypedTimes(const Cardinality& a_cardinality); 
- 
-  // This group of fields are part of the spec and won't change after 
-  // an EXPECT_CALL() statement finishes. 
-  const char* file_;          // The file that contains the expectation. 
-  int line_;                  // The line number of the expectation. 
+  bool AllPrerequisitesAreSatisfied() const
+      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex);
+
+  // Adds unsatisfied pre-requisites of this expectation to 'result'.
+  void FindUnsatisfiedPrerequisites(ExpectationSet* result) const
+      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex);
+
+  // Returns the number this expectation has been invoked.
+  int call_count() const
+      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+    g_gmock_mutex.AssertHeld();
+    return call_count_;
+  }
+
+  // Increments the number this expectation has been invoked.
+  void IncrementCallCount()
+      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+    g_gmock_mutex.AssertHeld();
+    call_count_++;
+  }
+
+  // Checks the action count (i.e. the number of WillOnce() and
+  // WillRepeatedly() clauses) against the cardinality if this hasn't
+  // been done before.  Prints a warning if there are too many or too
+  // few actions.
+  void CheckActionCountIfNotDone() const
+      GTEST_LOCK_EXCLUDED_(mutex_);
+
+  friend class ::testing::Sequence;
+  friend class ::testing::internal::ExpectationTester;
+
+  template <typename Function>
+  friend class TypedExpectation;
+
+  // Implements the .Times() clause.
+  void UntypedTimes(const Cardinality& a_cardinality);
+
+  // This group of fields are part of the spec and won't change after
+  // an EXPECT_CALL() statement finishes.
+  const char* file_;          // The file that contains the expectation.
+  int line_;                  // The line number of the expectation.
   const std::string source_text_;  // The EXPECT_CALL(...) source text.
   // True if and only if the cardinality is specified explicitly.
-  bool cardinality_specified_; 
-  Cardinality cardinality_;            // The cardinality of the expectation. 
-  // The immediate pre-requisites (i.e. expectations that must be 
-  // satisfied before this expectation can be matched) of this 
+  bool cardinality_specified_;
+  Cardinality cardinality_;            // The cardinality of the expectation.
+  // The immediate pre-requisites (i.e. expectations that must be
+  // satisfied before this expectation can be matched) of this
   // expectation.  We use std::shared_ptr in the set because we want an
-  // Expectation object to be co-owned by its FunctionMocker and its 
-  // successors.  This allows multiple mock objects to be deleted at 
-  // different times. 
-  ExpectationSet immediate_prerequisites_; 
- 
-  // This group of fields are the current state of the expectation, 
-  // and can change as the mock function is called. 
-  int call_count_;  // How many times this expectation has been invoked. 
+  // Expectation object to be co-owned by its FunctionMocker and its
+  // successors.  This allows multiple mock objects to be deleted at
+  // different times.
+  ExpectationSet immediate_prerequisites_;
+
+  // This group of fields are the current state of the expectation,
+  // and can change as the mock function is called.
+  int call_count_;  // How many times this expectation has been invoked.
   bool retired_;    // True if and only if this expectation has retired.
-  UntypedActions untyped_actions_; 
-  bool extra_matcher_specified_; 
-  bool repeated_action_specified_;  // True if a WillRepeatedly() was specified. 
-  bool retires_on_saturation_; 
-  Clause last_clause_; 
-  mutable bool action_count_checked_;  // Under mutex_. 
-  mutable Mutex mutex_;  // Protects action_count_checked_. 
-};  // class ExpectationBase 
- 
-// Impements an expectation for the given function type. 
-template <typename F> 
-class TypedExpectation : public ExpectationBase { 
- public: 
-  typedef typename Function<F>::ArgumentTuple ArgumentTuple; 
-  typedef typename Function<F>::ArgumentMatcherTuple ArgumentMatcherTuple; 
-  typedef typename Function<F>::Result Result; 
- 
+  UntypedActions untyped_actions_;
+  bool extra_matcher_specified_;
+  bool repeated_action_specified_;  // True if a WillRepeatedly() was specified.
+  bool retires_on_saturation_;
+  Clause last_clause_;
+  mutable bool action_count_checked_;  // Under mutex_.
+  mutable Mutex mutex_;  // Protects action_count_checked_.
+};  // class ExpectationBase
+
+// Impements an expectation for the given function type.
+template <typename F>
+class TypedExpectation : public ExpectationBase {
+ public:
+  typedef typename Function<F>::ArgumentTuple ArgumentTuple;
+  typedef typename Function<F>::ArgumentMatcherTuple ArgumentMatcherTuple;
+  typedef typename Function<F>::Result Result;
+
   TypedExpectation(FunctionMocker<F>* owner, const char* a_file, int a_line,
                    const std::string& a_source_text,
-                   const ArgumentMatcherTuple& m) 
-      : ExpectationBase(a_file, a_line, a_source_text), 
-        owner_(owner), 
-        matchers_(m), 
-        // By default, extra_matcher_ should match anything.  However, 
+                   const ArgumentMatcherTuple& m)
+      : ExpectationBase(a_file, a_line, a_source_text),
+        owner_(owner),
+        matchers_(m),
+        // By default, extra_matcher_ should match anything.  However,
         // we cannot initialize it with _ as that causes ambiguity between
         // Matcher's copy and move constructor for some argument types.
-        extra_matcher_(A<const ArgumentTuple&>()), 
-        repeated_action_(DoDefault()) {} 
- 
+        extra_matcher_(A<const ArgumentTuple&>()),
+        repeated_action_(DoDefault()) {}
+
   ~TypedExpectation() override {
-    // Check the validity of the action count if it hasn't been done 
-    // yet (for example, if the expectation was never used). 
-    CheckActionCountIfNotDone(); 
-    for (UntypedActions::const_iterator it = untyped_actions_.begin(); 
-         it != untyped_actions_.end(); ++it) { 
-      delete static_cast<const Action<F>*>(*it); 
-    } 
-  } 
- 
-  // Implements the .With() clause. 
-  TypedExpectation& With(const Matcher<const ArgumentTuple&>& m) { 
-    if (last_clause_ == kWith) { 
-      ExpectSpecProperty(false, 
-                         ".With() cannot appear " 
-                         "more than once in an EXPECT_CALL()."); 
-    } else { 
-      ExpectSpecProperty(last_clause_ < kWith, 
-                         ".With() must be the first " 
-                         "clause in an EXPECT_CALL()."); 
-    } 
-    last_clause_ = kWith; 
- 
-    extra_matcher_ = m; 
-    extra_matcher_specified_ = true; 
-    return *this; 
-  } 
- 
-  // Implements the .Times() clause. 
-  TypedExpectation& Times(const Cardinality& a_cardinality) { 
-    ExpectationBase::UntypedTimes(a_cardinality); 
-    return *this; 
-  } 
- 
-  // Implements the .Times() clause. 
-  TypedExpectation& Times(int n) { 
-    return Times(Exactly(n)); 
-  } 
- 
-  // Implements the .InSequence() clause. 
-  TypedExpectation& InSequence(const Sequence& s) { 
-    ExpectSpecProperty(last_clause_ <= kInSequence, 
-                       ".InSequence() cannot appear after .After()," 
-                       " .WillOnce(), .WillRepeatedly(), or " 
-                       ".RetiresOnSaturation()."); 
-    last_clause_ = kInSequence; 
- 
-    s.AddExpectation(GetHandle()); 
-    return *this; 
-  } 
-  TypedExpectation& InSequence(const Sequence& s1, const Sequence& s2) { 
-    return InSequence(s1).InSequence(s2); 
-  } 
-  TypedExpectation& InSequence(const Sequence& s1, const Sequence& s2, 
-                               const Sequence& s3) { 
-    return InSequence(s1, s2).InSequence(s3); 
-  } 
-  TypedExpectation& InSequence(const Sequence& s1, const Sequence& s2, 
-                               const Sequence& s3, const Sequence& s4) { 
-    return InSequence(s1, s2, s3).InSequence(s4); 
-  } 
-  TypedExpectation& InSequence(const Sequence& s1, const Sequence& s2, 
-                               const Sequence& s3, const Sequence& s4, 
-                               const Sequence& s5) { 
-    return InSequence(s1, s2, s3, s4).InSequence(s5); 
-  } 
- 
-  // Implements that .After() clause. 
-  TypedExpectation& After(const ExpectationSet& s) { 
-    ExpectSpecProperty(last_clause_ <= kAfter, 
-                       ".After() cannot appear after .WillOnce()," 
-                       " .WillRepeatedly(), or " 
-                       ".RetiresOnSaturation()."); 
-    last_clause_ = kAfter; 
- 
-    for (ExpectationSet::const_iterator it = s.begin(); it != s.end(); ++it) { 
-      immediate_prerequisites_ += *it; 
-    } 
-    return *this; 
-  } 
-  TypedExpectation& After(const ExpectationSet& s1, const ExpectationSet& s2) { 
-    return After(s1).After(s2); 
-  } 
-  TypedExpectation& After(const ExpectationSet& s1, const ExpectationSet& s2, 
-                          const ExpectationSet& s3) { 
-    return After(s1, s2).After(s3); 
-  } 
-  TypedExpectation& After(const ExpectationSet& s1, const ExpectationSet& s2, 
-                          const ExpectationSet& s3, const ExpectationSet& s4) { 
-    return After(s1, s2, s3).After(s4); 
-  } 
-  TypedExpectation& After(const ExpectationSet& s1, const ExpectationSet& s2, 
-                          const ExpectationSet& s3, const ExpectationSet& s4, 
-                          const ExpectationSet& s5) { 
-    return After(s1, s2, s3, s4).After(s5); 
-  } 
- 
-  // Implements the .WillOnce() clause. 
-  TypedExpectation& WillOnce(const Action<F>& action) { 
-    ExpectSpecProperty(last_clause_ <= kWillOnce, 
-                       ".WillOnce() cannot appear after " 
-                       ".WillRepeatedly() or .RetiresOnSaturation()."); 
-    last_clause_ = kWillOnce; 
- 
-    untyped_actions_.push_back(new Action<F>(action)); 
-    if (!cardinality_specified()) { 
-      set_cardinality(Exactly(static_cast<int>(untyped_actions_.size()))); 
-    } 
-    return *this; 
-  } 
- 
-  // Implements the .WillRepeatedly() clause. 
-  TypedExpectation& WillRepeatedly(const Action<F>& action) { 
-    if (last_clause_ == kWillRepeatedly) { 
-      ExpectSpecProperty(false, 
-                         ".WillRepeatedly() cannot appear " 
-                         "more than once in an EXPECT_CALL()."); 
-    } else { 
-      ExpectSpecProperty(last_clause_ < kWillRepeatedly, 
-                         ".WillRepeatedly() cannot appear " 
-                         "after .RetiresOnSaturation()."); 
-    } 
-    last_clause_ = kWillRepeatedly; 
-    repeated_action_specified_ = true; 
- 
-    repeated_action_ = action; 
-    if (!cardinality_specified()) { 
-      set_cardinality(AtLeast(static_cast<int>(untyped_actions_.size()))); 
-    } 
- 
-    // Now that no more action clauses can be specified, we check 
-    // whether their count makes sense. 
-    CheckActionCountIfNotDone(); 
-    return *this; 
-  } 
- 
-  // Implements the .RetiresOnSaturation() clause. 
-  TypedExpectation& RetiresOnSaturation() { 
-    ExpectSpecProperty(last_clause_ < kRetiresOnSaturation, 
-                       ".RetiresOnSaturation() cannot appear " 
-                       "more than once."); 
-    last_clause_ = kRetiresOnSaturation; 
-    retires_on_saturation_ = true; 
- 
-    // Now that no more action clauses can be specified, we check 
-    // whether their count makes sense. 
-    CheckActionCountIfNotDone(); 
-    return *this; 
-  } 
- 
-  // Returns the matchers for the arguments as specified inside the 
-  // EXPECT_CALL() macro. 
-  const ArgumentMatcherTuple& matchers() const { 
-    return matchers_; 
-  } 
- 
-  // Returns the matcher specified by the .With() clause. 
-  const Matcher<const ArgumentTuple&>& extra_matcher() const { 
-    return extra_matcher_; 
-  } 
- 
-  // Returns the action specified by the .WillRepeatedly() clause. 
-  const Action<F>& repeated_action() const { return repeated_action_; } 
- 
-  // If this mock method has an extra matcher (i.e. .With(matcher)), 
-  // describes it to the ostream. 
+    // Check the validity of the action count if it hasn't been done
+    // yet (for example, if the expectation was never used).
+    CheckActionCountIfNotDone();
+    for (UntypedActions::const_iterator it = untyped_actions_.begin();
+         it != untyped_actions_.end(); ++it) {
+      delete static_cast<const Action<F>*>(*it);
+    }
+  }
+
+  // Implements the .With() clause.
+  TypedExpectation& With(const Matcher<const ArgumentTuple&>& m) {
+    if (last_clause_ == kWith) {
+      ExpectSpecProperty(false,
+                         ".With() cannot appear "
+                         "more than once in an EXPECT_CALL().");
+    } else {
+      ExpectSpecProperty(last_clause_ < kWith,
+                         ".With() must be the first "
+                         "clause in an EXPECT_CALL().");
+    }
+    last_clause_ = kWith;
+
+    extra_matcher_ = m;
+    extra_matcher_specified_ = true;
+    return *this;
+  }
+
+  // Implements the .Times() clause.
+  TypedExpectation& Times(const Cardinality& a_cardinality) {
+    ExpectationBase::UntypedTimes(a_cardinality);
+    return *this;
+  }
+
+  // Implements the .Times() clause.
+  TypedExpectation& Times(int n) {
+    return Times(Exactly(n));
+  }
+
+  // Implements the .InSequence() clause.
+  TypedExpectation& InSequence(const Sequence& s) {
+    ExpectSpecProperty(last_clause_ <= kInSequence,
+                       ".InSequence() cannot appear after .After(),"
+                       " .WillOnce(), .WillRepeatedly(), or "
+                       ".RetiresOnSaturation().");
+    last_clause_ = kInSequence;
+
+    s.AddExpectation(GetHandle());
+    return *this;
+  }
+  TypedExpectation& InSequence(const Sequence& s1, const Sequence& s2) {
+    return InSequence(s1).InSequence(s2);
+  }
+  TypedExpectation& InSequence(const Sequence& s1, const Sequence& s2,
+                               const Sequence& s3) {
+    return InSequence(s1, s2).InSequence(s3);
+  }
+  TypedExpectation& InSequence(const Sequence& s1, const Sequence& s2,
+                               const Sequence& s3, const Sequence& s4) {
+    return InSequence(s1, s2, s3).InSequence(s4);
+  }
+  TypedExpectation& InSequence(const Sequence& s1, const Sequence& s2,
+                               const Sequence& s3, const Sequence& s4,
+                               const Sequence& s5) {
+    return InSequence(s1, s2, s3, s4).InSequence(s5);
+  }
+
+  // Implements that .After() clause.
+  TypedExpectation& After(const ExpectationSet& s) {
+    ExpectSpecProperty(last_clause_ <= kAfter,
+                       ".After() cannot appear after .WillOnce(),"
+                       " .WillRepeatedly(), or "
+                       ".RetiresOnSaturation().");
+    last_clause_ = kAfter;
+
+    for (ExpectationSet::const_iterator it = s.begin(); it != s.end(); ++it) {
+      immediate_prerequisites_ += *it;
+    }
+    return *this;
+  }
+  TypedExpectation& After(const ExpectationSet& s1, const ExpectationSet& s2) {
+    return After(s1).After(s2);
+  }
+  TypedExpectation& After(const ExpectationSet& s1, const ExpectationSet& s2,
+                          const ExpectationSet& s3) {
+    return After(s1, s2).After(s3);
+  }
+  TypedExpectation& After(const ExpectationSet& s1, const ExpectationSet& s2,
+                          const ExpectationSet& s3, const ExpectationSet& s4) {
+    return After(s1, s2, s3).After(s4);
+  }
+  TypedExpectation& After(const ExpectationSet& s1, const ExpectationSet& s2,
+                          const ExpectationSet& s3, const ExpectationSet& s4,
+                          const ExpectationSet& s5) {
+    return After(s1, s2, s3, s4).After(s5);
+  }
+
+  // Implements the .WillOnce() clause.
+  TypedExpectation& WillOnce(const Action<F>& action) {
+    ExpectSpecProperty(last_clause_ <= kWillOnce,
+                       ".WillOnce() cannot appear after "
+                       ".WillRepeatedly() or .RetiresOnSaturation().");
+    last_clause_ = kWillOnce;
+
+    untyped_actions_.push_back(new Action<F>(action));
+    if (!cardinality_specified()) {
+      set_cardinality(Exactly(static_cast<int>(untyped_actions_.size())));
+    }
+    return *this;
+  }
+
+  // Implements the .WillRepeatedly() clause.
+  TypedExpectation& WillRepeatedly(const Action<F>& action) {
+    if (last_clause_ == kWillRepeatedly) {
+      ExpectSpecProperty(false,
+                         ".WillRepeatedly() cannot appear "
+                         "more than once in an EXPECT_CALL().");
+    } else {
+      ExpectSpecProperty(last_clause_ < kWillRepeatedly,
+                         ".WillRepeatedly() cannot appear "
+                         "after .RetiresOnSaturation().");
+    }
+    last_clause_ = kWillRepeatedly;
+    repeated_action_specified_ = true;
+
+    repeated_action_ = action;
+    if (!cardinality_specified()) {
+      set_cardinality(AtLeast(static_cast<int>(untyped_actions_.size())));
+    }
+
+    // Now that no more action clauses can be specified, we check
+    // whether their count makes sense.
+    CheckActionCountIfNotDone();
+    return *this;
+  }
+
+  // Implements the .RetiresOnSaturation() clause.
+  TypedExpectation& RetiresOnSaturation() {
+    ExpectSpecProperty(last_clause_ < kRetiresOnSaturation,
+                       ".RetiresOnSaturation() cannot appear "
+                       "more than once.");
+    last_clause_ = kRetiresOnSaturation;
+    retires_on_saturation_ = true;
+
+    // Now that no more action clauses can be specified, we check
+    // whether their count makes sense.
+    CheckActionCountIfNotDone();
+    return *this;
+  }
+
+  // Returns the matchers for the arguments as specified inside the
+  // EXPECT_CALL() macro.
+  const ArgumentMatcherTuple& matchers() const {
+    return matchers_;
+  }
+
+  // Returns the matcher specified by the .With() clause.
+  const Matcher<const ArgumentTuple&>& extra_matcher() const {
+    return extra_matcher_;
+  }
+
+  // Returns the action specified by the .WillRepeatedly() clause.
+  const Action<F>& repeated_action() const { return repeated_action_; }
+
+  // If this mock method has an extra matcher (i.e. .With(matcher)),
+  // describes it to the ostream.
   void MaybeDescribeExtraMatcherTo(::std::ostream* os) override {
-    if (extra_matcher_specified_) { 
-      *os << "    Expected args: "; 
-      extra_matcher_.DescribeTo(os); 
-      *os << "\n"; 
-    } 
-  } 
- 
- private: 
-  template <typename Function> 
+    if (extra_matcher_specified_) {
+      *os << "    Expected args: ";
+      extra_matcher_.DescribeTo(os);
+      *os << "\n";
+    }
+  }
+
+ private:
+  template <typename Function>
   friend class FunctionMocker;
- 
-  // Returns an Expectation object that references and co-owns this 
-  // expectation. 
+
+  // Returns an Expectation object that references and co-owns this
+  // expectation.
   Expectation GetHandle() override { return owner_->GetHandleOf(this); }
- 
-  // The following methods will be called only after the EXPECT_CALL() 
-  // statement finishes and when the current thread holds 
-  // g_gmock_mutex. 
- 
+
+  // The following methods will be called only after the EXPECT_CALL()
+  // statement finishes and when the current thread holds
+  // g_gmock_mutex.
+
   // Returns true if and only if this expectation matches the given arguments.
-  bool Matches(const ArgumentTuple& args) const 
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) { 
-    g_gmock_mutex.AssertHeld(); 
-    return TupleMatches(matchers_, args) && extra_matcher_.Matches(args); 
-  } 
- 
+  bool Matches(const ArgumentTuple& args) const
+      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+    g_gmock_mutex.AssertHeld();
+    return TupleMatches(matchers_, args) && extra_matcher_.Matches(args);
+  }
+
   // Returns true if and only if this expectation should handle the given
   // arguments.
-  bool ShouldHandleArguments(const ArgumentTuple& args) const 
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) { 
-    g_gmock_mutex.AssertHeld(); 
- 
-    // In case the action count wasn't checked when the expectation 
-    // was defined (e.g. if this expectation has no WillRepeatedly() 
-    // or RetiresOnSaturation() clause), we check it when the 
-    // expectation is used for the first time. 
-    CheckActionCountIfNotDone(); 
-    return !is_retired() && AllPrerequisitesAreSatisfied() && Matches(args); 
-  } 
- 
-  // Describes the result of matching the arguments against this 
-  // expectation to the given ostream. 
-  void ExplainMatchResultTo( 
-      const ArgumentTuple& args, 
-      ::std::ostream* os) const 
-          GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) { 
-    g_gmock_mutex.AssertHeld(); 
- 
-    if (is_retired()) { 
-      *os << "         Expected: the expectation is active\n" 
-          << "           Actual: it is retired\n"; 
-    } else if (!Matches(args)) { 
-      if (!TupleMatches(matchers_, args)) { 
-        ExplainMatchFailureTupleTo(matchers_, args, os); 
-      } 
-      StringMatchResultListener listener; 
-      if (!extra_matcher_.MatchAndExplain(args, &listener)) { 
-        *os << "    Expected args: "; 
-        extra_matcher_.DescribeTo(os); 
-        *os << "\n           Actual: don't match"; 
- 
-        internal::PrintIfNotEmpty(listener.str(), os); 
-        *os << "\n"; 
-      } 
-    } else if (!AllPrerequisitesAreSatisfied()) { 
-      *os << "         Expected: all pre-requisites are satisfied\n" 
-          << "           Actual: the following immediate pre-requisites " 
-          << "are not satisfied:\n"; 
-      ExpectationSet unsatisfied_prereqs; 
-      FindUnsatisfiedPrerequisites(&unsatisfied_prereqs); 
-      int i = 0; 
-      for (ExpectationSet::const_iterator it = unsatisfied_prereqs.begin(); 
-           it != unsatisfied_prereqs.end(); ++it) { 
-        it->expectation_base()->DescribeLocationTo(os); 
-        *os << "pre-requisite #" << i++ << "\n"; 
-      } 
-      *os << "                   (end of pre-requisites)\n"; 
-    } else { 
-      // This line is here just for completeness' sake.  It will never 
-      // be executed as currently the ExplainMatchResultTo() function 
-      // is called only when the mock function call does NOT match the 
-      // expectation. 
-      *os << "The call matches the expectation.\n"; 
-    } 
-  } 
- 
-  // Returns the action that should be taken for the current invocation. 
+  bool ShouldHandleArguments(const ArgumentTuple& args) const
+      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+    g_gmock_mutex.AssertHeld();
+
+    // In case the action count wasn't checked when the expectation
+    // was defined (e.g. if this expectation has no WillRepeatedly()
+    // or RetiresOnSaturation() clause), we check it when the
+    // expectation is used for the first time.
+    CheckActionCountIfNotDone();
+    return !is_retired() && AllPrerequisitesAreSatisfied() && Matches(args);
+  }
+
+  // Describes the result of matching the arguments against this
+  // expectation to the given ostream.
+  void ExplainMatchResultTo(
+      const ArgumentTuple& args,
+      ::std::ostream* os) const
+          GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+    g_gmock_mutex.AssertHeld();
+
+    if (is_retired()) {
+      *os << "         Expected: the expectation is active\n"
+          << "           Actual: it is retired\n";
+    } else if (!Matches(args)) {
+      if (!TupleMatches(matchers_, args)) {
+        ExplainMatchFailureTupleTo(matchers_, args, os);
+      }
+      StringMatchResultListener listener;
+      if (!extra_matcher_.MatchAndExplain(args, &listener)) {
+        *os << "    Expected args: ";
+        extra_matcher_.DescribeTo(os);
+        *os << "\n           Actual: don't match";
+
+        internal::PrintIfNotEmpty(listener.str(), os);
+        *os << "\n";
+      }
+    } else if (!AllPrerequisitesAreSatisfied()) {
+      *os << "         Expected: all pre-requisites are satisfied\n"
+          << "           Actual: the following immediate pre-requisites "
+          << "are not satisfied:\n";
+      ExpectationSet unsatisfied_prereqs;
+      FindUnsatisfiedPrerequisites(&unsatisfied_prereqs);
+      int i = 0;
+      for (ExpectationSet::const_iterator it = unsatisfied_prereqs.begin();
+           it != unsatisfied_prereqs.end(); ++it) {
+        it->expectation_base()->DescribeLocationTo(os);
+        *os << "pre-requisite #" << i++ << "\n";
+      }
+      *os << "                   (end of pre-requisites)\n";
+    } else {
+      // This line is here just for completeness' sake.  It will never
+      // be executed as currently the ExplainMatchResultTo() function
+      // is called only when the mock function call does NOT match the
+      // expectation.
+      *os << "The call matches the expectation.\n";
+    }
+  }
+
+  // Returns the action that should be taken for the current invocation.
   const Action<F>& GetCurrentAction(const FunctionMocker<F>* mocker,
                                     const ArgumentTuple& args) const
       GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
-    g_gmock_mutex.AssertHeld(); 
-    const int count = call_count(); 
-    Assert(count >= 1, __FILE__, __LINE__, 
-           "call_count() is <= 0 when GetCurrentAction() is " 
-           "called - this should never happen."); 
- 
-    const int action_count = static_cast<int>(untyped_actions_.size()); 
-    if (action_count > 0 && !repeated_action_specified_ && 
-        count > action_count) { 
-      // If there is at least one WillOnce() and no WillRepeatedly(), 
-      // we warn the user when the WillOnce() clauses ran out. 
-      ::std::stringstream ss; 
-      DescribeLocationTo(&ss); 
-      ss << "Actions ran out in " << source_text() << "...\n" 
-         << "Called " << count << " times, but only " 
-         << action_count << " WillOnce()" 
-         << (action_count == 1 ? " is" : "s are") << " specified - "; 
-      mocker->DescribeDefaultActionTo(args, &ss); 
-      Log(kWarning, ss.str(), 1); 
-    } 
- 
+    g_gmock_mutex.AssertHeld();
+    const int count = call_count();
+    Assert(count >= 1, __FILE__, __LINE__,
+           "call_count() is <= 0 when GetCurrentAction() is "
+           "called - this should never happen.");
+
+    const int action_count = static_cast<int>(untyped_actions_.size());
+    if (action_count > 0 && !repeated_action_specified_ &&
+        count > action_count) {
+      // If there is at least one WillOnce() and no WillRepeatedly(),
+      // we warn the user when the WillOnce() clauses ran out.
+      ::std::stringstream ss;
+      DescribeLocationTo(&ss);
+      ss << "Actions ran out in " << source_text() << "...\n"
+         << "Called " << count << " times, but only "
+         << action_count << " WillOnce()"
+         << (action_count == 1 ? " is" : "s are") << " specified - ";
+      mocker->DescribeDefaultActionTo(args, &ss);
+      Log(kWarning, ss.str(), 1);
+    }
+
     return count <= action_count
                ? *static_cast<const Action<F>*>(
                      untyped_actions_[static_cast<size_t>(count - 1)])
                : repeated_action();
-  } 
- 
-  // Given the arguments of a mock function call, if the call will 
-  // over-saturate this expectation, returns the default action; 
-  // otherwise, returns the next action in this expectation.  Also 
-  // describes *what* happened to 'what', and explains *why* Google 
-  // Mock does it to 'why'.  This method is not const as it calls 
-  // IncrementCallCount().  A return value of NULL means the default 
-  // action. 
+  }
+
+  // Given the arguments of a mock function call, if the call will
+  // over-saturate this expectation, returns the default action;
+  // otherwise, returns the next action in this expectation.  Also
+  // describes *what* happened to 'what', and explains *why* Google
+  // Mock does it to 'why'.  This method is not const as it calls
+  // IncrementCallCount().  A return value of NULL means the default
+  // action.
   const Action<F>* GetActionForArguments(const FunctionMocker<F>* mocker,
                                          const ArgumentTuple& args,
                                          ::std::ostream* what,
                                          ::std::ostream* why)
       GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
-    g_gmock_mutex.AssertHeld(); 
-    if (IsSaturated()) { 
-      // We have an excessive call. 
-      IncrementCallCount(); 
-      *what << "Mock function called more times than expected - "; 
-      mocker->DescribeDefaultActionTo(args, what); 
-      DescribeCallCountTo(why); 
- 
+    g_gmock_mutex.AssertHeld();
+    if (IsSaturated()) {
+      // We have an excessive call.
+      IncrementCallCount();
+      *what << "Mock function called more times than expected - ";
+      mocker->DescribeDefaultActionTo(args, what);
+      DescribeCallCountTo(why);
+
       return nullptr;
-    } 
- 
-    IncrementCallCount(); 
-    RetireAllPreRequisites(); 
- 
-    if (retires_on_saturation_ && IsSaturated()) { 
-      Retire(); 
-    } 
- 
-    // Must be done after IncrementCount()! 
-    *what << "Mock function call matches " << source_text() <<"...\n"; 
-    return &(GetCurrentAction(mocker, args)); 
-  } 
- 
-  // All the fields below won't change once the EXPECT_CALL() 
-  // statement finishes. 
+    }
+
+    IncrementCallCount();
+    RetireAllPreRequisites();
+
+    if (retires_on_saturation_ && IsSaturated()) {
+      Retire();
+    }
+
+    // Must be done after IncrementCount()!
+    *what << "Mock function call matches " << source_text() <<"...\n";
+    return &(GetCurrentAction(mocker, args));
+  }
+
+  // All the fields below won't change once the EXPECT_CALL()
+  // statement finishes.
   FunctionMocker<F>* const owner_;
-  ArgumentMatcherTuple matchers_; 
-  Matcher<const ArgumentTuple&> extra_matcher_; 
-  Action<F> repeated_action_; 
- 
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(TypedExpectation); 
-};  // class TypedExpectation 
- 
-// A MockSpec object is used by ON_CALL() or EXPECT_CALL() for 
-// specifying the default behavior of, or expectation on, a mock 
-// function. 
- 
-// Note: class MockSpec really belongs to the ::testing namespace. 
-// However if we define it in ::testing, MSVC will complain when 
-// classes in ::testing::internal declare it as a friend class 
-// template.  To workaround this compiler bug, we define MockSpec in 
-// ::testing::internal and import it into ::testing. 
- 
-// Logs a message including file and line number information. 
-GTEST_API_ void LogWithLocation(testing::internal::LogSeverity severity, 
-                                const char* file, int line, 
+  ArgumentMatcherTuple matchers_;
+  Matcher<const ArgumentTuple&> extra_matcher_;
+  Action<F> repeated_action_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(TypedExpectation);
+};  // class TypedExpectation
+
+// A MockSpec object is used by ON_CALL() or EXPECT_CALL() for
+// specifying the default behavior of, or expectation on, a mock
+// function.
+
+// Note: class MockSpec really belongs to the ::testing namespace.
+// However if we define it in ::testing, MSVC will complain when
+// classes in ::testing::internal declare it as a friend class
+// template.  To workaround this compiler bug, we define MockSpec in
+// ::testing::internal and import it into ::testing.
+
+// Logs a message including file and line number information.
+GTEST_API_ void LogWithLocation(testing::internal::LogSeverity severity,
+                                const char* file, int line,
                                 const std::string& message);
- 
-template <typename F> 
-class MockSpec { 
- public: 
-  typedef typename internal::Function<F>::ArgumentTuple ArgumentTuple; 
-  typedef typename internal::Function<F>::ArgumentMatcherTuple 
-      ArgumentMatcherTuple; 
- 
-  // Constructs a MockSpec object, given the function mocker object 
-  // that the spec is associated with. 
+
+template <typename F>
+class MockSpec {
+ public:
+  typedef typename internal::Function<F>::ArgumentTuple ArgumentTuple;
+  typedef typename internal::Function<F>::ArgumentMatcherTuple
+      ArgumentMatcherTuple;
+
+  // Constructs a MockSpec object, given the function mocker object
+  // that the spec is associated with.
   MockSpec(internal::FunctionMocker<F>* function_mocker,
            const ArgumentMatcherTuple& matchers)
       : function_mocker_(function_mocker), matchers_(matchers) {}
- 
-  // Adds a new default action spec to the function mocker and returns 
-  // the newly created spec. 
-  internal::OnCallSpec<F>& InternalDefaultActionSetAt( 
-      const char* file, int line, const char* obj, const char* call) { 
-    LogWithLocation(internal::kInfo, file, line, 
+
+  // Adds a new default action spec to the function mocker and returns
+  // the newly created spec.
+  internal::OnCallSpec<F>& InternalDefaultActionSetAt(
+      const char* file, int line, const char* obj, const char* call) {
+    LogWithLocation(internal::kInfo, file, line,
                     std::string("ON_CALL(") + obj + ", " + call + ") invoked");
-    return function_mocker_->AddNewOnCallSpec(file, line, matchers_); 
-  } 
- 
-  // Adds a new expectation spec to the function mocker and returns 
-  // the newly created spec. 
-  internal::TypedExpectation<F>& InternalExpectedAt( 
-      const char* file, int line, const char* obj, const char* call) { 
+    return function_mocker_->AddNewOnCallSpec(file, line, matchers_);
+  }
+
+  // Adds a new expectation spec to the function mocker and returns
+  // the newly created spec.
+  internal::TypedExpectation<F>& InternalExpectedAt(
+      const char* file, int line, const char* obj, const char* call) {
     const std::string source_text(std::string("EXPECT_CALL(") + obj + ", " +
                                   call + ")");
-    LogWithLocation(internal::kInfo, file, line, source_text + " invoked"); 
-    return function_mocker_->AddNewExpectation( 
-        file, line, source_text, matchers_); 
-  } 
- 
+    LogWithLocation(internal::kInfo, file, line, source_text + " invoked");
+    return function_mocker_->AddNewExpectation(
+        file, line, source_text, matchers_);
+  }
+
   // This operator overload is used to swallow the superfluous parameter list
   // introduced by the ON/EXPECT_CALL macros. See the macro comments for more
   // explanation.
@@ -1294,179 +1294,179 @@ class MockSpec {
     return *this;
   }
 
- private: 
-  template <typename Function> 
-  friend class internal::FunctionMocker; 
- 
-  // The function mocker that owns this spec. 
+ private:
+  template <typename Function>
+  friend class internal::FunctionMocker;
+
+  // The function mocker that owns this spec.
   internal::FunctionMocker<F>* const function_mocker_;
-  // The argument matchers specified in the spec. 
-  ArgumentMatcherTuple matchers_; 
-};  // class MockSpec 
- 
-// Wrapper type for generically holding an ordinary value or lvalue reference. 
-// If T is not a reference type, it must be copyable or movable. 
-// ReferenceOrValueWrapper<T> is movable, and will also be copyable unless 
-// T is a move-only value type (which means that it will always be copyable 
-// if the current platform does not support move semantics). 
-// 
-// The primary template defines handling for values, but function header 
-// comments describe the contract for the whole template (including 
-// specializations). 
-template <typename T> 
-class ReferenceOrValueWrapper { 
- public: 
-  // Constructs a wrapper from the given value/reference. 
-  explicit ReferenceOrValueWrapper(T value) 
+  // The argument matchers specified in the spec.
+  ArgumentMatcherTuple matchers_;
+};  // class MockSpec
+
+// Wrapper type for generically holding an ordinary value or lvalue reference.
+// If T is not a reference type, it must be copyable or movable.
+// ReferenceOrValueWrapper<T> is movable, and will also be copyable unless
+// T is a move-only value type (which means that it will always be copyable
+// if the current platform does not support move semantics).
+//
+// The primary template defines handling for values, but function header
+// comments describe the contract for the whole template (including
+// specializations).
+template <typename T>
+class ReferenceOrValueWrapper {
+ public:
+  // Constructs a wrapper from the given value/reference.
+  explicit ReferenceOrValueWrapper(T value)
       : value_(std::move(value)) {
-  } 
- 
-  // Unwraps and returns the underlying value/reference, exactly as 
-  // originally passed. The behavior of calling this more than once on 
-  // the same object is unspecified. 
+  }
+
+  // Unwraps and returns the underlying value/reference, exactly as
+  // originally passed. The behavior of calling this more than once on
+  // the same object is unspecified.
   T Unwrap() { return std::move(value_); }
- 
-  // Provides nondestructive access to the underlying value/reference. 
-  // Always returns a const reference (more precisely, 
+
+  // Provides nondestructive access to the underlying value/reference.
+  // Always returns a const reference (more precisely,
   // const std::add_lvalue_reference<T>::type). The behavior of calling this
   // after calling Unwrap on the same object is unspecified.
-  const T& Peek() const { 
-    return value_; 
-  } 
- 
- private: 
-  T value_; 
-}; 
- 
-// Specialization for lvalue reference types. See primary template 
-// for documentation. 
-template <typename T> 
-class ReferenceOrValueWrapper<T&> { 
- public: 
-  // Workaround for debatable pass-by-reference lint warning (c-library-team 
-  // policy precludes NOLINT in this context) 
-  typedef T& reference; 
-  explicit ReferenceOrValueWrapper(reference ref) 
-      : value_ptr_(&ref) {} 
-  T& Unwrap() { return *value_ptr_; } 
-  const T& Peek() const { return *value_ptr_; } 
- 
- private: 
-  T* value_ptr_; 
-}; 
- 
-// C++ treats the void type specially.  For example, you cannot define 
-// a void-typed variable or pass a void value to a function. 
-// ActionResultHolder<T> holds a value of type T, where T must be a 
-// copyable type or void (T doesn't need to be default-constructable). 
-// It hides the syntactic difference between void and other types, and 
-// is used to unify the code for invoking both void-returning and 
-// non-void-returning mock functions. 
- 
-// Untyped base class for ActionResultHolder<T>. 
-class UntypedActionResultHolderBase { 
- public: 
-  virtual ~UntypedActionResultHolderBase() {} 
- 
-  // Prints the held value as an action's result to os. 
-  virtual void PrintAsActionResult(::std::ostream* os) const = 0; 
-}; 
- 
-// This generic definition is used when T is not void. 
-template <typename T> 
-class ActionResultHolder : public UntypedActionResultHolderBase { 
- public: 
-  // Returns the held value. Must not be called more than once. 
-  T Unwrap() { 
-    return result_.Unwrap(); 
-  } 
- 
-  // Prints the held value as an action's result to os. 
+  const T& Peek() const {
+    return value_;
+  }
+
+ private:
+  T value_;
+};
+
+// Specialization for lvalue reference types. See primary template
+// for documentation.
+template <typename T>
+class ReferenceOrValueWrapper<T&> {
+ public:
+  // Workaround for debatable pass-by-reference lint warning (c-library-team
+  // policy precludes NOLINT in this context)
+  typedef T& reference;
+  explicit ReferenceOrValueWrapper(reference ref)
+      : value_ptr_(&ref) {}
+  T& Unwrap() { return *value_ptr_; }
+  const T& Peek() const { return *value_ptr_; }
+
+ private:
+  T* value_ptr_;
+};
+
+// C++ treats the void type specially.  For example, you cannot define
+// a void-typed variable or pass a void value to a function.
+// ActionResultHolder<T> holds a value of type T, where T must be a
+// copyable type or void (T doesn't need to be default-constructable).
+// It hides the syntactic difference between void and other types, and
+// is used to unify the code for invoking both void-returning and
+// non-void-returning mock functions.
+
+// Untyped base class for ActionResultHolder<T>.
+class UntypedActionResultHolderBase {
+ public:
+  virtual ~UntypedActionResultHolderBase() {}
+
+  // Prints the held value as an action's result to os.
+  virtual void PrintAsActionResult(::std::ostream* os) const = 0;
+};
+
+// This generic definition is used when T is not void.
+template <typename T>
+class ActionResultHolder : public UntypedActionResultHolderBase {
+ public:
+  // Returns the held value. Must not be called more than once.
+  T Unwrap() {
+    return result_.Unwrap();
+  }
+
+  // Prints the held value as an action's result to os.
   void PrintAsActionResult(::std::ostream* os) const override {
-    *os << "\n          Returns: "; 
-    // T may be a reference type, so we don't use UniversalPrint(). 
-    UniversalPrinter<T>::Print(result_.Peek(), os); 
-  } 
- 
-  // Performs the given mock function's default action and returns the 
-  // result in a new-ed ActionResultHolder. 
-  template <typename F> 
-  static ActionResultHolder* PerformDefaultAction( 
+    *os << "\n          Returns: ";
+    // T may be a reference type, so we don't use UniversalPrint().
+    UniversalPrinter<T>::Print(result_.Peek(), os);
+  }
+
+  // Performs the given mock function's default action and returns the
+  // result in a new-ed ActionResultHolder.
+  template <typename F>
+  static ActionResultHolder* PerformDefaultAction(
       const FunctionMocker<F>* func_mocker,
       typename Function<F>::ArgumentTuple&& args,
       const std::string& call_description) {
     return new ActionResultHolder(Wrapper(func_mocker->PerformDefaultAction(
         std::move(args), call_description)));
-  } 
- 
-  // Performs the given action and returns the result in a new-ed 
-  // ActionResultHolder. 
-  template <typename F> 
+  }
+
+  // Performs the given action and returns the result in a new-ed
+  // ActionResultHolder.
+  template <typename F>
   static ActionResultHolder* PerformAction(
       const Action<F>& action, typename Function<F>::ArgumentTuple&& args) {
     return new ActionResultHolder(
         Wrapper(action.Perform(std::move(args))));
-  } 
- 
- private: 
-  typedef ReferenceOrValueWrapper<T> Wrapper; 
- 
-  explicit ActionResultHolder(Wrapper result) 
+  }
+
+ private:
+  typedef ReferenceOrValueWrapper<T> Wrapper;
+
+  explicit ActionResultHolder(Wrapper result)
       : result_(std::move(result)) {
-  } 
- 
-  Wrapper result_; 
- 
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ActionResultHolder); 
-}; 
- 
-// Specialization for T = void. 
-template <> 
-class ActionResultHolder<void> : public UntypedActionResultHolderBase { 
- public: 
-  void Unwrap() { } 
- 
+  }
+
+  Wrapper result_;
+
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(ActionResultHolder);
+};
+
+// Specialization for T = void.
+template <>
+class ActionResultHolder<void> : public UntypedActionResultHolderBase {
+ public:
+  void Unwrap() { }
+
   void PrintAsActionResult(::std::ostream* /* os */) const override {}
- 
-  // Performs the given mock function's default action and returns ownership 
-  // of an empty ActionResultHolder*. 
-  template <typename F> 
-  static ActionResultHolder* PerformDefaultAction( 
+
+  // Performs the given mock function's default action and returns ownership
+  // of an empty ActionResultHolder*.
+  template <typename F>
+  static ActionResultHolder* PerformDefaultAction(
       const FunctionMocker<F>* func_mocker,
       typename Function<F>::ArgumentTuple&& args,
       const std::string& call_description) {
     func_mocker->PerformDefaultAction(std::move(args), call_description);
-    return new ActionResultHolder; 
-  } 
- 
-  // Performs the given action and returns ownership of an empty 
-  // ActionResultHolder*. 
-  template <typename F> 
-  static ActionResultHolder* PerformAction( 
+    return new ActionResultHolder;
+  }
+
+  // Performs the given action and returns ownership of an empty
+  // ActionResultHolder*.
+  template <typename F>
+  static ActionResultHolder* PerformAction(
       const Action<F>& action, typename Function<F>::ArgumentTuple&& args) {
     action.Perform(std::move(args));
-    return new ActionResultHolder; 
-  } 
- 
- private: 
-  ActionResultHolder() {} 
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(ActionResultHolder); 
-}; 
- 
-template <typename F> 
+    return new ActionResultHolder;
+  }
+
+ private:
+  ActionResultHolder() {}
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(ActionResultHolder);
+};
+
+template <typename F>
 class FunctionMocker;
 
 template <typename R, typename... Args>
 class FunctionMocker<R(Args...)> final : public UntypedFunctionMockerBase {
   using F = R(Args...);
 
- public: 
+ public:
   using Result = R;
   using ArgumentTuple = std::tuple<Args...>;
   using ArgumentMatcherTuple = std::tuple<Matcher<Args>...>;
- 
+
   FunctionMocker() {}
- 
+
   // There is no generally useful and implementable semantics of
   // copying a mock object, so copying a mock is usually a user error.
   // Thus we disallow copying function mockers.  If the user really
@@ -1482,114 +1482,114 @@ class FunctionMocker<R(Args...)> final : public UntypedFunctionMockerBase {
   FunctionMocker(const FunctionMocker&) = delete;
   FunctionMocker& operator=(const FunctionMocker&) = delete;
 
-  // The destructor verifies that all expectations on this mock 
-  // function have been satisfied.  If not, it will report Google Test 
-  // non-fatal failures for the violations. 
+  // The destructor verifies that all expectations on this mock
+  // function have been satisfied.  If not, it will report Google Test
+  // non-fatal failures for the violations.
   ~FunctionMocker() override GTEST_LOCK_EXCLUDED_(g_gmock_mutex) {
-    MutexLock l(&g_gmock_mutex); 
-    VerifyAndClearExpectationsLocked(); 
-    Mock::UnregisterLocked(this); 
-    ClearDefaultActionsLocked(); 
-  } 
- 
-  // Returns the ON_CALL spec that matches this mock function with the 
-  // given arguments; returns NULL if no matching ON_CALL is found. 
-  // L = * 
-  const OnCallSpec<F>* FindOnCallSpec( 
-      const ArgumentTuple& args) const { 
-    for (UntypedOnCallSpecs::const_reverse_iterator it 
-             = untyped_on_call_specs_.rbegin(); 
-         it != untyped_on_call_specs_.rend(); ++it) { 
-      const OnCallSpec<F>* spec = static_cast<const OnCallSpec<F>*>(*it); 
-      if (spec->Matches(args)) 
-        return spec; 
-    } 
- 
+    MutexLock l(&g_gmock_mutex);
+    VerifyAndClearExpectationsLocked();
+    Mock::UnregisterLocked(this);
+    ClearDefaultActionsLocked();
+  }
+
+  // Returns the ON_CALL spec that matches this mock function with the
+  // given arguments; returns NULL if no matching ON_CALL is found.
+  // L = *
+  const OnCallSpec<F>* FindOnCallSpec(
+      const ArgumentTuple& args) const {
+    for (UntypedOnCallSpecs::const_reverse_iterator it
+             = untyped_on_call_specs_.rbegin();
+         it != untyped_on_call_specs_.rend(); ++it) {
+      const OnCallSpec<F>* spec = static_cast<const OnCallSpec<F>*>(*it);
+      if (spec->Matches(args))
+        return spec;
+    }
+
     return nullptr;
-  } 
- 
-  // Performs the default action of this mock function on the given 
-  // arguments and returns the result. Asserts (or throws if 
-  // exceptions are enabled) with a helpful call descrption if there 
-  // is no valid return value. This method doesn't depend on the 
-  // mutable state of this object, and thus can be called concurrently 
-  // without locking. 
-  // L = * 
+  }
+
+  // Performs the default action of this mock function on the given
+  // arguments and returns the result. Asserts (or throws if
+  // exceptions are enabled) with a helpful call descrption if there
+  // is no valid return value. This method doesn't depend on the
+  // mutable state of this object, and thus can be called concurrently
+  // without locking.
+  // L = *
   Result PerformDefaultAction(ArgumentTuple&& args,
                               const std::string& call_description) const {
-    const OnCallSpec<F>* const spec = 
-        this->FindOnCallSpec(args); 
+    const OnCallSpec<F>* const spec =
+        this->FindOnCallSpec(args);
     if (spec != nullptr) {
       return spec->GetAction().Perform(std::move(args));
-    } 
+    }
     const std::string message =
         call_description +
-        "\n    The mock function has no default action " 
-        "set, and its return type has no default value set."; 
-#if GTEST_HAS_EXCEPTIONS 
-    if (!DefaultValue<Result>::Exists()) { 
-      throw std::runtime_error(message); 
-    } 
-#else 
-    Assert(DefaultValue<Result>::Exists(), "", -1, message); 
-#endif 
-    return DefaultValue<Result>::Get(); 
-  } 
- 
-  // Performs the default action with the given arguments and returns 
-  // the action's result.  The call description string will be used in 
-  // the error message to describe the call in the case the default 
-  // action fails.  The caller is responsible for deleting the result. 
-  // L = * 
+        "\n    The mock function has no default action "
+        "set, and its return type has no default value set.";
+#if GTEST_HAS_EXCEPTIONS
+    if (!DefaultValue<Result>::Exists()) {
+      throw std::runtime_error(message);
+    }
+#else
+    Assert(DefaultValue<Result>::Exists(), "", -1, message);
+#endif
+    return DefaultValue<Result>::Get();
+  }
+
+  // Performs the default action with the given arguments and returns
+  // the action's result.  The call description string will be used in
+  // the error message to describe the call in the case the default
+  // action fails.  The caller is responsible for deleting the result.
+  // L = *
   UntypedActionResultHolderBase* UntypedPerformDefaultAction(
       void* untyped_args,  // must point to an ArgumentTuple
       const std::string& call_description) const override {
     ArgumentTuple* args = static_cast<ArgumentTuple*>(untyped_args);
     return ResultHolder::PerformDefaultAction(this, std::move(*args),
                                               call_description);
-  } 
- 
-  // Performs the given action with the given arguments and returns 
-  // the action's result.  The caller is responsible for deleting the 
-  // result. 
-  // L = * 
+  }
+
+  // Performs the given action with the given arguments and returns
+  // the action's result.  The caller is responsible for deleting the
+  // result.
+  // L = *
   UntypedActionResultHolderBase* UntypedPerformAction(
       const void* untyped_action, void* untyped_args) const override {
-    // Make a copy of the action before performing it, in case the 
-    // action deletes the mock object (and thus deletes itself). 
-    const Action<F> action = *static_cast<const Action<F>*>(untyped_action); 
+    // Make a copy of the action before performing it, in case the
+    // action deletes the mock object (and thus deletes itself).
+    const Action<F> action = *static_cast<const Action<F>*>(untyped_action);
     ArgumentTuple* args = static_cast<ArgumentTuple*>(untyped_args);
     return ResultHolder::PerformAction(action, std::move(*args));
-  } 
- 
-  // Implements UntypedFunctionMockerBase::ClearDefaultActionsLocked(): 
-  // clears the ON_CALL()s set on this mock function. 
+  }
+
+  // Implements UntypedFunctionMockerBase::ClearDefaultActionsLocked():
+  // clears the ON_CALL()s set on this mock function.
   void ClearDefaultActionsLocked() override
-      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) { 
-    g_gmock_mutex.AssertHeld(); 
- 
-    // Deleting our default actions may trigger other mock objects to be 
-    // deleted, for example if an action contains a reference counted smart 
-    // pointer to that mock object, and that is the last reference. So if we 
-    // delete our actions within the context of the global mutex we may deadlock 
-    // when this method is called again. Instead, make a copy of the set of 
-    // actions to delete, clear our set within the mutex, and then delete the 
-    // actions outside of the mutex. 
-    UntypedOnCallSpecs specs_to_delete; 
-    untyped_on_call_specs_.swap(specs_to_delete); 
- 
-    g_gmock_mutex.Unlock(); 
-    for (UntypedOnCallSpecs::const_iterator it = 
-             specs_to_delete.begin(); 
-         it != specs_to_delete.end(); ++it) { 
-      delete static_cast<const OnCallSpec<F>*>(*it); 
-    } 
- 
-    // Lock the mutex again, since the caller expects it to be locked when we 
-    // return. 
-    g_gmock_mutex.Lock(); 
-  } 
- 
+      GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+    g_gmock_mutex.AssertHeld();
+
+    // Deleting our default actions may trigger other mock objects to be
+    // deleted, for example if an action contains a reference counted smart
+    // pointer to that mock object, and that is the last reference. So if we
+    // delete our actions within the context of the global mutex we may deadlock
+    // when this method is called again. Instead, make a copy of the set of
+    // actions to delete, clear our set within the mutex, and then delete the
+    // actions outside of the mutex.
+    UntypedOnCallSpecs specs_to_delete;
+    untyped_on_call_specs_.swap(specs_to_delete);
+
+    g_gmock_mutex.Unlock();
+    for (UntypedOnCallSpecs::const_iterator it =
+             specs_to_delete.begin();
+         it != specs_to_delete.end(); ++it) {
+      delete static_cast<const OnCallSpec<F>*>(*it);
+    }
+
+    // Lock the mutex again, since the caller expects it to be locked when we
+    // return.
+    g_gmock_mutex.Lock();
+  }
+
   // Returns the result of invoking this mock function with the given
   // arguments.  This function can be safely called from multiple
   // threads concurrently.
@@ -1604,193 +1604,193 @@ class FunctionMocker<R(Args...)> final : public UntypedFunctionMockerBase {
     return MockSpec<F>(this, ::std::make_tuple(std::move(m)...));
   }
 
- protected: 
-  template <typename Function> 
-  friend class MockSpec; 
- 
-  typedef ActionResultHolder<Result> ResultHolder; 
- 
-  // Adds and returns a default action spec for this mock function. 
-  OnCallSpec<F>& AddNewOnCallSpec( 
-      const char* file, int line, 
-      const ArgumentMatcherTuple& m) 
-          GTEST_LOCK_EXCLUDED_(g_gmock_mutex) { 
-    Mock::RegisterUseByOnCallOrExpectCall(MockObject(), file, line); 
-    OnCallSpec<F>* const on_call_spec = new OnCallSpec<F>(file, line, m); 
-    untyped_on_call_specs_.push_back(on_call_spec); 
-    return *on_call_spec; 
-  } 
- 
-  // Adds and returns an expectation spec for this mock function. 
+ protected:
+  template <typename Function>
+  friend class MockSpec;
+
+  typedef ActionResultHolder<Result> ResultHolder;
+
+  // Adds and returns a default action spec for this mock function.
+  OnCallSpec<F>& AddNewOnCallSpec(
+      const char* file, int line,
+      const ArgumentMatcherTuple& m)
+          GTEST_LOCK_EXCLUDED_(g_gmock_mutex) {
+    Mock::RegisterUseByOnCallOrExpectCall(MockObject(), file, line);
+    OnCallSpec<F>* const on_call_spec = new OnCallSpec<F>(file, line, m);
+    untyped_on_call_specs_.push_back(on_call_spec);
+    return *on_call_spec;
+  }
+
+  // Adds and returns an expectation spec for this mock function.
   TypedExpectation<F>& AddNewExpectation(const char* file, int line,
                                          const std::string& source_text,
                                          const ArgumentMatcherTuple& m)
       GTEST_LOCK_EXCLUDED_(g_gmock_mutex) {
-    Mock::RegisterUseByOnCallOrExpectCall(MockObject(), file, line); 
-    TypedExpectation<F>* const expectation = 
-        new TypedExpectation<F>(this, file, line, source_text, m); 
+    Mock::RegisterUseByOnCallOrExpectCall(MockObject(), file, line);
+    TypedExpectation<F>* const expectation =
+        new TypedExpectation<F>(this, file, line, source_text, m);
     const std::shared_ptr<ExpectationBase> untyped_expectation(expectation);
     // See the definition of untyped_expectations_ for why access to
     // it is unprotected here.
-    untyped_expectations_.push_back(untyped_expectation); 
- 
-    // Adds this expectation into the implicit sequence if there is one. 
-    Sequence* const implicit_sequence = g_gmock_implicit_sequence.get(); 
+    untyped_expectations_.push_back(untyped_expectation);
+
+    // Adds this expectation into the implicit sequence if there is one.
+    Sequence* const implicit_sequence = g_gmock_implicit_sequence.get();
     if (implicit_sequence != nullptr) {
-      implicit_sequence->AddExpectation(Expectation(untyped_expectation)); 
-    } 
- 
-    return *expectation; 
-  } 
- 
- private: 
-  template <typename Func> friend class TypedExpectation; 
- 
-  // Some utilities needed for implementing UntypedInvokeWith(). 
- 
-  // Describes what default action will be performed for the given 
-  // arguments. 
-  // L = * 
-  void DescribeDefaultActionTo(const ArgumentTuple& args, 
-                               ::std::ostream* os) const { 
-    const OnCallSpec<F>* const spec = FindOnCallSpec(args); 
- 
+      implicit_sequence->AddExpectation(Expectation(untyped_expectation));
+    }
+
+    return *expectation;
+  }
+
+ private:
+  template <typename Func> friend class TypedExpectation;
+
+  // Some utilities needed for implementing UntypedInvokeWith().
+
+  // Describes what default action will be performed for the given
+  // arguments.
+  // L = *
+  void DescribeDefaultActionTo(const ArgumentTuple& args,
+                               ::std::ostream* os) const {
+    const OnCallSpec<F>* const spec = FindOnCallSpec(args);
+
     if (spec == nullptr) {
       *os << (std::is_void<Result>::value ? "returning directly.\n"
                                           : "returning default value.\n");
-    } else { 
-      *os << "taking default action specified at:\n" 
-          << FormatFileLocation(spec->file(), spec->line()) << "\n"; 
-    } 
-  } 
- 
-  // Writes a message that the call is uninteresting (i.e. neither 
-  // explicitly expected nor explicitly unexpected) to the given 
-  // ostream. 
+    } else {
+      *os << "taking default action specified at:\n"
+          << FormatFileLocation(spec->file(), spec->line()) << "\n";
+    }
+  }
+
+  // Writes a message that the call is uninteresting (i.e. neither
+  // explicitly expected nor explicitly unexpected) to the given
+  // ostream.
   void UntypedDescribeUninterestingCall(const void* untyped_args,
                                         ::std::ostream* os) const override
       GTEST_LOCK_EXCLUDED_(g_gmock_mutex) {
-    const ArgumentTuple& args = 
-        *static_cast<const ArgumentTuple*>(untyped_args); 
-    *os << "Uninteresting mock function call - "; 
-    DescribeDefaultActionTo(args, os); 
-    *os << "    Function call: " << Name(); 
-    UniversalPrint(args, os); 
-  } 
- 
-  // Returns the expectation that matches the given function arguments 
-  // (or NULL is there's no match); when a match is found, 
-  // untyped_action is set to point to the action that should be 
-  // performed (or NULL if the action is "do default"), and 
-  // is_excessive is modified to indicate whether the call exceeds the 
-  // expected number. 
-  // 
-  // Critical section: We must find the matching expectation and the 
-  // corresponding action that needs to be taken in an ATOMIC 
-  // transaction.  Otherwise another thread may call this mock 
-  // method in the middle and mess up the state. 
-  // 
-  // However, performing the action has to be left out of the critical 
-  // section.  The reason is that we have no control on what the 
-  // action does (it can invoke an arbitrary user function or even a 
-  // mock function) and excessive locking could cause a dead lock. 
+    const ArgumentTuple& args =
+        *static_cast<const ArgumentTuple*>(untyped_args);
+    *os << "Uninteresting mock function call - ";
+    DescribeDefaultActionTo(args, os);
+    *os << "    Function call: " << Name();
+    UniversalPrint(args, os);
+  }
+
+  // Returns the expectation that matches the given function arguments
+  // (or NULL is there's no match); when a match is found,
+  // untyped_action is set to point to the action that should be
+  // performed (or NULL if the action is "do default"), and
+  // is_excessive is modified to indicate whether the call exceeds the
+  // expected number.
+  //
+  // Critical section: We must find the matching expectation and the
+  // corresponding action that needs to be taken in an ATOMIC
+  // transaction.  Otherwise another thread may call this mock
+  // method in the middle and mess up the state.
+  //
+  // However, performing the action has to be left out of the critical
+  // section.  The reason is that we have no control on what the
+  // action does (it can invoke an arbitrary user function or even a
+  // mock function) and excessive locking could cause a dead lock.
   const ExpectationBase* UntypedFindMatchingExpectation(
       const void* untyped_args, const void** untyped_action, bool* is_excessive,
       ::std::ostream* what, ::std::ostream* why) override
       GTEST_LOCK_EXCLUDED_(g_gmock_mutex) {
-    const ArgumentTuple& args = 
-        *static_cast<const ArgumentTuple*>(untyped_args); 
-    MutexLock l(&g_gmock_mutex); 
-    TypedExpectation<F>* exp = this->FindMatchingExpectationLocked(args); 
+    const ArgumentTuple& args =
+        *static_cast<const ArgumentTuple*>(untyped_args);
+    MutexLock l(&g_gmock_mutex);
+    TypedExpectation<F>* exp = this->FindMatchingExpectationLocked(args);
     if (exp == nullptr) {  // A match wasn't found.
-      this->FormatUnexpectedCallMessageLocked(args, what, why); 
+      this->FormatUnexpectedCallMessageLocked(args, what, why);
       return nullptr;
-    } 
- 
-    // This line must be done before calling GetActionForArguments(), 
-    // which will increment the call count for *exp and thus affect 
-    // its saturation status. 
-    *is_excessive = exp->IsSaturated(); 
-    const Action<F>* action = exp->GetActionForArguments(this, args, what, why); 
+    }
+
+    // This line must be done before calling GetActionForArguments(),
+    // which will increment the call count for *exp and thus affect
+    // its saturation status.
+    *is_excessive = exp->IsSaturated();
+    const Action<F>* action = exp->GetActionForArguments(this, args, what, why);
     if (action != nullptr && action->IsDoDefault())
       action = nullptr;  // Normalize "do default" to NULL.
-    *untyped_action = action; 
-    return exp; 
-  } 
- 
-  // Prints the given function arguments to the ostream. 
+    *untyped_action = action;
+    return exp;
+  }
+
+  // Prints the given function arguments to the ostream.
   void UntypedPrintArgs(const void* untyped_args,
                         ::std::ostream* os) const override {
-    const ArgumentTuple& args = 
-        *static_cast<const ArgumentTuple*>(untyped_args); 
-    UniversalPrint(args, os); 
-  } 
- 
-  // Returns the expectation that matches the arguments, or NULL if no 
-  // expectation matches them. 
-  TypedExpectation<F>* FindMatchingExpectationLocked( 
-      const ArgumentTuple& args) const 
-          GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) { 
-    g_gmock_mutex.AssertHeld(); 
+    const ArgumentTuple& args =
+        *static_cast<const ArgumentTuple*>(untyped_args);
+    UniversalPrint(args, os);
+  }
+
+  // Returns the expectation that matches the arguments, or NULL if no
+  // expectation matches them.
+  TypedExpectation<F>* FindMatchingExpectationLocked(
+      const ArgumentTuple& args) const
+          GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+    g_gmock_mutex.AssertHeld();
     // See the definition of untyped_expectations_ for why access to
     // it is unprotected here.
-    for (typename UntypedExpectations::const_reverse_iterator it = 
-             untyped_expectations_.rbegin(); 
-         it != untyped_expectations_.rend(); ++it) { 
-      TypedExpectation<F>* const exp = 
-          static_cast<TypedExpectation<F>*>(it->get()); 
-      if (exp->ShouldHandleArguments(args)) { 
-        return exp; 
-      } 
-    } 
+    for (typename UntypedExpectations::const_reverse_iterator it =
+             untyped_expectations_.rbegin();
+         it != untyped_expectations_.rend(); ++it) {
+      TypedExpectation<F>* const exp =
+          static_cast<TypedExpectation<F>*>(it->get());
+      if (exp->ShouldHandleArguments(args)) {
+        return exp;
+      }
+    }
     return nullptr;
-  } 
- 
-  // Returns a message that the arguments don't match any expectation. 
-  void FormatUnexpectedCallMessageLocked( 
-      const ArgumentTuple& args, 
-      ::std::ostream* os, 
-      ::std::ostream* why) const 
-          GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) { 
-    g_gmock_mutex.AssertHeld(); 
-    *os << "\nUnexpected mock function call - "; 
-    DescribeDefaultActionTo(args, os); 
-    PrintTriedExpectationsLocked(args, why); 
-  } 
- 
-  // Prints a list of expectations that have been tried against the 
-  // current mock function call. 
-  void PrintTriedExpectationsLocked( 
-      const ArgumentTuple& args, 
-      ::std::ostream* why) const 
-          GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) { 
-    g_gmock_mutex.AssertHeld(); 
+  }
+
+  // Returns a message that the arguments don't match any expectation.
+  void FormatUnexpectedCallMessageLocked(
+      const ArgumentTuple& args,
+      ::std::ostream* os,
+      ::std::ostream* why) const
+          GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+    g_gmock_mutex.AssertHeld();
+    *os << "\nUnexpected mock function call - ";
+    DescribeDefaultActionTo(args, os);
+    PrintTriedExpectationsLocked(args, why);
+  }
+
+  // Prints a list of expectations that have been tried against the
+  // current mock function call.
+  void PrintTriedExpectationsLocked(
+      const ArgumentTuple& args,
+      ::std::ostream* why) const
+          GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
+    g_gmock_mutex.AssertHeld();
     const size_t count = untyped_expectations_.size();
-    *why << "Google Mock tried the following " << count << " " 
-         << (count == 1 ? "expectation, but it didn't match" : 
-             "expectations, but none matched") 
-         << ":\n"; 
+    *why << "Google Mock tried the following " << count << " "
+         << (count == 1 ? "expectation, but it didn't match" :
+             "expectations, but none matched")
+         << ":\n";
     for (size_t i = 0; i < count; i++) {
-      TypedExpectation<F>* const expectation = 
-          static_cast<TypedExpectation<F>*>(untyped_expectations_[i].get()); 
-      *why << "\n"; 
-      expectation->DescribeLocationTo(why); 
-      if (count > 1) { 
-        *why << "tried expectation #" << i << ": "; 
-      } 
-      *why << expectation->source_text() << "...\n"; 
-      expectation->ExplainMatchResultTo(args, why); 
-      expectation->DescribeCallCountTo(why); 
-    } 
-  } 
+      TypedExpectation<F>* const expectation =
+          static_cast<TypedExpectation<F>*>(untyped_expectations_[i].get());
+      *why << "\n";
+      expectation->DescribeLocationTo(why);
+      if (count > 1) {
+        *why << "tried expectation #" << i << ": ";
+      }
+      *why << expectation->source_text() << "...\n";
+      expectation->ExplainMatchResultTo(args, why);
+      expectation->DescribeCallCountTo(why);
+    }
+  }
 };  // class FunctionMocker
- 
+
 // Reports an uninteresting call (whose description is in msg) in the
 // manner specified by 'reaction'.
 void ReportUninterestingCall(CallReaction reaction, const std::string& msg);
- 
+
 }  // namespace internal
- 
+
 namespace internal {
 
 template <typename F>
@@ -1924,44 +1924,44 @@ using SignatureOfT = typename SignatureOf<F>::type;
 template <typename F>
 class MockFunction : public internal::MockFunction<internal::SignatureOfT<F>> {
   using Base = internal::MockFunction<internal::SignatureOfT<F>>;
- 
+
  public:
   using Base::Base;
 };
 
-// The style guide prohibits "using" statements in a namespace scope 
-// inside a header file.  However, the MockSpec class template is 
-// meant to be defined in the ::testing namespace.  The following line 
-// is just a trick for working around a bug in MSVC 8.0, which cannot 
-// handle it if we define MockSpec in ::testing. 
-using internal::MockSpec; 
- 
-// Const(x) is a convenient function for obtaining a const reference 
-// to x.  This is useful for setting expectations on an overloaded 
-// const mock method, e.g. 
-// 
-//   class MockFoo : public FooInterface { 
-//    public: 
-//     MOCK_METHOD0(Bar, int()); 
-//     MOCK_CONST_METHOD0(Bar, int&()); 
-//   }; 
-// 
-//   MockFoo foo; 
-//   // Expects a call to non-const MockFoo::Bar(). 
-//   EXPECT_CALL(foo, Bar()); 
-//   // Expects a call to const MockFoo::Bar(). 
-//   EXPECT_CALL(Const(foo), Bar()); 
-template <typename T> 
-inline const T& Const(const T& x) { return x; } 
- 
-// Constructs an Expectation object that references and co-owns exp. 
-inline Expectation::Expectation(internal::ExpectationBase& exp)  // NOLINT 
-    : expectation_base_(exp.GetHandle().expectation_base()) {} 
- 
-}  // namespace testing 
- 
+// The style guide prohibits "using" statements in a namespace scope
+// inside a header file.  However, the MockSpec class template is
+// meant to be defined in the ::testing namespace.  The following line
+// is just a trick for working around a bug in MSVC 8.0, which cannot
+// handle it if we define MockSpec in ::testing.
+using internal::MockSpec;
+
+// Const(x) is a convenient function for obtaining a const reference
+// to x.  This is useful for setting expectations on an overloaded
+// const mock method, e.g.
+//
+//   class MockFoo : public FooInterface {
+//    public:
+//     MOCK_METHOD0(Bar, int());
+//     MOCK_CONST_METHOD0(Bar, int&());
+//   };
+//
+//   MockFoo foo;
+//   // Expects a call to non-const MockFoo::Bar().
+//   EXPECT_CALL(foo, Bar());
+//   // Expects a call to const MockFoo::Bar().
+//   EXPECT_CALL(Const(foo), Bar());
+template <typename T>
+inline const T& Const(const T& x) { return x; }
+
+// Constructs an Expectation object that references and co-owns exp.
+inline Expectation::Expectation(internal::ExpectationBase& exp)  // NOLINT
+    : expectation_base_(exp.GetHandle().expectation_base()) {}
+
+}  // namespace testing
+
 GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251
- 
+
 // Implementation for ON_CALL and EXPECT_CALL macros. A separate macro is
 // required to avoid compile errors when the name of the method used in call is
 // a result of macro expansion. See CompilesWithMethodNameExpandedFromMacro
@@ -2028,7 +2028,7 @@ GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251
   ((mock_expr).gmock_##call)(::testing::internal::GetWithoutMatchers(), \
                              nullptr)                                   \
       .Setter(__FILE__, __LINE__, #mock_expr, #call)
- 
+
 #define ON_CALL(obj, call) \
   GMOCK_ON_CALL_IMPL_(obj, InternalDefaultActionSetAt, call)
 
diff --git a/contrib/restricted/googletest/googlemock/include/gmock/gmock.h b/contrib/restricted/googletest/googlemock/include/gmock/gmock.h
index f021eddb25..12469bc466 100644
--- a/contrib/restricted/googletest/googlemock/include/gmock/gmock.h
+++ b/contrib/restricted/googletest/googlemock/include/gmock/gmock.h
@@ -56,14 +56,14 @@
 //
 // where all clauses are optional and WillOnce() can be repeated.
 
-#include "gmock/gmock-actions.h" 
-#include "gmock/gmock-cardinalities.h" 
+#include "gmock/gmock-actions.h"
+#include "gmock/gmock-cardinalities.h"
 #include "gmock/gmock-function-mocker.h"
-#include "gmock/gmock-matchers.h" 
-#include "gmock/gmock-more-actions.h" 
-#include "gmock/gmock-more-matchers.h" 
+#include "gmock/gmock-matchers.h"
+#include "gmock/gmock-more-actions.h"
+#include "gmock/gmock-more-matchers.h"
 #include "gmock/gmock-nice-strict.h"
-#include "gmock/internal/gmock-internal-utils.h" 
+#include "gmock/internal/gmock-internal-utils.h"
 
 namespace testing {
 
diff --git a/contrib/restricted/googletest/googlemock/include/gmock/internal/custom/gmock-generated-actions.h b/contrib/restricted/googletest/googlemock/include/gmock/internal/custom/gmock-generated-actions.h
index 532c1707b9..63f899962e 100644
--- a/contrib/restricted/googletest/googlemock/include/gmock/internal/custom/gmock-generated-actions.h
+++ b/contrib/restricted/googletest/googlemock/include/gmock/internal/custom/gmock-generated-actions.h
@@ -2,5 +2,5 @@
 
 #ifndef GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_GENERATED_ACTIONS_H_
 #define GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_GENERATED_ACTIONS_H_
- 
+
 #endif  // GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_GENERATED_ACTIONS_H_
diff --git a/contrib/restricted/googletest/googlemock/include/gmock/internal/custom/gmock-matchers.h b/contrib/restricted/googletest/googlemock/include/gmock/internal/custom/gmock-matchers.h
index 788f3c01a6..638429488e 100644
--- a/contrib/restricted/googletest/googlemock/include/gmock/internal/custom/gmock-matchers.h
+++ b/contrib/restricted/googletest/googlemock/include/gmock/internal/custom/gmock-matchers.h
@@ -1,36 +1,36 @@
-// Copyright 2015, Google Inc. 
-// All rights reserved. 
-// 
-// Redistribution and use in source and binary forms, with or without 
-// modification, are permitted provided that the following conditions are 
-// met: 
-// 
-//     * Redistributions of source code must retain the above copyright 
-// notice, this list of conditions and the following disclaimer. 
-//     * Redistributions in binary form must reproduce the above 
-// copyright notice, this list of conditions and the following disclaimer 
-// in the documentation and/or other materials provided with the 
-// distribution. 
-//     * Neither the name of Google Inc. nor the names of its 
-// contributors may be used to endorse or promote products derived from 
-// this software without specific prior written permission. 
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-// 
+// Copyright 2015, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
 // Injection point for custom user configurations. See README for details
-// 
+//
 // GOOGLETEST_CM0002 DO NOT DELETE
- 
+
 #ifndef GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_MATCHERS_H_
 #define GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_MATCHERS_H_
 #endif  // GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_MATCHERS_H_
diff --git a/contrib/restricted/googletest/googlemock/include/gmock/internal/custom/gmock-port.h b/contrib/restricted/googletest/googlemock/include/gmock/internal/custom/gmock-port.h
index 06637a097f..14378692ae 100644
--- a/contrib/restricted/googletest/googlemock/include/gmock/internal/custom/gmock-port.h
+++ b/contrib/restricted/googletest/googlemock/include/gmock/internal/custom/gmock-port.h
@@ -1,39 +1,39 @@
-// Copyright 2015, Google Inc. 
-// All rights reserved. 
-// 
-// Redistribution and use in source and binary forms, with or without 
-// modification, are permitted provided that the following conditions are 
-// met: 
-// 
-//     * Redistributions of source code must retain the above copyright 
-// notice, this list of conditions and the following disclaimer. 
-//     * Redistributions in binary form must reproduce the above 
-// copyright notice, this list of conditions and the following disclaimer 
-// in the documentation and/or other materials provided with the 
-// distribution. 
-//     * Neither the name of Google Inc. nor the names of its 
-// contributors may be used to endorse or promote products derived from 
-// this software without specific prior written permission. 
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-// 
+// Copyright 2015, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
 // Injection point for custom user configurations. See README for details
-// 
-// ** Custom implementation starts here ** 
- 
+//
+// ** Custom implementation starts here **
+
 // GOOGLETEST_CM0002 DO NOT DELETE
 
 #ifndef GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_PORT_H_
 #define GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_PORT_H_
- 
+
 #endif  // GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_PORT_H_
diff --git a/contrib/restricted/googletest/googlemock/include/gmock/internal/gmock-internal-utils.h b/contrib/restricted/googletest/googlemock/include/gmock/internal/gmock-internal-utils.h
index 7502064281..317544a7da 100644
--- a/contrib/restricted/googletest/googlemock/include/gmock/internal/gmock-internal-utils.h
+++ b/contrib/restricted/googletest/googlemock/include/gmock/internal/gmock-internal-utils.h
@@ -1,58 +1,58 @@
-// Copyright 2007, Google Inc. 
-// All rights reserved. 
-// 
-// Redistribution and use in source and binary forms, with or without 
-// modification, are permitted provided that the following conditions are 
-// met: 
-// 
-//     * Redistributions of source code must retain the above copyright 
-// notice, this list of conditions and the following disclaimer. 
-//     * Redistributions in binary form must reproduce the above 
-// copyright notice, this list of conditions and the following disclaimer 
-// in the documentation and/or other materials provided with the 
-// distribution. 
-//     * Neither the name of Google Inc. nor the names of its 
-// contributors may be used to endorse or promote products derived from 
-// this software without specific prior written permission. 
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- 
-
-// Google Mock - a framework for writing C++ mock classes. 
-// 
-// This file defines some utilities useful for implementing Google 
-// Mock.  They are subject to change without notice, so please DO NOT 
-// USE THEM IN USER CODE. 
- 
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+// Google Mock - a framework for writing C++ mock classes.
+//
+// This file defines some utilities useful for implementing Google
+// Mock.  They are subject to change without notice, so please DO NOT
+// USE THEM IN USER CODE.
+
 // GOOGLETEST_CM0002 DO NOT DELETE
 
 #ifndef GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_INTERNAL_UTILS_H_
 #define GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_INTERNAL_UTILS_H_
- 
-#include <stdio.h> 
-#include <ostream>  // NOLINT 
-#include <string> 
+
+#include <stdio.h>
+#include <ostream>  // NOLINT
+#include <string>
 #include <type_traits>
-#include "gmock/internal/gmock-port.h" 
-#include "gtest/gtest.h" 
- 
-namespace testing { 
+#include "gmock/internal/gmock-port.h"
+#include "gtest/gtest.h"
+
+namespace testing {
 
 template <typename>
 class Matcher;
 
-namespace internal { 
- 
+namespace internal {
+
 // Silence MSVC C4100 (unreferenced formal parameter) and
 // C4805('==': unsafe mix of type 'const int' and type 'const bool')
 #ifdef _MSC_VER
@@ -65,92 +65,92 @@ namespace internal {
 // the joined string.
 GTEST_API_ std::string JoinAsTuple(const Strings& fields);
 
-// Converts an identifier name to a space-separated list of lower-case 
-// words.  Each maximum substring of the form [A-Za-z][a-z]*|\d+ is 
-// treated as one word.  For example, both "FooBar123" and 
-// "foo_bar_123" are converted to "foo bar 123". 
+// Converts an identifier name to a space-separated list of lower-case
+// words.  Each maximum substring of the form [A-Za-z][a-z]*|\d+ is
+// treated as one word.  For example, both "FooBar123" and
+// "foo_bar_123" are converted to "foo bar 123".
 GTEST_API_ std::string ConvertIdentifierNameToWords(const char* id_name);
- 
-// GetRawPointer(p) returns the raw pointer underlying p when p is a 
-// smart pointer, or returns p itself when p is already a raw pointer. 
-// The following default implementation is for the smart pointer case. 
-template <typename Pointer> 
-inline const typename Pointer::element_type* GetRawPointer(const Pointer& p) { 
-  return p.get(); 
-} 
-// This overloaded version is for the raw pointer case. 
-template <typename Element> 
-inline Element* GetRawPointer(Element* p) { return p; } 
- 
-// MSVC treats wchar_t as a native type usually, but treats it as the 
-// same as unsigned short when the compiler option /Zc:wchar_t- is 
-// specified.  It defines _NATIVE_WCHAR_T_DEFINED symbol when wchar_t 
-// is a native type. 
+
+// GetRawPointer(p) returns the raw pointer underlying p when p is a
+// smart pointer, or returns p itself when p is already a raw pointer.
+// The following default implementation is for the smart pointer case.
+template <typename Pointer>
+inline const typename Pointer::element_type* GetRawPointer(const Pointer& p) {
+  return p.get();
+}
+// This overloaded version is for the raw pointer case.
+template <typename Element>
+inline Element* GetRawPointer(Element* p) { return p; }
+
+// MSVC treats wchar_t as a native type usually, but treats it as the
+// same as unsigned short when the compiler option /Zc:wchar_t- is
+// specified.  It defines _NATIVE_WCHAR_T_DEFINED symbol when wchar_t
+// is a native type.
 #if defined(_MSC_VER) && !defined(_NATIVE_WCHAR_T_DEFINED)
-// wchar_t is a typedef. 
-#else 
-# define GMOCK_WCHAR_T_IS_NATIVE_ 1 
-#endif 
- 
-// In what follows, we use the term "kind" to indicate whether a type 
-// is bool, an integer type (excluding bool), a floating-point type, 
-// or none of them.  This categorization is useful for determining 
-// when a matcher argument type can be safely converted to another 
-// type in the implementation of SafeMatcherCast. 
-enum TypeKind { 
-  kBool, kInteger, kFloatingPoint, kOther 
-}; 
- 
-// KindOf<T>::value is the kind of type T. 
-template <typename T> struct KindOf { 
-  enum { value = kOther };  // The default kind. 
-}; 
- 
-// This macro declares that the kind of 'type' is 'kind'. 
-#define GMOCK_DECLARE_KIND_(type, kind) \ 
-  template <> struct KindOf<type> { enum { value = kind }; } 
- 
-GMOCK_DECLARE_KIND_(bool, kBool); 
- 
-// All standard integer types. 
-GMOCK_DECLARE_KIND_(char, kInteger); 
-GMOCK_DECLARE_KIND_(signed char, kInteger); 
-GMOCK_DECLARE_KIND_(unsigned char, kInteger); 
-GMOCK_DECLARE_KIND_(short, kInteger);  // NOLINT 
-GMOCK_DECLARE_KIND_(unsigned short, kInteger);  // NOLINT 
-GMOCK_DECLARE_KIND_(int, kInteger); 
-GMOCK_DECLARE_KIND_(unsigned int, kInteger); 
-GMOCK_DECLARE_KIND_(long, kInteger);  // NOLINT 
-GMOCK_DECLARE_KIND_(unsigned long, kInteger);  // NOLINT 
+// wchar_t is a typedef.
+#else
+# define GMOCK_WCHAR_T_IS_NATIVE_ 1
+#endif
+
+// In what follows, we use the term "kind" to indicate whether a type
+// is bool, an integer type (excluding bool), a floating-point type,
+// or none of them.  This categorization is useful for determining
+// when a matcher argument type can be safely converted to another
+// type in the implementation of SafeMatcherCast.
+enum TypeKind {
+  kBool, kInteger, kFloatingPoint, kOther
+};
+
+// KindOf<T>::value is the kind of type T.
+template <typename T> struct KindOf {
+  enum { value = kOther };  // The default kind.
+};
+
+// This macro declares that the kind of 'type' is 'kind'.
+#define GMOCK_DECLARE_KIND_(type, kind) \
+  template <> struct KindOf<type> { enum { value = kind }; }
+
+GMOCK_DECLARE_KIND_(bool, kBool);
+
+// All standard integer types.
+GMOCK_DECLARE_KIND_(char, kInteger);
+GMOCK_DECLARE_KIND_(signed char, kInteger);
+GMOCK_DECLARE_KIND_(unsigned char, kInteger);
+GMOCK_DECLARE_KIND_(short, kInteger);  // NOLINT
+GMOCK_DECLARE_KIND_(unsigned short, kInteger);  // NOLINT
+GMOCK_DECLARE_KIND_(int, kInteger);
+GMOCK_DECLARE_KIND_(unsigned int, kInteger);
+GMOCK_DECLARE_KIND_(long, kInteger);  // NOLINT
+GMOCK_DECLARE_KIND_(unsigned long, kInteger);  // NOLINT
 GMOCK_DECLARE_KIND_(long long, kInteger);  // NOLINT
 GMOCK_DECLARE_KIND_(unsigned long long, kInteger);  // NOLINT
- 
-#if GMOCK_WCHAR_T_IS_NATIVE_ 
-GMOCK_DECLARE_KIND_(wchar_t, kInteger); 
-#endif 
- 
-// All standard floating-point types. 
-GMOCK_DECLARE_KIND_(float, kFloatingPoint); 
-GMOCK_DECLARE_KIND_(double, kFloatingPoint); 
-GMOCK_DECLARE_KIND_(long double, kFloatingPoint); 
- 
-#undef GMOCK_DECLARE_KIND_ 
- 
-// Evaluates to the kind of 'type'. 
-#define GMOCK_KIND_OF_(type) \ 
-  static_cast< ::testing::internal::TypeKind>( \ 
-      ::testing::internal::KindOf<type>::value) 
- 
-// LosslessArithmeticConvertibleImpl<kFromKind, From, kToKind, To>::value 
+
+#if GMOCK_WCHAR_T_IS_NATIVE_
+GMOCK_DECLARE_KIND_(wchar_t, kInteger);
+#endif
+
+// All standard floating-point types.
+GMOCK_DECLARE_KIND_(float, kFloatingPoint);
+GMOCK_DECLARE_KIND_(double, kFloatingPoint);
+GMOCK_DECLARE_KIND_(long double, kFloatingPoint);
+
+#undef GMOCK_DECLARE_KIND_
+
+// Evaluates to the kind of 'type'.
+#define GMOCK_KIND_OF_(type) \
+  static_cast< ::testing::internal::TypeKind>( \
+      ::testing::internal::KindOf<type>::value)
+
+// LosslessArithmeticConvertibleImpl<kFromKind, From, kToKind, To>::value
 // is true if and only if arithmetic type From can be losslessly converted to
-// arithmetic type To. 
-// 
-// It's the user's responsibility to ensure that both From and To are 
-// raw (i.e. has no CV modifier, is not a pointer, and is not a 
-// reference) built-in arithmetic types, kFromKind is the kind of 
-// From, and kToKind is the kind of To; the value is 
-// implementation-defined when the above pre-condition is violated. 
-template <TypeKind kFromKind, typename From, TypeKind kToKind, typename To> 
+// arithmetic type To.
+//
+// It's the user's responsibility to ensure that both From and To are
+// raw (i.e. has no CV modifier, is not a pointer, and is not a
+// reference) built-in arithmetic types, kFromKind is the kind of
+// From, and kToKind is the kind of To; the value is
+// implementation-defined when the above pre-condition is violated.
+template <TypeKind kFromKind, typename From, TypeKind kToKind, typename To>
 using LosslessArithmeticConvertibleImpl = std::integral_constant<
     bool,
     // clang-format off
@@ -175,96 +175,96 @@ using LosslessArithmeticConvertibleImpl = std::integral_constant<
     : false
     // clang-format on
     >;
- 
+
 // LosslessArithmeticConvertible<From, To>::value is true if and only if
 // arithmetic type From can be losslessly converted to arithmetic type To.
-// 
-// It's the user's responsibility to ensure that both From and To are 
-// raw (i.e. has no CV modifier, is not a pointer, and is not a 
-// reference) built-in arithmetic types; the value is 
-// implementation-defined when the above pre-condition is violated. 
-template <typename From, typename To> 
+//
+// It's the user's responsibility to ensure that both From and To are
+// raw (i.e. has no CV modifier, is not a pointer, and is not a
+// reference) built-in arithmetic types; the value is
+// implementation-defined when the above pre-condition is violated.
+template <typename From, typename To>
 using LosslessArithmeticConvertible =
     LosslessArithmeticConvertibleImpl<GMOCK_KIND_OF_(From), From,
                                       GMOCK_KIND_OF_(To), To>;
- 
-// This interface knows how to report a Google Mock failure (either 
-// non-fatal or fatal). 
-class FailureReporterInterface { 
- public: 
-  // The type of a failure (either non-fatal or fatal). 
-  enum FailureType { 
-    kNonfatal, kFatal 
-  }; 
- 
-  virtual ~FailureReporterInterface() {} 
- 
-  // Reports a failure that occurred at the given source file location. 
-  virtual void ReportFailure(FailureType type, const char* file, int line, 
+
+// This interface knows how to report a Google Mock failure (either
+// non-fatal or fatal).
+class FailureReporterInterface {
+ public:
+  // The type of a failure (either non-fatal or fatal).
+  enum FailureType {
+    kNonfatal, kFatal
+  };
+
+  virtual ~FailureReporterInterface() {}
+
+  // Reports a failure that occurred at the given source file location.
+  virtual void ReportFailure(FailureType type, const char* file, int line,
                              const std::string& message) = 0;
-}; 
- 
-// Returns the failure reporter used by Google Mock. 
-GTEST_API_ FailureReporterInterface* GetFailureReporter(); 
- 
-// Asserts that condition is true; aborts the process with the given 
-// message if condition is false.  We cannot use LOG(FATAL) or CHECK() 
-// as Google Mock might be used to mock the log sink itself.  We 
-// inline this function to prevent it from showing up in the stack 
-// trace. 
-inline void Assert(bool condition, const char* file, int line, 
+};
+
+// Returns the failure reporter used by Google Mock.
+GTEST_API_ FailureReporterInterface* GetFailureReporter();
+
+// Asserts that condition is true; aborts the process with the given
+// message if condition is false.  We cannot use LOG(FATAL) or CHECK()
+// as Google Mock might be used to mock the log sink itself.  We
+// inline this function to prevent it from showing up in the stack
+// trace.
+inline void Assert(bool condition, const char* file, int line,
                    const std::string& msg) {
-  if (!condition) { 
-    GetFailureReporter()->ReportFailure(FailureReporterInterface::kFatal, 
-                                        file, line, msg); 
-  } 
-} 
-inline void Assert(bool condition, const char* file, int line) { 
-  Assert(condition, file, line, "Assertion failed."); 
-} 
- 
-// Verifies that condition is true; generates a non-fatal failure if 
-// condition is false. 
-inline void Expect(bool condition, const char* file, int line, 
+  if (!condition) {
+    GetFailureReporter()->ReportFailure(FailureReporterInterface::kFatal,
+                                        file, line, msg);
+  }
+}
+inline void Assert(bool condition, const char* file, int line) {
+  Assert(condition, file, line, "Assertion failed.");
+}
+
+// Verifies that condition is true; generates a non-fatal failure if
+// condition is false.
+inline void Expect(bool condition, const char* file, int line,
                    const std::string& msg) {
-  if (!condition) { 
-    GetFailureReporter()->ReportFailure(FailureReporterInterface::kNonfatal, 
-                                        file, line, msg); 
-  } 
-} 
-inline void Expect(bool condition, const char* file, int line) { 
-  Expect(condition, file, line, "Expectation failed."); 
-} 
- 
-// Severity level of a log. 
-enum LogSeverity { 
-  kInfo = 0, 
-  kWarning = 1 
-}; 
- 
-// Valid values for the --gmock_verbose flag. 
- 
-// All logs (informational and warnings) are printed. 
-const char kInfoVerbosity[] = "info"; 
-// Only warnings are printed. 
-const char kWarningVerbosity[] = "warning"; 
-// No logs are printed. 
-const char kErrorVerbosity[] = "error"; 
- 
+  if (!condition) {
+    GetFailureReporter()->ReportFailure(FailureReporterInterface::kNonfatal,
+                                        file, line, msg);
+  }
+}
+inline void Expect(bool condition, const char* file, int line) {
+  Expect(condition, file, line, "Expectation failed.");
+}
+
+// Severity level of a log.
+enum LogSeverity {
+  kInfo = 0,
+  kWarning = 1
+};
+
+// Valid values for the --gmock_verbose flag.
+
+// All logs (informational and warnings) are printed.
+const char kInfoVerbosity[] = "info";
+// Only warnings are printed.
+const char kWarningVerbosity[] = "warning";
+// No logs are printed.
+const char kErrorVerbosity[] = "error";
+
 // Returns true if and only if a log with the given severity is visible
 // according to the --gmock_verbose flag.
-GTEST_API_ bool LogIsVisible(LogSeverity severity); 
- 
+GTEST_API_ bool LogIsVisible(LogSeverity severity);
+
 // Prints the given message to stdout if and only if 'severity' >= the level
-// specified by the --gmock_verbose flag.  If stack_frames_to_skip >= 
-// 0, also prints the stack trace excluding the top 
-// stack_frames_to_skip frames.  In opt mode, any positive 
-// stack_frames_to_skip is treated as 0, since we don't know which 
-// function calls will be inlined by the compiler and need to be 
-// conservative. 
+// specified by the --gmock_verbose flag.  If stack_frames_to_skip >=
+// 0, also prints the stack trace excluding the top
+// stack_frames_to_skip frames.  In opt mode, any positive
+// stack_frames_to_skip is treated as 0, since we don't know which
+// function calls will be inlined by the compiler and need to be
+// conservative.
 GTEST_API_ void Log(LogSeverity severity, const std::string& message,
-                    int stack_frames_to_skip); 
- 
+                    int stack_frames_to_skip);
+
 // A marker class that is used to resolve parameterless expectations to the
 // correct overload. This must not be instantiable, to prevent client code from
 // accidentally resolving to the overload; for example:
@@ -276,131 +276,131 @@ class WithoutMatchers {
   WithoutMatchers() {}
   friend GTEST_API_ WithoutMatchers GetWithoutMatchers();
 };
- 
+
 // Internal use only: access the singleton instance of WithoutMatchers.
 GTEST_API_ WithoutMatchers GetWithoutMatchers();
 
-// Disable MSVC warnings for infinite recursion, since in this case the 
-// the recursion is unreachable. 
-#ifdef _MSC_VER 
-# pragma warning(push) 
-# pragma warning(disable:4717) 
-#endif 
- 
-// Invalid<T>() is usable as an expression of type T, but will terminate 
-// the program with an assertion failure if actually run.  This is useful 
-// when a value of type T is needed for compilation, but the statement 
-// will not really be executed (or we don't care if the statement 
-// crashes). 
-template <typename T> 
-inline T Invalid() { 
-  Assert(false, "", -1, "Internal error: attempt to return invalid value"); 
-  // This statement is unreachable, and would never terminate even if it 
-  // could be reached. It is provided only to placate compiler warnings 
-  // about missing return statements. 
-  return Invalid<T>(); 
-} 
- 
-#ifdef _MSC_VER 
-# pragma warning(pop) 
-#endif 
- 
-// Given a raw type (i.e. having no top-level reference or const 
-// modifier) RawContainer that's either an STL-style container or a 
-// native array, class StlContainerView<RawContainer> has the 
-// following members: 
-// 
-//   - type is a type that provides an STL-style container view to 
-//     (i.e. implements the STL container concept for) RawContainer; 
-//   - const_reference is a type that provides a reference to a const 
-//     RawContainer; 
-//   - ConstReference(raw_container) returns a const reference to an STL-style 
-//     container view to raw_container, which is a RawContainer. 
-//   - Copy(raw_container) returns an STL-style container view of a 
-//     copy of raw_container, which is a RawContainer. 
-// 
-// This generic version is used when RawContainer itself is already an 
-// STL-style container. 
-template <class RawContainer> 
-class StlContainerView { 
- public: 
-  typedef RawContainer type; 
-  typedef const type& const_reference; 
- 
-  static const_reference ConstReference(const RawContainer& container) { 
+// Disable MSVC warnings for infinite recursion, since in this case the
+// the recursion is unreachable.
+#ifdef _MSC_VER
+# pragma warning(push)
+# pragma warning(disable:4717)
+#endif
+
+// Invalid<T>() is usable as an expression of type T, but will terminate
+// the program with an assertion failure if actually run.  This is useful
+// when a value of type T is needed for compilation, but the statement
+// will not really be executed (or we don't care if the statement
+// crashes).
+template <typename T>
+inline T Invalid() {
+  Assert(false, "", -1, "Internal error: attempt to return invalid value");
+  // This statement is unreachable, and would never terminate even if it
+  // could be reached. It is provided only to placate compiler warnings
+  // about missing return statements.
+  return Invalid<T>();
+}
+
+#ifdef _MSC_VER
+# pragma warning(pop)
+#endif
+
+// Given a raw type (i.e. having no top-level reference or const
+// modifier) RawContainer that's either an STL-style container or a
+// native array, class StlContainerView<RawContainer> has the
+// following members:
+//
+//   - type is a type that provides an STL-style container view to
+//     (i.e. implements the STL container concept for) RawContainer;
+//   - const_reference is a type that provides a reference to a const
+//     RawContainer;
+//   - ConstReference(raw_container) returns a const reference to an STL-style
+//     container view to raw_container, which is a RawContainer.
+//   - Copy(raw_container) returns an STL-style container view of a
+//     copy of raw_container, which is a RawContainer.
+//
+// This generic version is used when RawContainer itself is already an
+// STL-style container.
+template <class RawContainer>
+class StlContainerView {
+ public:
+  typedef RawContainer type;
+  typedef const type& const_reference;
+
+  static const_reference ConstReference(const RawContainer& container) {
     static_assert(!std::is_const<RawContainer>::value,
                   "RawContainer type must not be const");
-    return container; 
-  } 
-  static type Copy(const RawContainer& container) { return container; } 
-}; 
- 
-// This specialization is used when RawContainer is a native array type. 
-template <typename Element, size_t N> 
-class StlContainerView<Element[N]> { 
- public: 
+    return container;
+  }
+  static type Copy(const RawContainer& container) { return container; }
+};
+
+// This specialization is used when RawContainer is a native array type.
+template <typename Element, size_t N>
+class StlContainerView<Element[N]> {
+ public:
   typedef typename std::remove_const<Element>::type RawElement;
-  typedef internal::NativeArray<RawElement> type; 
-  // NativeArray<T> can represent a native array either by value or by 
-  // reference (selected by a constructor argument), so 'const type' 
-  // can be used to reference a const native array.  We cannot 
-  // 'typedef const type& const_reference' here, as that would mean 
-  // ConstReference() has to return a reference to a local variable. 
-  typedef const type const_reference; 
- 
-  static const_reference ConstReference(const Element (&array)[N]) { 
+  typedef internal::NativeArray<RawElement> type;
+  // NativeArray<T> can represent a native array either by value or by
+  // reference (selected by a constructor argument), so 'const type'
+  // can be used to reference a const native array.  We cannot
+  // 'typedef const type& const_reference' here, as that would mean
+  // ConstReference() has to return a reference to a local variable.
+  typedef const type const_reference;
+
+  static const_reference ConstReference(const Element (&array)[N]) {
     static_assert(std::is_same<Element, RawElement>::value,
                   "Element type must not be const");
-    return type(array, N, RelationToSourceReference()); 
-  } 
-  static type Copy(const Element (&array)[N]) { 
-    return type(array, N, RelationToSourceCopy()); 
-  } 
-}; 
- 
-// This specialization is used when RawContainer is a native array 
-// represented as a (pointer, size) tuple. 
-template <typename ElementPointer, typename Size> 
+    return type(array, N, RelationToSourceReference());
+  }
+  static type Copy(const Element (&array)[N]) {
+    return type(array, N, RelationToSourceCopy());
+  }
+};
+
+// This specialization is used when RawContainer is a native array
+// represented as a (pointer, size) tuple.
+template <typename ElementPointer, typename Size>
 class StlContainerView< ::std::tuple<ElementPointer, Size> > {
- public: 
+ public:
   typedef typename std::remove_const<
       typename std::pointer_traits<ElementPointer>::element_type>::type
       RawElement;
-  typedef internal::NativeArray<RawElement> type; 
-  typedef const type const_reference; 
- 
-  static const_reference ConstReference( 
+  typedef internal::NativeArray<RawElement> type;
+  typedef const type const_reference;
+
+  static const_reference ConstReference(
       const ::std::tuple<ElementPointer, Size>& array) {
     return type(std::get<0>(array), std::get<1>(array),
                 RelationToSourceReference());
-  } 
+  }
   static type Copy(const ::std::tuple<ElementPointer, Size>& array) {
     return type(std::get<0>(array), std::get<1>(array), RelationToSourceCopy());
-  } 
-}; 
- 
-// The following specialization prevents the user from instantiating 
-// StlContainer with a reference type. 
-template <typename T> class StlContainerView<T&>; 
- 
-// A type transform to remove constness from the first part of a pair. 
-// Pairs like that are used as the value_type of associative containers, 
-// and this transform produces a similar but assignable pair. 
-template <typename T> 
-struct RemoveConstFromKey { 
-  typedef T type; 
-}; 
- 
-// Partially specialized to remove constness from std::pair<const K, V>. 
-template <typename K, typename V> 
-struct RemoveConstFromKey<std::pair<const K, V> > { 
-  typedef std::pair<K, V> type; 
-}; 
- 
+  }
+};
+
+// The following specialization prevents the user from instantiating
+// StlContainer with a reference type.
+template <typename T> class StlContainerView<T&>;
+
+// A type transform to remove constness from the first part of a pair.
+// Pairs like that are used as the value_type of associative containers,
+// and this transform produces a similar but assignable pair.
+template <typename T>
+struct RemoveConstFromKey {
+  typedef T type;
+};
+
+// Partially specialized to remove constness from std::pair<const K, V>.
+template <typename K, typename V>
+struct RemoveConstFromKey<std::pair<const K, V> > {
+  typedef std::pair<K, V> type;
+};
+
 // Emit an assertion failure due to incorrect DoDefault() usage. Out-of-lined to
 // reduce code size.
 GTEST_API_ void IllegalDoDefault(const char* file, int line);
- 
+
 template <typename F, typename Tuple, size_t... Idx>
 auto ApplyImpl(F&& f, Tuple&& args, IndexSequence<Idx...>) -> decltype(
     std::forward<F>(f)(std::get<Idx>(std::forward<Tuple>(args))...)) {
@@ -453,7 +453,7 @@ constexpr size_t Function<R(Args...)>::ArgumentCount;
 # pragma warning(pop)
 #endif
 
-}  // namespace internal 
-}  // namespace testing 
- 
+}  // namespace internal
+}  // namespace testing
+
 #endif  // GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_INTERNAL_UTILS_H_
diff --git a/contrib/restricted/googletest/googlemock/include/gmock/internal/gmock-port.h b/contrib/restricted/googletest/googlemock/include/gmock/internal/gmock-port.h
index 6a37a2f6c2..367a44d366 100644
--- a/contrib/restricted/googletest/googlemock/include/gmock/internal/gmock-port.h
+++ b/contrib/restricted/googletest/googlemock/include/gmock/internal/gmock-port.h
@@ -1,87 +1,87 @@
-// Copyright 2008, Google Inc. 
-// All rights reserved. 
-// 
-// Redistribution and use in source and binary forms, with or without 
-// modification, are permitted provided that the following conditions are 
-// met: 
-// 
-//     * Redistributions of source code must retain the above copyright 
-// notice, this list of conditions and the following disclaimer. 
-//     * Redistributions in binary form must reproduce the above 
-// copyright notice, this list of conditions and the following disclaimer 
-// in the documentation and/or other materials provided with the 
-// distribution. 
-//     * Neither the name of Google Inc. nor the names of its 
-// contributors may be used to endorse or promote products derived from 
-// this software without specific prior written permission. 
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+//
+// Low-level types and utilities for porting Google Mock to various
+// platforms.  All macros ending with _ and symbols defined in an
+// internal namespace are subject to change without notice.  Code
+// outside Google Mock MUST NOT USE THEM DIRECTLY.  Macros that don't
+// end with _ are part of Google Mock's public API and can be used by
+// code outside Google Mock.
 
-// 
-// Low-level types and utilities for porting Google Mock to various 
-// platforms.  All macros ending with _ and symbols defined in an 
-// internal namespace are subject to change without notice.  Code 
-// outside Google Mock MUST NOT USE THEM DIRECTLY.  Macros that don't 
-// end with _ are part of Google Mock's public API and can be used by 
-// code outside Google Mock. 
- 
 // GOOGLETEST_CM0002 DO NOT DELETE
 
 #ifndef GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_PORT_H_
 #define GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_PORT_H_
- 
-#include <assert.h> 
-#include <stdlib.h> 
+
+#include <assert.h>
+#include <stdlib.h>
 #include <cstdint>
-#include <iostream> 
- 
-// Most of the utilities needed for porting Google Mock are also 
-// required for Google Test and are defined in gtest-port.h. 
-// 
-// Note to maintainers: to reduce code duplication, prefer adding 
-// portability utilities to Google Test's gtest-port.h instead of 
-// here, as Google Mock depends on Google Test.  Only add a utility 
-// here if it's truly specific to Google Mock. 
+#include <iostream>
+
+// Most of the utilities needed for porting Google Mock are also
+// required for Google Test and are defined in gtest-port.h.
+//
+// Note to maintainers: to reduce code duplication, prefer adding
+// portability utilities to Google Test's gtest-port.h instead of
+// here, as Google Mock depends on Google Test.  Only add a utility
+// here if it's truly specific to Google Mock.
+
+#include "gtest/internal/gtest-port.h"
+#include "gmock/internal/custom/gmock-port.h"
 
-#include "gtest/internal/gtest-port.h" 
-#include "gmock/internal/custom/gmock-port.h" 
- 
 // For MS Visual C++, check the compiler version. At least VS 2015 is
-// required to compile Google Mock. 
+// required to compile Google Mock.
 #if defined(_MSC_VER) && _MSC_VER < 1900
 # error "At least Visual C++ 2015 (14.0) is required to compile Google Mock."
-#endif 
- 
-// Macro for referencing flags.  This is public as we want the user to 
-// use this syntax to reference Google Mock flags. 
-#define GMOCK_FLAG(name) FLAGS_gmock_##name 
- 
-#if !defined(GMOCK_DECLARE_bool_) 
- 
-// Macros for declaring flags. 
+#endif
+
+// Macro for referencing flags.  This is public as we want the user to
+// use this syntax to reference Google Mock flags.
+#define GMOCK_FLAG(name) FLAGS_gmock_##name
+
+#if !defined(GMOCK_DECLARE_bool_)
+
+// Macros for declaring flags.
 # define GMOCK_DECLARE_bool_(name) extern GTEST_API_ bool GMOCK_FLAG(name)
 # define GMOCK_DECLARE_int32_(name) extern GTEST_API_ int32_t GMOCK_FLAG(name)
 # define GMOCK_DECLARE_string_(name) \
-    extern GTEST_API_ ::std::string GMOCK_FLAG(name) 
- 
-// Macros for defining flags. 
+    extern GTEST_API_ ::std::string GMOCK_FLAG(name)
+
+// Macros for defining flags.
 # define GMOCK_DEFINE_bool_(name, default_val, doc) \
-    GTEST_API_ bool GMOCK_FLAG(name) = (default_val) 
+    GTEST_API_ bool GMOCK_FLAG(name) = (default_val)
 # define GMOCK_DEFINE_int32_(name, default_val, doc) \
     GTEST_API_ int32_t GMOCK_FLAG(name) = (default_val)
 # define GMOCK_DEFINE_string_(name, default_val, doc) \
-    GTEST_API_ ::std::string GMOCK_FLAG(name) = (default_val) 
- 
-#endif  // !defined(GMOCK_DECLARE_bool_) 
- 
+    GTEST_API_ ::std::string GMOCK_FLAG(name) = (default_val)
+
+#endif  // !defined(GMOCK_DECLARE_bool_)
+
 #endif  // GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_PORT_H_