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

15 files changed, 5547 insertions, 5547 deletions

diff --git a/contrib/restricted/googletest/googlemock/include/gmock/gmock-actions.h b/contrib/restricted/googletest/googlemock/include/gmock/gmock-actions.h
index f2393bd3af..88a2e779a5 100644
--- a/contrib/restricted/googletest/googlemock/include/gmock/gmock-actions.h
+++ b/contrib/restricted/googletest/googlemock/include/gmock/gmock-actions.h
@@ -27,128 +27,128 @@
 // (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:
-//
-//   ACTION(name) { statements; }
-//
-// will define an action with the given name that executes the
-// statements.  The value returned by the statements will be used as
-// the return value of the action.  Inside the statements, you can
-// refer to the K-th (0-based) argument of the mock function by
-// 'argK', and refer to its type by 'argK_type'.  For example:
-//
-//   ACTION(IncrementArg1) {
-//     arg1_type temp = arg1;
-//     return ++(*temp);
-//   }
-//
-// allows you to write
-//
-//   ...WillOnce(IncrementArg1());
-//
-// You can also refer to the entire argument tuple and its type by
-// 'args' and 'args_type', and refer to the mock function type and its
-// return type by 'function_type' and 'return_type'.
-//
-// Note that you don't need to specify the types of the mock function
-// arguments.  However rest assured that your code is still type-safe:
-// you'll get a compiler error if *arg1 doesn't support the ++
-// operator, or if the type of ++(*arg1) isn't compatible with the
-// mock function's return type, for example.
-//
-// Sometimes you'll want to parameterize the action.   For that you can use
-// another macro:
-//
-//   ACTION_P(name, param_name) { statements; }
-//
-// For example:
-//
-//   ACTION_P(Add, n) { return arg0 + n; }
-//
-// will allow you to write:
-//
-//   ...WillOnce(Add(5));
-//
-// Note that you don't need to provide the type of the parameter
-// either.  If you need to reference the type of a parameter named
-// 'foo', you can write 'foo_type'.  For example, in the body of
-// ACTION_P(Add, n) above, you can write 'n_type' to refer to the type
-// of 'n'.
-//
-// We also provide ACTION_P2, ACTION_P3, ..., up to ACTION_P10 to support
-// multi-parameter actions.
-//
-// For the purpose of typing, you can view
-//
-//   ACTION_Pk(Foo, p1, ..., pk) { ... }
-//
-// as shorthand for
-//
-//   template <typename p1_type, ..., typename pk_type>
-//   FooActionPk<p1_type, ..., pk_type> Foo(p1_type p1, ..., pk_type pk) { ... }
-//
-// In particular, you can provide the template type arguments
-// explicitly when invoking Foo(), as in Foo<long, bool>(5, false);
-// although usually you can rely on the compiler to infer the types
-// for you automatically.  You can assign the result of expression
-// Foo(p1, ..., pk) to a variable of type FooActionPk<p1_type, ...,
-// pk_type>.  This can be useful when composing actions.
-//
-// You can also overload actions with different numbers of parameters:
-//
-//   ACTION_P(Plus, a) { ... }
-//   ACTION_P2(Plus, a, b) { ... }
-//
-// While it's tempting to always use the ACTION* macros when defining
-// a new action, you should also consider implementing ActionInterface
-// or using MakePolymorphicAction() instead, especially if you need to
-// use the action a lot.  While these approaches require more work,
-// they give you more control on the types of the mock function
-// arguments and the action parameters, which in general leads to
-// better compiler error messages that pay off in the long run.  They
-// also allow overloading actions based on parameter types (as opposed
-// to just based on the number of parameters).
-//
-// CAVEAT:
-//
-// ACTION*() can only be used in a namespace scope as templates cannot be
-// declared inside of a local class.
-// Users can, however, define any local functors (e.g. a lambda) that
-// can be used as actions.
-//
-// MORE INFORMATION:
-//
-// 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_
+// The ACTION* family of macros can be used in a namespace scope to 
+// define custom actions easily.  The syntax: 
+// 
+//   ACTION(name) { statements; } 
+// 
+// will define an action with the given name that executes the 
+// statements.  The value returned by the statements will be used as 
+// the return value of the action.  Inside the statements, you can 
+// refer to the K-th (0-based) argument of the mock function by 
+// 'argK', and refer to its type by 'argK_type'.  For example: 
+// 
+//   ACTION(IncrementArg1) { 
+//     arg1_type temp = arg1; 
+//     return ++(*temp); 
+//   } 
+// 
+// allows you to write 
+// 
+//   ...WillOnce(IncrementArg1()); 
+// 
+// You can also refer to the entire argument tuple and its type by 
+// 'args' and 'args_type', and refer to the mock function type and its 
+// return type by 'function_type' and 'return_type'. 
+// 
+// Note that you don't need to specify the types of the mock function 
+// arguments.  However rest assured that your code is still type-safe: 
+// you'll get a compiler error if *arg1 doesn't support the ++ 
+// operator, or if the type of ++(*arg1) isn't compatible with the 
+// mock function's return type, for example. 
+// 
+// Sometimes you'll want to parameterize the action.   For that you can use 
+// another macro: 
+// 
+//   ACTION_P(name, param_name) { statements; } 
+// 
+// For example: 
+// 
+//   ACTION_P(Add, n) { return arg0 + n; } 
+// 
+// will allow you to write: 
+// 
+//   ...WillOnce(Add(5)); 
+// 
+// Note that you don't need to provide the type of the parameter 
+// either.  If you need to reference the type of a parameter named 
+// 'foo', you can write 'foo_type'.  For example, in the body of 
+// ACTION_P(Add, n) above, you can write 'n_type' to refer to the type 
+// of 'n'. 
+// 
+// We also provide ACTION_P2, ACTION_P3, ..., up to ACTION_P10 to support 
+// multi-parameter actions. 
+// 
+// For the purpose of typing, you can view 
+// 
+//   ACTION_Pk(Foo, p1, ..., pk) { ... } 
+// 
+// as shorthand for 
+// 
+//   template <typename p1_type, ..., typename pk_type> 
+//   FooActionPk<p1_type, ..., pk_type> Foo(p1_type p1, ..., pk_type pk) { ... } 
+// 
+// In particular, you can provide the template type arguments 
+// explicitly when invoking Foo(), as in Foo<long, bool>(5, false); 
+// although usually you can rely on the compiler to infer the types 
+// for you automatically.  You can assign the result of expression 
+// Foo(p1, ..., pk) to a variable of type FooActionPk<p1_type, ..., 
+// pk_type>.  This can be useful when composing actions. 
+// 
+// You can also overload actions with different numbers of parameters: 
+// 
+//   ACTION_P(Plus, a) { ... } 
+//   ACTION_P2(Plus, a, b) { ... } 
+// 
+// While it's tempting to always use the ACTION* macros when defining 
+// a new action, you should also consider implementing ActionInterface 
+// or using MakePolymorphicAction() instead, especially if you need to 
+// use the action a lot.  While these approaches require more work, 
+// they give you more control on the types of the mock function 
+// arguments and the action parameters, which in general leads to 
+// better compiler error messages that pay off in the long run.  They 
+// also allow overloading actions based on parameter types (as opposed 
+// to just based on the number of parameters). 
+// 
+// CAVEAT: 
+// 
+// ACTION*() can only be used in a namespace scope as templates cannot be 
+// declared inside of a local class. 
+// Users can, however, define any local functors (e.g. a lambda) that 
+// can be used as actions. 
+// 
+// MORE INFORMATION: 
+// 
+// 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>
-#include <functional>
-#include <memory>
+#include <functional> 
+#include <memory> 
 #include <string>
-#include <tuple>
-#include <type_traits>
-#include <utility>
+#include <tuple> 
+#include <type_traits> 
+#include <utility> 
 
 #include "gmock/internal/gmock-internal-utils.h"
 #include "gmock/internal/gmock-port.h"
-#include "gmock/internal/gmock-pp.h"
+#include "gmock/internal/gmock-pp.h" 
 
-#ifdef _MSC_VER
-# pragma warning(push)
-# pragma warning(disable:4100)
+#ifdef _MSC_VER 
+# pragma warning(push) 
+# pragma warning(disable:4100) 
 #endif
 
 namespace testing {
@@ -194,8 +194,8 @@ struct BuiltInDefaultValueGetter<T, false> {
 template <typename T>
 class BuiltInDefaultValue {
  public:
-  // This function returns true if and only if type T has a built-in default
-  // value.
+  // 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;
   }
@@ -221,7 +221,7 @@ template <typename T>
 class BuiltInDefaultValue<T*> {
  public:
   static bool Exists() { return true; }
-  static T* Get() { return nullptr; }
+  static T* Get() { return nullptr; } 
 };
 
 // The following specializations define the default values for
@@ -257,17 +257,17 @@ 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_(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_
 
-// Simple two-arg form of std::disjunction.
-template <typename P, typename Q>
-using disjunction = typename ::std::conditional<P::value, P, Q>::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
@@ -305,11 +305,11 @@ class DefaultValue {
   // Unsets the default value for type T.
   static void Clear() {
     delete producer_;
-    producer_ = nullptr;
+    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 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.
@@ -321,8 +321,8 @@ class DefaultValue {
   // 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();
+    return producer_ == nullptr ? internal::BuiltInDefaultValue<T>::Get() 
+                                : producer_->Produce(); 
   }
 
  private:
@@ -335,7 +335,7 @@ class DefaultValue {
   class FixedValueProducer : public ValueProducer {
    public:
     explicit FixedValueProducer(T value) : value_(value) {}
-    T Produce() override { return value_; }
+    T Produce() override { return value_; } 
 
    private:
     const T value_;
@@ -346,7 +346,7 @@ class DefaultValue {
    public:
     explicit FactoryValueProducer(FactoryFunction factory)
         : factory_(factory) {}
-    T Produce() override { return factory_(); }
+    T Produce() override { return factory_(); } 
 
    private:
     const FactoryFunction factory_;
@@ -367,10 +367,10 @@ class DefaultValue<T&> {
   }
 
   // Unsets the default value for type T&.
-  static void Clear() { address_ = nullptr; }
+  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 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.
@@ -382,8 +382,8 @@ class DefaultValue<T&> {
   // 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_;
+    return address_ == nullptr ? internal::BuiltInDefaultValue<T&>::Get() 
+                               : *address_; 
   }
 
  private:
@@ -401,11 +401,11 @@ class DefaultValue<void> {
 
 // Points to the user-set default value for type T.
 template <typename T>
-typename DefaultValue<T>::ValueProducer* DefaultValue<T>::producer_ = nullptr;
+typename DefaultValue<T>::ValueProducer* DefaultValue<T>::producer_ = nullptr; 
 
 // Points to the user-set default value for type T&.
 template <typename T>
-T* DefaultValue<T&>::address_ = nullptr;
+T* DefaultValue<T&>::address_ = nullptr; 
 
 // Implement this interface to define an action for function type F.
 template <typename F>
@@ -430,60 +430,60 @@ class 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!
+// 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 {
-  // Adapter class to allow constructing Action from a legacy ActionInterface.
-  // New code should create Actions from functors instead.
-  struct ActionAdapter {
-    // Adapter must be copyable to satisfy std::function requirements.
-    ::std::shared_ptr<ActionInterface<F>> impl_;
-
-    template <typename... Args>
-    typename internal::Function<F>::Result operator()(Args&&... args) {
-      return impl_->Perform(
-          ::std::forward_as_tuple(::std::forward<Args>(args)...));
-    }
-  };
-
-  template <typename G>
-  using IsCompatibleFunctor = std::is_constructible<std::function<F>, G>;
-
+  // Adapter class to allow constructing Action from a legacy ActionInterface. 
+  // New code should create Actions from functors instead. 
+  struct ActionAdapter { 
+    // Adapter must be copyable to satisfy std::function requirements. 
+    ::std::shared_ptr<ActionInterface<F>> impl_; 
+ 
+    template <typename... Args> 
+    typename internal::Function<F>::Result operator()(Args&&... args) { 
+      return impl_->Perform( 
+          ::std::forward_as_tuple(::std::forward<Args>(args)...)); 
+    } 
+  }; 
+ 
+  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.
-  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).
-  template <
-      typename G,
-      typename = typename std::enable_if<internal::disjunction<
-          IsCompatibleFunctor<G>, std::is_constructible<std::function<Result()>,
-                                                        G>>::value>::type>
-  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)}) {}
+  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). 
+  template < 
+      typename G, 
+      typename = typename std::enable_if<internal::disjunction< 
+          IsCompatibleFunctor<G>, std::is_constructible<std::function<Result()>, 
+                                                        G>>::value>::type> 
+  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
-  // to Func's and Func's return type can be implicitly converted to F's.
+  // to Func's and Func's return type can be implicitly converted to F's. 
   template <typename Func>
-  explicit Action(const Action<Func>& action) : fun_(action.fun_) {}
+  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; }
+  // 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
@@ -491,39 +491,39 @@ class Action {
   // 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));
+  Result Perform(ArgumentTuple args) const { 
+    if (IsDoDefault()) { 
+      internal::IllegalDoDefault(__FILE__, __LINE__); 
+    } 
+    return internal::Apply(fun_, ::std::move(args)); 
   }
 
  private:
-  template <typename G>
-  friend class Action;
-
-  template <typename G>
-  void Init(G&& g, ::std::true_type) {
-    fun_ = ::std::forward<G>(g);
-  }
-
-  template <typename G>
-  void Init(G&& g, ::std::false_type) {
-    fun_ = IgnoreArgs<typename ::std::decay<G>::type>{::std::forward<G>(g)};
-  }
-
-  template <typename FunctionImpl>
-  struct IgnoreArgs {
-    template <typename... Args>
-    Result operator()(const Args&...) const {
-      return function_impl();
-    }
-
-    FunctionImpl function_impl;
-  };
-
-  // fun_ is an empty function if and only if this is the DoDefault() action.
-  ::std::function<F> fun_;
+  template <typename G> 
+  friend class Action; 
+
+  template <typename G> 
+  void Init(G&& g, ::std::true_type) { 
+    fun_ = ::std::forward<G>(g); 
+  } 
+ 
+  template <typename G> 
+  void Init(G&& g, ::std::false_type) { 
+    fun_ = IgnoreArgs<typename ::std::decay<G>::type>{::std::forward<G>(g)}; 
+  } 
+ 
+  template <typename FunctionImpl> 
+  struct IgnoreArgs { 
+    template <typename... Args> 
+    Result operator()(const Args&...) const { 
+      return function_impl(); 
+    } 
+ 
+    FunctionImpl function_impl; 
+  }; 
+ 
+  // 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
@@ -538,7 +538,7 @@ class Action {
 //     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.
+//       // std::get<N>(args) to get the N-th (0-based) argument in the tuple. 
 //     }
 //     ...
 //   };
@@ -566,7 +566,7 @@ class PolymorphicAction {
 
     explicit MonomorphicImpl(const Impl& impl) : impl_(impl) {}
 
-    Result Perform(const ArgumentTuple& args) override {
+    Result Perform(const ArgumentTuple& args) override { 
       return impl_.template Perform<Result>(args);
     }
 
@@ -602,7 +602,7 @@ namespace internal {
 // 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)) {}
+  explicit ByMoveWrapper(T value) : payload(std::move(value)) {} 
   T payload;
 };
 
@@ -630,21 +630,21 @@ struct ByMoveWrapper {
 // 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.
-//
+// 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.
-  explicit ReturnAction(R value) : value_(new R(std::move(value))) {}
+  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>
-  operator Action<F>() const {  // NOLINT
+  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.
@@ -655,10 +655,10 @@ class ReturnAction {
     // 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,
+        !std::is_reference<Result>::value, 
         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`.");
+    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_));
   }
 
@@ -677,14 +677,14 @@ class ReturnAction {
     // 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)
+    explicit Impl(const std::shared_ptr<R>& value) 
         : value_before_cast_(*value),
           value_(ImplicitCast_<Result>(value_before_cast_)) {}
 
-    Result Perform(const ArgumentTuple&) override { return value_; }
+    Result Perform(const ArgumentTuple&) override { return value_; } 
 
    private:
-    GTEST_COMPILE_ASSERT_(!std::is_reference<Result>::value,
+    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.
@@ -702,22 +702,22 @@ class ReturnAction {
     typedef typename Function<F>::Result Result;
     typedef typename Function<F>::ArgumentTuple ArgumentTuple;
 
-    explicit Impl(const std::shared_ptr<R>& wrapper)
+    explicit Impl(const std::shared_ptr<R>& wrapper) 
         : performed_(false), wrapper_(wrapper) {}
 
-    Result Perform(const ArgumentTuple&) override {
+    Result Perform(const ArgumentTuple&) override { 
       GTEST_CHECK_(!performed_)
           << "A ByMove() action should only be performed once.";
       performed_ = true;
-      return std::move(wrapper_->payload);
+      return std::move(wrapper_->payload); 
     }
 
    private:
     bool performed_;
-    const std::shared_ptr<R> wrapper_;
+    const std::shared_ptr<R> wrapper_; 
   };
 
-  const std::shared_ptr<R> value_;
+  const std::shared_ptr<R> value_; 
 };
 
 // Implements the ReturnNull() action.
@@ -738,7 +738,7 @@ class ReturnVoidAction {
   // 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.");
+    static_assert(std::is_void<Result>::value, "Result should be void."); 
   }
 };
 
@@ -759,7 +759,7 @@ class ReturnRefAction {
     // 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,
+    GTEST_COMPILE_ASSERT_(std::is_reference<Result>::value, 
                           use_Return_instead_of_ReturnRef_to_return_a_value);
     return Action<F>(new Impl<F>(ref_));
   }
@@ -774,7 +774,7 @@ class ReturnRefAction {
 
     explicit Impl(T& ref) : ref_(ref) {}  // NOLINT
 
-    Result Perform(const ArgumentTuple&) override { return ref_; }
+    Result Perform(const ArgumentTuple&) override { return ref_; } 
 
    private:
     T& ref_;
@@ -802,7 +802,7 @@ class ReturnRefOfCopyAction {
     // 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,
+        std::is_reference<Result>::value, 
         use_Return_instead_of_ReturnRefOfCopy_to_return_a_value);
     return Action<F>(new Impl<F>(value_));
   }
@@ -817,43 +817,43 @@ class ReturnRefOfCopyAction {
 
     explicit Impl(const T& value) : value_(value) {}  // NOLINT
 
-    Result Perform(const ArgumentTuple&) override { return value_; }
+    Result Perform(const ArgumentTuple&) override { return 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>
-class ReturnRoundRobinAction {
- public:
-  explicit ReturnRoundRobinAction(std::vector<T> values) {
-    GTEST_CHECK_(!values.empty())
-        << "ReturnRoundRobin requires at least one element.";
-    state_->values = std::move(values);
-  }
-
-  template <typename... Args>
-  T operator()(Args&&...) const {
-     return state_->Next();
-  }
-
- private:
-  struct State {
-    T Next() {
-      T ret_val = values[i++];
-      if (i == values.size()) i = 0;
-      return ret_val;
-    }
-
-    std::vector<T> values;
-    size_t i = 0;
-  };
-  std::shared_ptr<State> state_ = std::make_shared<State>();
+}; 
+
+// Implements the polymorphic ReturnRoundRobin(v) action, which can be 
+// used in any function that returns the element_type of v. 
+template <typename T> 
+class ReturnRoundRobinAction { 
+ public: 
+  explicit ReturnRoundRobinAction(std::vector<T> values) { 
+    GTEST_CHECK_(!values.empty()) 
+        << "ReturnRoundRobin requires at least one element."; 
+    state_->values = std::move(values); 
+  } 
+ 
+  template <typename... Args> 
+  T operator()(Args&&...) const { 
+     return state_->Next(); 
+  } 
+ 
+ private: 
+  struct State { 
+    T Next() { 
+      T ret_val = values[i++]; 
+      if (i == values.size()) i = 0; 
+      return ret_val; 
+    } 
+ 
+    std::vector<T> values; 
+    size_t i = 0; 
+  }; 
+  std::shared_ptr<State> state_ = std::make_shared<State>(); 
 };
 
 // Implements the polymorphic DoDefault() action.
@@ -862,7 +862,7 @@ class DoDefaultAction {
   // This template type conversion operator allows DoDefault() to be
   // used in any function.
   template <typename F>
-  operator Action<F>() const { return Action<F>(); }  // NOLINT
+  operator Action<F>() const { return Action<F>(); }  // NOLINT 
 };
 
 // Implements the Assign action to set a given pointer referent to a
@@ -906,58 +906,58 @@ class SetErrnoAndReturnAction {
 #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;
+// 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 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
-// Action<F> as long as f's type is compatible with F.
+// Action<F> as long as f's type is compatible with F. 
 template <typename FunctionImpl>
-struct InvokeWithoutArgsAction {
-  FunctionImpl function_impl;
+struct InvokeWithoutArgsAction { 
+  FunctionImpl function_impl; 
 
   // 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();
-  }
+  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>
-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)();
+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)(); 
   }
 };
 
@@ -980,7 +980,7 @@ class IgnoreResultAction {
     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.");
+    static_assert(std::is_void<Result>::value, "Result type should be void."); 
 
     return Action<F>(new Impl<F>(action_));
   }
@@ -994,7 +994,7 @@ class IgnoreResultAction {
 
     explicit Impl(const A& action) : action_(action) {}
 
-    void Perform(const ArgumentTuple& args) override {
+    void Perform(const ArgumentTuple& args) override { 
       // Performs the action and ignores its result.
       action_.Perform(args);
     }
@@ -1011,158 +1011,158 @@ class IgnoreResultAction {
   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>
-  operator Action<R(Args...)>() const {  // NOLINT
-    using TupleType = std::tuple<Args...>;
-    Action<R(typename std::tuple_element<I, TupleType>::type...)>
-        converted(action);
-
-    return [converted](Args... args) -> R {
-      return converted.Perform(std::forward_as_tuple(
-        std::get<I>(std::forward_as_tuple(std::forward<Args>(args)...))...));
-    };
-  }
+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> 
+  operator Action<R(Args...)>() const {  // NOLINT 
+    using TupleType = std::tuple<Args...>; 
+    Action<R(typename std::tuple_element<I, TupleType>::type...)> 
+        converted(action); 
+ 
+    return [converted](Args... args) -> R { 
+      return converted.Perform(std::forward_as_tuple( 
+        std::get<I>(std::forward_as_tuple(std::forward<Args>(args)...))...)); 
+    }; 
+  } 
 };
 
-template <typename... Actions>
-struct DoAllAction {
- private:
-  template <typename T>
-  using NonFinalType =
-      typename std::conditional<std::is_scalar<T>::value, T, const T&>::type;
-
-  template <typename ActionT, size_t... I>
-  std::vector<ActionT> Convert(IndexSequence<I...>) const {
-    return {ActionT(std::get<I>(actions))...};
-  }
+template <typename... Actions> 
+struct DoAllAction { 
+ private: 
+  template <typename T> 
+  using NonFinalType = 
+      typename std::conditional<std::is_scalar<T>::value, T, const T&>::type; 
+ 
+  template <typename ActionT, size_t... I> 
+  std::vector<ActionT> Convert(IndexSequence<I...>) const { 
+    return {ActionT(std::get<I>(actions))...}; 
+  } 
 
  public:
-  std::tuple<Actions...> actions;
-
-  template <typename R, typename... Args>
-  operator Action<R(Args...)>() const {  // NOLINT
-    struct Op {
-      std::vector<Action<void(NonFinalType<Args>...)>> converted;
-      Action<R(Args...)> last;
-      R operator()(Args... args) const {
-        auto tuple_args = std::forward_as_tuple(std::forward<Args>(args)...);
-        for (auto& a : converted) {
-          a.Perform(tuple_args);
-        }
-        return last.Perform(std::move(tuple_args));
-      }
-    };
-    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 {
-    return internal::Apply(
-        [](const Params&... unpacked_params) {
-          return new T(unpacked_params...);
-        },
-        params);
-  }
-  std::tuple<Params...> params;
-};
-
-template <size_t k>
-struct ReturnArgAction {
-  template <typename... Args>
-  auto operator()(const Args&... args) const ->
-      typename std::tuple_element<k, std::tuple<Args...>>::type {
-    return std::get<k>(std::tie(args...));
-  }
-};
-
-template <size_t k, typename Ptr>
-struct SaveArgAction {
-  Ptr pointer;
-
-  template <typename... Args>
-  void operator()(const Args&... args) const {
-    *pointer = std::get<k>(std::tie(args...));
-  }
-};
-
-template <size_t k, typename Ptr>
-struct SaveArgPointeeAction {
-  Ptr pointer;
-
-  template <typename... Args>
-  void operator()(const Args&... args) const {
-    *pointer = *std::get<k>(std::tie(args...));
+  std::tuple<Actions...> actions; 
+
+  template <typename R, typename... Args> 
+  operator Action<R(Args...)>() const {  // NOLINT 
+    struct Op { 
+      std::vector<Action<void(NonFinalType<Args>...)>> converted; 
+      Action<R(Args...)> last; 
+      R operator()(Args... args) const { 
+        auto tuple_args = std::forward_as_tuple(std::forward<Args>(args)...); 
+        for (auto& a : converted) { 
+          a.Perform(tuple_args); 
+        } 
+        return last.Perform(std::move(tuple_args)); 
+      } 
+    }; 
+    return Op{Convert<Action<void(NonFinalType<Args>...)>>( 
+                  MakeIndexSequence<sizeof...(Actions) - 1>()), 
+              std::get<sizeof...(Actions) - 1>(actions)}; 
   }
 };
 
-template <size_t k, typename T>
-struct SetArgRefereeAction {
-  T value;
-
-  template <typename... Args>
-  void operator()(Args&&... args) const {
-    using argk_type =
-        typename ::std::tuple_element<k, std::tuple<Args...>>::type;
-    static_assert(std::is_lvalue_reference<argk_type>::value,
-                  "Argument must be a reference type.");
-    std::get<k>(std::tie(args...)) = value;
-  }
-};
-
-template <size_t k, typename I1, typename I2>
-struct SetArrayArgumentAction {
-  I1 first;
-  I2 last;
-
-  template <typename... Args>
-  void operator()(const Args&... args) const {
-    auto value = std::get<k>(std::tie(args...));
-    for (auto it = first; it != last; ++it, (void)++value) {
-      *value = *it;
-    }
-  }
-};
-
-template <size_t k>
-struct DeleteArgAction {
-  template <typename... Args>
-  void operator()(const Args&... args) const {
-    delete std::get<k>(std::tie(args...));
-  }
-};
-
-template <typename Ptr>
-struct ReturnPointeeAction {
-  Ptr pointer;
-  template <typename... Args>
-  auto operator()(const Args&...) const -> decltype(*pointer) {
-    return *pointer;
-  }
-};
-
-#if GTEST_HAS_EXCEPTIONS
-template <typename T>
-struct ThrowAction {
-  T exception;
-  // We use a conversion operator to adapt to any return type.
-  template <typename R, typename... Args>
-  operator Action<R(Args...)>() const {  // NOLINT
-    T copy = exception;
-    return [copy](Args...) -> R { throw copy; };
-  }
-};
-#endif  // GTEST_HAS_EXCEPTIONS
-
+template <typename T, typename... Params> 
+struct ReturnNewAction { 
+  T* operator()() const { 
+    return internal::Apply( 
+        [](const Params&... unpacked_params) { 
+          return new T(unpacked_params...); 
+        }, 
+        params); 
+  } 
+  std::tuple<Params...> params; 
+}; 
+ 
+template <size_t k> 
+struct ReturnArgAction { 
+  template <typename... Args> 
+  auto operator()(const Args&... args) const -> 
+      typename std::tuple_element<k, std::tuple<Args...>>::type { 
+    return std::get<k>(std::tie(args...)); 
+  } 
+}; 
+ 
+template <size_t k, typename Ptr> 
+struct SaveArgAction { 
+  Ptr pointer; 
+ 
+  template <typename... Args> 
+  void operator()(const Args&... args) const { 
+    *pointer = std::get<k>(std::tie(args...)); 
+  } 
+}; 
+ 
+template <size_t k, typename Ptr> 
+struct SaveArgPointeeAction { 
+  Ptr pointer; 
+ 
+  template <typename... Args> 
+  void operator()(const Args&... args) const { 
+    *pointer = *std::get<k>(std::tie(args...)); 
+  } 
+}; 
+ 
+template <size_t k, typename T> 
+struct SetArgRefereeAction { 
+  T value; 
+ 
+  template <typename... Args> 
+  void operator()(Args&&... args) const { 
+    using argk_type = 
+        typename ::std::tuple_element<k, std::tuple<Args...>>::type; 
+    static_assert(std::is_lvalue_reference<argk_type>::value, 
+                  "Argument must be a reference type."); 
+    std::get<k>(std::tie(args...)) = value; 
+  } 
+}; 
+ 
+template <size_t k, typename I1, typename I2> 
+struct SetArrayArgumentAction { 
+  I1 first; 
+  I2 last; 
+ 
+  template <typename... Args> 
+  void operator()(const Args&... args) const { 
+    auto value = std::get<k>(std::tie(args...)); 
+    for (auto it = first; it != last; ++it, (void)++value) { 
+      *value = *it; 
+    } 
+  } 
+}; 
+ 
+template <size_t k> 
+struct DeleteArgAction { 
+  template <typename... Args> 
+  void operator()(const Args&... args) const { 
+    delete std::get<k>(std::tie(args...)); 
+  } 
+}; 
+ 
+template <typename Ptr> 
+struct ReturnPointeeAction { 
+  Ptr pointer; 
+  template <typename... Args> 
+  auto operator()(const Args&...) const -> decltype(*pointer) { 
+    return *pointer; 
+  } 
+}; 
+ 
+#if GTEST_HAS_EXCEPTIONS 
+template <typename T> 
+struct ThrowAction { 
+  T exception; 
+  // We use a conversion operator to adapt to any return type. 
+  template <typename R, typename... Args> 
+  operator Action<R(Args...)>() const {  // NOLINT 
+    T copy = exception; 
+    return [copy](Args...) -> R { throw copy; }; 
+  } 
+}; 
+#endif  // GTEST_HAS_EXCEPTIONS 
+ 
 }  // namespace internal
 
 // An Unused object can be implicitly constructed from ANY value.
@@ -1181,9 +1181,9 @@ struct ThrowAction {
 //     return sqrt(x*x + y*y);
 //   }
 //   ...
-//   EXPECT_CALL(mock, Foo("abc", _, _))
+//   EXPECT_CALL(mock, Foo("abc", _, _)) 
 //       .WillOnce(Invoke(DistanceToOriginWithLabel));
-//   EXPECT_CALL(mock, Bar(5, _, _))
+//   EXPECT_CALL(mock, Bar(5, _, _)) 
 //       .WillOnce(Invoke(DistanceToOriginWithIndex));
 //
 // you could write
@@ -1193,56 +1193,56 @@ struct ThrowAction {
 //     return sqrt(x*x + y*y);
 //   }
 //   ...
-//   EXPECT_CALL(mock, Foo("abc", _, _)).WillOnce(Invoke(DistanceToOrigin));
-//   EXPECT_CALL(mock, Bar(5, _, _)).WillOnce(Invoke(DistanceToOrigin));
+//   EXPECT_CALL(mock, Foo("abc", _, _)).WillOnce(Invoke(DistanceToOrigin)); 
+//   EXPECT_CALL(mock, Bar(5, _, _)).WillOnce(Invoke(DistanceToOrigin)); 
 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.
-template <typename... Action>
-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
-// multiple arguments.  For convenience, we also provide
-// WithArgs<k>(an_action) (defined below) as a synonym.
-template <size_t k, typename InnerAction>
-internal::WithArgsAction<typename std::decay<InnerAction>::type, k>
-WithArg(InnerAction&& action) {
-  return {std::forward<InnerAction>(action)};
-}
-
-// WithArgs<N1, N2, ..., Nk>(an_action) creates an action that passes
-// the selected arguments of the mock function to an_action and
-// performs it.  It serves as an adaptor between actions with
-// different argument lists.
-template <size_t k, size_t... ks, typename InnerAction>
-internal::WithArgsAction<typename std::decay<InnerAction>::type, k, ks...>
-WithArgs(InnerAction&& action) {
-  return {std::forward<InnerAction>(action)};
-}
-
-// WithoutArgs(inner_action) can be used in a mock function with a
-// non-empty argument list to perform inner_action, which takes no
-// argument.  In other words, it adapts an action accepting no
-// argument to one that accepts (and ignores) arguments.
-template <typename InnerAction>
-internal::WithArgsAction<typename std::decay<InnerAction>::type>
-WithoutArgs(InnerAction&& action) {
-  return {std::forward<InnerAction>(action)};
-}
-
+// 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. 
+template <typename... Action> 
+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 
+// multiple arguments.  For convenience, we also provide 
+// WithArgs<k>(an_action) (defined below) as a synonym. 
+template <size_t k, typename InnerAction> 
+internal::WithArgsAction<typename std::decay<InnerAction>::type, k> 
+WithArg(InnerAction&& action) { 
+  return {std::forward<InnerAction>(action)}; 
+} 
+ 
+// WithArgs<N1, N2, ..., Nk>(an_action) creates an action that passes 
+// the selected arguments of the mock function to an_action and 
+// performs it.  It serves as an adaptor between actions with 
+// different argument lists. 
+template <size_t k, size_t... ks, typename InnerAction> 
+internal::WithArgsAction<typename std::decay<InnerAction>::type, k, ks...> 
+WithArgs(InnerAction&& action) { 
+  return {std::forward<InnerAction>(action)}; 
+} 
+ 
+// WithoutArgs(inner_action) can be used in a mock function with a 
+// non-empty argument list to perform inner_action, which takes no 
+// argument.  In other words, it adapts an action accepting no 
+// argument to one that accepts (and ignores) arguments. 
+template <typename InnerAction> 
+internal::WithArgsAction<typename std::decay<InnerAction>::type> 
+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) {
-  return internal::ReturnAction<R>(std::move(value));
+  return internal::ReturnAction<R>(std::move(value)); 
 }
 
 // Creates an action that returns NULL.
@@ -1261,10 +1261,10 @@ 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;
-
+// 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.
@@ -1279,26 +1279,26 @@ inline internal::ReturnRefOfCopyAction<R> ReturnRefOfCopy(const R& x) {
 // 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.
-template <typename T>
-internal::ReturnRoundRobinAction<T> ReturnRoundRobin(std::vector<T> vals) {
-  return internal::ReturnRoundRobinAction<T>(std::move(vals));
-}
-
-// 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.
-template <typename T>
-internal::ReturnRoundRobinAction<T> ReturnRoundRobin(
-    std::initializer_list<T> vals) {
-  return internal::ReturnRoundRobinAction<T>(std::vector<T>(vals));
+  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. 
+template <typename T> 
+internal::ReturnRoundRobinAction<T> ReturnRoundRobin(std::vector<T> vals) { 
+  return internal::ReturnRoundRobinAction<T>(std::move(vals)); 
+} 
+ 
+// 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. 
+template <typename T> 
+internal::ReturnRoundRobinAction<T> ReturnRoundRobin( 
+    std::initializer_list<T> vals) { 
+  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();
@@ -1307,14 +1307,14 @@ inline internal::DoDefaultAction DoDefault() {
 // 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)};
+internal::SetArgumentPointeeAction<N, T> SetArgPointee(T value) { 
+  return {std::move(value)}; 
 }
 
 // The following version is DEPRECATED.
 template <size_t N, typename T>
-internal::SetArgumentPointeeAction<N, T> SetArgumentPointee(T value) {
-  return {std::move(value)};
+internal::SetArgumentPointeeAction<N, T> SetArgumentPointee(T value) { 
+  return {std::move(value)}; 
 }
 
 // Creates an action that sets a pointer referent to a given value.
@@ -1335,38 +1335,38 @@ SetErrnoAndReturn(int errval, T 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.
-// This function exists for backwards compatibility.
-template <typename FunctionImpl>
-typename std::decay<FunctionImpl>::type Invoke(FunctionImpl&& function_impl) {
-  return std::forward<FunctionImpl>(function_impl);
-}
-
-// Creates an action that invokes the given method on the given object
-// with the mock function's arguments.
-template <class Class, typename MethodPtr>
-internal::InvokeMethodAction<Class, MethodPtr> Invoke(Class* obj_ptr,
-                                                      MethodPtr method_ptr) {
-  return {obj_ptr, method_ptr};
-}
-
+// Various overloads for Invoke(). 
+
+// Legacy function. 
+// Actions can now be implicitly constructed from callables. No need to create 
+// wrapper objects. 
+// This function exists for backwards compatibility. 
+template <typename FunctionImpl> 
+typename std::decay<FunctionImpl>::type Invoke(FunctionImpl&& function_impl) { 
+  return std::forward<FunctionImpl>(function_impl); 
+} 
+ 
+// Creates an action that invokes the given method on the given object 
+// with the mock function's arguments. 
+template <class Class, typename MethodPtr> 
+internal::InvokeMethodAction<Class, MethodPtr> Invoke(Class* obj_ptr, 
+                                                      MethodPtr method_ptr) { 
+  return {obj_ptr, method_ptr}; 
+} 
+ 
 // Creates an action that invokes 'function_impl' with no argument.
 template <typename FunctionImpl>
-internal::InvokeWithoutArgsAction<typename std::decay<FunctionImpl>::type>
+internal::InvokeWithoutArgsAction<typename std::decay<FunctionImpl>::type> 
 InvokeWithoutArgs(FunctionImpl function_impl) {
-  return {std::move(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>
-internal::InvokeMethodWithoutArgsAction<Class, MethodPtr> InvokeWithoutArgs(
-    Class* obj_ptr, MethodPtr method_ptr) {
-  return {obj_ptr, method_ptr};
+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
@@ -1384,304 +1384,304 @@ inline internal::IgnoreResultAction<A> IgnoreResult(const A& an_action) {
 // 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().
+// 
+// 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>
-inline ::std::reference_wrapper<T> ByRef(T& l_value) {  // NOLINT
-  return ::std::reference_wrapper<T>(l_value);
+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.
-template <typename T, typename... Params>
-internal::ReturnNewAction<T, typename std::decay<Params>::type...> ReturnNew(
-    Params&&... params) {
-  return {std::forward_as_tuple(std::forward<Params>(params)...)};
-}
-
-// Action ReturnArg<k>() returns the k-th argument of the mock function.
-template <size_t k>
-internal::ReturnArgAction<k> ReturnArg() {
-  return {};
-}
-
-// Action SaveArg<k>(pointer) saves the k-th (0-based) argument of the
-// mock function to *pointer.
-template <size_t k, typename Ptr>
-internal::SaveArgAction<k, Ptr> SaveArg(Ptr pointer) {
-  return {pointer};
-}
-
-// Action SaveArgPointee<k>(pointer) saves the value pointed to
-// by the k-th (0-based) argument of the mock function to *pointer.
-template <size_t k, typename Ptr>
-internal::SaveArgPointeeAction<k, Ptr> SaveArgPointee(Ptr pointer) {
-  return {pointer};
-}
-
-// Action SetArgReferee<k>(value) assigns 'value' to the variable
-// referenced by the k-th (0-based) argument of the mock function.
-template <size_t k, typename T>
-internal::SetArgRefereeAction<k, typename std::decay<T>::type> SetArgReferee(
-    T&& value) {
-  return {std::forward<T>(value)};
-}
-
-// Action SetArrayArgument<k>(first, last) copies the elements in
-// source range [first, last) to the array pointed to by the k-th
-// (0-based) argument, which can be either a pointer or an
-// iterator. The action does not take ownership of the elements in the
-// source range.
-template <size_t k, typename I1, typename I2>
-internal::SetArrayArgumentAction<k, I1, I2> SetArrayArgument(I1 first,
-                                                             I2 last) {
-  return {first, last};
-}
-
-// Action DeleteArg<k>() deletes the k-th (0-based) argument of the mock
-// function.
-template <size_t k>
-internal::DeleteArgAction<k> DeleteArg() {
-  return {};
-}
-
-// This action returns the value pointed to by 'pointer'.
-template <typename Ptr>
-internal::ReturnPointeeAction<Ptr> ReturnPointee(Ptr pointer) {
-  return {pointer};
-}
-
-// Action Throw(exception) can be used in a mock function of any type
-// to throw the given exception.  Any copyable value can be thrown.
-#if GTEST_HAS_EXCEPTIONS
-template <typename T>
-internal::ThrowAction<typename std::decay<T>::type> Throw(T&& exception) {
-  return {std::forward<T>(exception)};
-}
-#endif  // GTEST_HAS_EXCEPTIONS
-
-namespace internal {
-
-// A macro from the ACTION* family (defined later in gmock-generated-actions.h)
-// defines an action that can be used in a mock function.  Typically,
-// these actions only care about a subset of the arguments of the mock
-// function.  For example, if such an action only uses the second
-// argument, it can be used in any mock function that takes >= 2
-// arguments where the type of the second argument is compatible.
-//
-// Therefore, the action implementation must be prepared to take more
-// arguments than it needs.  The ExcessiveArg type is used to
-// represent those excessive arguments.  In order to keep the compiler
-// error messages tractable, we define it in the testing namespace
-// instead of testing::internal.  However, this is an INTERNAL TYPE
-// and subject to change without notice, so a user MUST NOT USE THIS
-// TYPE DIRECTLY.
-struct ExcessiveArg {};
-
-// Builds an implementation of an Action<> for some particular signature, using
-// a class defined by an ACTION* macro.
-template <typename F, typename Impl> struct ActionImpl;
-
-template <typename Impl>
-struct ImplBase {
-  struct Holder {
-    // Allows each copy of the Action<> to get to the Impl.
-    explicit operator const Impl&() const { return *ptr; }
-    std::shared_ptr<Impl> ptr;
-  };
-  using type = typename std::conditional<std::is_constructible<Impl>::value,
-                                         Impl, Holder>::type;
-};
-
-template <typename R, typename... Args, typename Impl>
-struct ActionImpl<R(Args...), Impl> : ImplBase<Impl>::type {
-  using Base = typename ImplBase<Impl>::type;
-  using function_type = R(Args...);
-  using args_type = std::tuple<Args...>;
-
-  ActionImpl() = default;  // Only defined if appropriate for Base.
-  explicit ActionImpl(std::shared_ptr<Impl> impl) : Base{std::move(impl)} { }
-
-  R operator()(Args&&... arg) const {
-    static constexpr size_t kMaxArgs =
-        sizeof...(Args) <= 10 ? sizeof...(Args) : 10;
-    return Apply(MakeIndexSequence<kMaxArgs>{},
-                 MakeIndexSequence<10 - kMaxArgs>{},
-                 args_type{std::forward<Args>(arg)...});
-  }
-
-  template <std::size_t... arg_id, std::size_t... excess_id>
-  R Apply(IndexSequence<arg_id...>, IndexSequence<excess_id...>,
-          const args_type& args) const {
-    // Impl need not be specific to the signature of action being implemented;
-    // only the implementing function body needs to have all of the specific
-    // types instantiated.  Up to 10 of the args that are provided by the
-    // args_type get passed, followed by a dummy of unspecified type for the
-    // remainder up to 10 explicit args.
-    static constexpr ExcessiveArg kExcessArg{};
-    return static_cast<const Impl&>(*this).template gmock_PerformImpl<
-        /*function_type=*/function_type, /*return_type=*/R,
-        /*args_type=*/args_type,
-        /*argN_type=*/typename std::tuple_element<arg_id, args_type>::type...>(
-        /*args=*/args, std::get<arg_id>(args)...,
-        ((void)excess_id, kExcessArg)...);
-  }
-};
-
-// Stores a default-constructed Impl as part of the Action<>'s
-// std::function<>. The Impl should be trivial to copy.
-template <typename F, typename Impl>
-::testing::Action<F> MakeAction() {
-  return ::testing::Action<F>(ActionImpl<F, Impl>());
-}
-
-// Stores just the one given instance of Impl.
-template <typename F, typename Impl>
-::testing::Action<F> MakeAction(std::shared_ptr<Impl> impl) {
-  return ::testing::Action<F>(ActionImpl<F, Impl>(std::move(impl)));
-}
-
-#define GMOCK_INTERNAL_ARG_UNUSED(i, data, el) \
-  , const arg##i##_type& arg##i GTEST_ATTRIBUTE_UNUSED_
-#define GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_           \
-  const args_type& args GTEST_ATTRIBUTE_UNUSED_ GMOCK_PP_REPEAT( \
-      GMOCK_INTERNAL_ARG_UNUSED, , 10)
-
-#define GMOCK_INTERNAL_ARG(i, data, el) , const arg##i##_type& arg##i
-#define GMOCK_ACTION_ARG_TYPES_AND_NAMES_ \
-  const args_type& args GMOCK_PP_REPEAT(GMOCK_INTERNAL_ARG, , 10)
-
-#define GMOCK_INTERNAL_TEMPLATE_ARG(i, data, el) , typename arg##i##_type
-#define GMOCK_ACTION_TEMPLATE_ARGS_NAMES_ \
-  GMOCK_PP_TAIL(GMOCK_PP_REPEAT(GMOCK_INTERNAL_TEMPLATE_ARG, , 10))
-
-#define GMOCK_INTERNAL_TYPENAME_PARAM(i, data, param) , typename param##_type
-#define GMOCK_ACTION_TYPENAME_PARAMS_(params) \
-  GMOCK_PP_TAIL(GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_TYPENAME_PARAM, , params))
-
-#define GMOCK_INTERNAL_TYPE_PARAM(i, data, param) , param##_type
-#define GMOCK_ACTION_TYPE_PARAMS_(params) \
-  GMOCK_PP_TAIL(GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_TYPE_PARAM, , params))
-
-#define GMOCK_INTERNAL_TYPE_GVALUE_PARAM(i, data, param) \
-  , param##_type gmock_p##i
-#define GMOCK_ACTION_TYPE_GVALUE_PARAMS_(params) \
-  GMOCK_PP_TAIL(GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_TYPE_GVALUE_PARAM, , params))
-
-#define GMOCK_INTERNAL_GVALUE_PARAM(i, data, param) \
-  , std::forward<param##_type>(gmock_p##i)
-#define GMOCK_ACTION_GVALUE_PARAMS_(params) \
-  GMOCK_PP_TAIL(GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_GVALUE_PARAM, , params))
-
-#define GMOCK_INTERNAL_INIT_PARAM(i, data, param) \
-  , param(::std::forward<param##_type>(gmock_p##i))
-#define GMOCK_ACTION_INIT_PARAMS_(params) \
-  GMOCK_PP_TAIL(GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_INIT_PARAM, , params))
-
-#define GMOCK_INTERNAL_FIELD_PARAM(i, data, param) param##_type param;
-#define GMOCK_ACTION_FIELD_PARAMS_(params) \
-  GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_FIELD_PARAM, , params)
-
-#define GMOCK_INTERNAL_ACTION(name, full_name, params)                        \
-  template <GMOCK_ACTION_TYPENAME_PARAMS_(params)>                            \
-  class full_name {                                                           \
-   public:                                                                    \
-    explicit full_name(GMOCK_ACTION_TYPE_GVALUE_PARAMS_(params))              \
-        : impl_(std::make_shared<gmock_Impl>(                                 \
-                GMOCK_ACTION_GVALUE_PARAMS_(params))) { }                     \
-    full_name(const full_name&) = default;                                    \
-    full_name(full_name&&) noexcept = default;                                \
-    template <typename F>                                                     \
-    operator ::testing::Action<F>() const {                                   \
-      return ::testing::internal::MakeAction<F>(impl_);                       \
-    }                                                                         \
-   private:                                                                   \
-    class gmock_Impl {                                                        \
-     public:                                                                  \
-      explicit gmock_Impl(GMOCK_ACTION_TYPE_GVALUE_PARAMS_(params))           \
-          : GMOCK_ACTION_INIT_PARAMS_(params) {}                              \
-      template <typename function_type, typename return_type,                 \
-                typename args_type, GMOCK_ACTION_TEMPLATE_ARGS_NAMES_>        \
-      return_type gmock_PerformImpl(GMOCK_ACTION_ARG_TYPES_AND_NAMES_) const; \
-      GMOCK_ACTION_FIELD_PARAMS_(params)                                      \
-    };                                                                        \
-    std::shared_ptr<const gmock_Impl> impl_;                                  \
-  };                                                                          \
-  template <GMOCK_ACTION_TYPENAME_PARAMS_(params)>                            \
-  inline full_name<GMOCK_ACTION_TYPE_PARAMS_(params)> name(                   \
-      GMOCK_ACTION_TYPE_GVALUE_PARAMS_(params)) {                             \
-    return full_name<GMOCK_ACTION_TYPE_PARAMS_(params)>(                      \
-        GMOCK_ACTION_GVALUE_PARAMS_(params));                                 \
-  }                                                                           \
-  template <GMOCK_ACTION_TYPENAME_PARAMS_(params)>                            \
-  template <typename function_type, typename return_type, typename args_type, \
-            GMOCK_ACTION_TEMPLATE_ARGS_NAMES_>                                \
-  return_type full_name<GMOCK_ACTION_TYPE_PARAMS_(params)>::gmock_Impl::      \
-  gmock_PerformImpl(GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const
-
-}  // namespace internal
-
-// Similar to GMOCK_INTERNAL_ACTION, but no bound parameters are stored.
-#define ACTION(name)                                                          \
-  class name##Action {                                                        \
-   public:                                                                    \
-   explicit name##Action() noexcept {}                                        \
-   name##Action(const name##Action&) noexcept {}                              \
-    template <typename F>                                                     \
-    operator ::testing::Action<F>() const {                                   \
-      return ::testing::internal::MakeAction<F, gmock_Impl>();                \
-    }                                                                         \
-   private:                                                                   \
-    class gmock_Impl {                                                        \
-     public:                                                                  \
-      template <typename function_type, typename return_type,                 \
-                typename args_type, GMOCK_ACTION_TEMPLATE_ARGS_NAMES_>        \
-      return_type gmock_PerformImpl(GMOCK_ACTION_ARG_TYPES_AND_NAMES_) const; \
-    };                                                                        \
-  };                                                                          \
-  inline name##Action name() GTEST_MUST_USE_RESULT_;                          \
-  inline name##Action name() { return name##Action(); }                       \
-  template <typename function_type, typename return_type, typename args_type, \
-            GMOCK_ACTION_TEMPLATE_ARGS_NAMES_>                                \
-  return_type name##Action::gmock_Impl::gmock_PerformImpl(                    \
-      GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const
-
-#define ACTION_P(name, ...) \
-  GMOCK_INTERNAL_ACTION(name, name##ActionP, (__VA_ARGS__))
-
-#define ACTION_P2(name, ...) \
-  GMOCK_INTERNAL_ACTION(name, name##ActionP2, (__VA_ARGS__))
-
-#define ACTION_P3(name, ...) \
-  GMOCK_INTERNAL_ACTION(name, name##ActionP3, (__VA_ARGS__))
-
-#define ACTION_P4(name, ...) \
-  GMOCK_INTERNAL_ACTION(name, name##ActionP4, (__VA_ARGS__))
-
-#define ACTION_P5(name, ...) \
-  GMOCK_INTERNAL_ACTION(name, name##ActionP5, (__VA_ARGS__))
-
-#define ACTION_P6(name, ...) \
-  GMOCK_INTERNAL_ACTION(name, name##ActionP6, (__VA_ARGS__))
-
-#define ACTION_P7(name, ...) \
-  GMOCK_INTERNAL_ACTION(name, name##ActionP7, (__VA_ARGS__))
-
-#define ACTION_P8(name, ...) \
-  GMOCK_INTERNAL_ACTION(name, name##ActionP8, (__VA_ARGS__))
-
-#define ACTION_P9(name, ...) \
-  GMOCK_INTERNAL_ACTION(name, name##ActionP9, (__VA_ARGS__))
-
-#define ACTION_P10(name, ...) \
-  GMOCK_INTERNAL_ACTION(name, name##ActionP10, (__VA_ARGS__))
-
+// 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. 
+template <typename T, typename... Params> 
+internal::ReturnNewAction<T, typename std::decay<Params>::type...> ReturnNew( 
+    Params&&... params) { 
+  return {std::forward_as_tuple(std::forward<Params>(params)...)}; 
+} 
+ 
+// Action ReturnArg<k>() returns the k-th argument of the mock function. 
+template <size_t k> 
+internal::ReturnArgAction<k> ReturnArg() { 
+  return {}; 
+} 
+ 
+// Action SaveArg<k>(pointer) saves the k-th (0-based) argument of the 
+// mock function to *pointer. 
+template <size_t k, typename Ptr> 
+internal::SaveArgAction<k, Ptr> SaveArg(Ptr pointer) { 
+  return {pointer}; 
+} 
+ 
+// Action SaveArgPointee<k>(pointer) saves the value pointed to 
+// by the k-th (0-based) argument of the mock function to *pointer. 
+template <size_t k, typename Ptr> 
+internal::SaveArgPointeeAction<k, Ptr> SaveArgPointee(Ptr pointer) { 
+  return {pointer}; 
+} 
+ 
+// Action SetArgReferee<k>(value) assigns 'value' to the variable 
+// referenced by the k-th (0-based) argument of the mock function. 
+template <size_t k, typename T> 
+internal::SetArgRefereeAction<k, typename std::decay<T>::type> SetArgReferee( 
+    T&& value) { 
+  return {std::forward<T>(value)}; 
+} 
+ 
+// Action SetArrayArgument<k>(first, last) copies the elements in 
+// source range [first, last) to the array pointed to by the k-th 
+// (0-based) argument, which can be either a pointer or an 
+// iterator. The action does not take ownership of the elements in the 
+// source range. 
+template <size_t k, typename I1, typename I2> 
+internal::SetArrayArgumentAction<k, I1, I2> SetArrayArgument(I1 first, 
+                                                             I2 last) { 
+  return {first, last}; 
+} 
+ 
+// Action DeleteArg<k>() deletes the k-th (0-based) argument of the mock 
+// function. 
+template <size_t k> 
+internal::DeleteArgAction<k> DeleteArg() { 
+  return {}; 
+} 
+ 
+// This action returns the value pointed to by 'pointer'. 
+template <typename Ptr> 
+internal::ReturnPointeeAction<Ptr> ReturnPointee(Ptr pointer) { 
+  return {pointer}; 
+} 
+ 
+// Action Throw(exception) can be used in a mock function of any type 
+// to throw the given exception.  Any copyable value can be thrown. 
+#if GTEST_HAS_EXCEPTIONS 
+template <typename T> 
+internal::ThrowAction<typename std::decay<T>::type> Throw(T&& exception) { 
+  return {std::forward<T>(exception)}; 
+} 
+#endif  // GTEST_HAS_EXCEPTIONS 
+ 
+namespace internal { 
+ 
+// A macro from the ACTION* family (defined later in gmock-generated-actions.h) 
+// defines an action that can be used in a mock function.  Typically, 
+// these actions only care about a subset of the arguments of the mock 
+// function.  For example, if such an action only uses the second 
+// argument, it can be used in any mock function that takes >= 2 
+// arguments where the type of the second argument is compatible. 
+// 
+// Therefore, the action implementation must be prepared to take more 
+// arguments than it needs.  The ExcessiveArg type is used to 
+// represent those excessive arguments.  In order to keep the compiler 
+// error messages tractable, we define it in the testing namespace 
+// instead of testing::internal.  However, this is an INTERNAL TYPE 
+// and subject to change without notice, so a user MUST NOT USE THIS 
+// TYPE DIRECTLY. 
+struct ExcessiveArg {}; 
+ 
+// Builds an implementation of an Action<> for some particular signature, using 
+// a class defined by an ACTION* macro. 
+template <typename F, typename Impl> struct ActionImpl; 
+ 
+template <typename Impl> 
+struct ImplBase { 
+  struct Holder { 
+    // Allows each copy of the Action<> to get to the Impl. 
+    explicit operator const Impl&() const { return *ptr; } 
+    std::shared_ptr<Impl> ptr; 
+  }; 
+  using type = typename std::conditional<std::is_constructible<Impl>::value, 
+                                         Impl, Holder>::type; 
+}; 
+ 
+template <typename R, typename... Args, typename Impl> 
+struct ActionImpl<R(Args...), Impl> : ImplBase<Impl>::type { 
+  using Base = typename ImplBase<Impl>::type; 
+  using function_type = R(Args...); 
+  using args_type = std::tuple<Args...>; 
+ 
+  ActionImpl() = default;  // Only defined if appropriate for Base. 
+  explicit ActionImpl(std::shared_ptr<Impl> impl) : Base{std::move(impl)} { } 
+ 
+  R operator()(Args&&... arg) const { 
+    static constexpr size_t kMaxArgs = 
+        sizeof...(Args) <= 10 ? sizeof...(Args) : 10; 
+    return Apply(MakeIndexSequence<kMaxArgs>{}, 
+                 MakeIndexSequence<10 - kMaxArgs>{}, 
+                 args_type{std::forward<Args>(arg)...}); 
+  } 
+ 
+  template <std::size_t... arg_id, std::size_t... excess_id> 
+  R Apply(IndexSequence<arg_id...>, IndexSequence<excess_id...>, 
+          const args_type& args) const { 
+    // Impl need not be specific to the signature of action being implemented; 
+    // only the implementing function body needs to have all of the specific 
+    // types instantiated.  Up to 10 of the args that are provided by the 
+    // args_type get passed, followed by a dummy of unspecified type for the 
+    // remainder up to 10 explicit args. 
+    static constexpr ExcessiveArg kExcessArg{}; 
+    return static_cast<const Impl&>(*this).template gmock_PerformImpl< 
+        /*function_type=*/function_type, /*return_type=*/R, 
+        /*args_type=*/args_type, 
+        /*argN_type=*/typename std::tuple_element<arg_id, args_type>::type...>( 
+        /*args=*/args, std::get<arg_id>(args)..., 
+        ((void)excess_id, kExcessArg)...); 
+  } 
+}; 
+ 
+// Stores a default-constructed Impl as part of the Action<>'s 
+// std::function<>. The Impl should be trivial to copy. 
+template <typename F, typename Impl> 
+::testing::Action<F> MakeAction() { 
+  return ::testing::Action<F>(ActionImpl<F, Impl>()); 
+} 
+ 
+// Stores just the one given instance of Impl. 
+template <typename F, typename Impl> 
+::testing::Action<F> MakeAction(std::shared_ptr<Impl> impl) { 
+  return ::testing::Action<F>(ActionImpl<F, Impl>(std::move(impl))); 
+} 
+ 
+#define GMOCK_INTERNAL_ARG_UNUSED(i, data, el) \ 
+  , const arg##i##_type& arg##i GTEST_ATTRIBUTE_UNUSED_ 
+#define GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_           \ 
+  const args_type& args GTEST_ATTRIBUTE_UNUSED_ GMOCK_PP_REPEAT( \ 
+      GMOCK_INTERNAL_ARG_UNUSED, , 10) 
+ 
+#define GMOCK_INTERNAL_ARG(i, data, el) , const arg##i##_type& arg##i 
+#define GMOCK_ACTION_ARG_TYPES_AND_NAMES_ \ 
+  const args_type& args GMOCK_PP_REPEAT(GMOCK_INTERNAL_ARG, , 10) 
+ 
+#define GMOCK_INTERNAL_TEMPLATE_ARG(i, data, el) , typename arg##i##_type 
+#define GMOCK_ACTION_TEMPLATE_ARGS_NAMES_ \ 
+  GMOCK_PP_TAIL(GMOCK_PP_REPEAT(GMOCK_INTERNAL_TEMPLATE_ARG, , 10)) 
+ 
+#define GMOCK_INTERNAL_TYPENAME_PARAM(i, data, param) , typename param##_type 
+#define GMOCK_ACTION_TYPENAME_PARAMS_(params) \ 
+  GMOCK_PP_TAIL(GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_TYPENAME_PARAM, , params)) 
+ 
+#define GMOCK_INTERNAL_TYPE_PARAM(i, data, param) , param##_type 
+#define GMOCK_ACTION_TYPE_PARAMS_(params) \ 
+  GMOCK_PP_TAIL(GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_TYPE_PARAM, , params)) 
+ 
+#define GMOCK_INTERNAL_TYPE_GVALUE_PARAM(i, data, param) \ 
+  , param##_type gmock_p##i 
+#define GMOCK_ACTION_TYPE_GVALUE_PARAMS_(params) \ 
+  GMOCK_PP_TAIL(GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_TYPE_GVALUE_PARAM, , params)) 
+ 
+#define GMOCK_INTERNAL_GVALUE_PARAM(i, data, param) \ 
+  , std::forward<param##_type>(gmock_p##i) 
+#define GMOCK_ACTION_GVALUE_PARAMS_(params) \ 
+  GMOCK_PP_TAIL(GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_GVALUE_PARAM, , params)) 
+ 
+#define GMOCK_INTERNAL_INIT_PARAM(i, data, param) \ 
+  , param(::std::forward<param##_type>(gmock_p##i)) 
+#define GMOCK_ACTION_INIT_PARAMS_(params) \ 
+  GMOCK_PP_TAIL(GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_INIT_PARAM, , params)) 
+ 
+#define GMOCK_INTERNAL_FIELD_PARAM(i, data, param) param##_type param; 
+#define GMOCK_ACTION_FIELD_PARAMS_(params) \ 
+  GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_FIELD_PARAM, , params) 
+ 
+#define GMOCK_INTERNAL_ACTION(name, full_name, params)                        \ 
+  template <GMOCK_ACTION_TYPENAME_PARAMS_(params)>                            \ 
+  class full_name {                                                           \ 
+   public:                                                                    \ 
+    explicit full_name(GMOCK_ACTION_TYPE_GVALUE_PARAMS_(params))              \ 
+        : impl_(std::make_shared<gmock_Impl>(                                 \ 
+                GMOCK_ACTION_GVALUE_PARAMS_(params))) { }                     \ 
+    full_name(const full_name&) = default;                                    \ 
+    full_name(full_name&&) noexcept = default;                                \ 
+    template <typename F>                                                     \ 
+    operator ::testing::Action<F>() const {                                   \ 
+      return ::testing::internal::MakeAction<F>(impl_);                       \ 
+    }                                                                         \ 
+   private:                                                                   \ 
+    class gmock_Impl {                                                        \ 
+     public:                                                                  \ 
+      explicit gmock_Impl(GMOCK_ACTION_TYPE_GVALUE_PARAMS_(params))           \ 
+          : GMOCK_ACTION_INIT_PARAMS_(params) {}                              \ 
+      template <typename function_type, typename return_type,                 \ 
+                typename args_type, GMOCK_ACTION_TEMPLATE_ARGS_NAMES_>        \ 
+      return_type gmock_PerformImpl(GMOCK_ACTION_ARG_TYPES_AND_NAMES_) const; \ 
+      GMOCK_ACTION_FIELD_PARAMS_(params)                                      \ 
+    };                                                                        \ 
+    std::shared_ptr<const gmock_Impl> impl_;                                  \ 
+  };                                                                          \ 
+  template <GMOCK_ACTION_TYPENAME_PARAMS_(params)>                            \ 
+  inline full_name<GMOCK_ACTION_TYPE_PARAMS_(params)> name(                   \ 
+      GMOCK_ACTION_TYPE_GVALUE_PARAMS_(params)) {                             \ 
+    return full_name<GMOCK_ACTION_TYPE_PARAMS_(params)>(                      \ 
+        GMOCK_ACTION_GVALUE_PARAMS_(params));                                 \ 
+  }                                                                           \ 
+  template <GMOCK_ACTION_TYPENAME_PARAMS_(params)>                            \ 
+  template <typename function_type, typename return_type, typename args_type, \ 
+            GMOCK_ACTION_TEMPLATE_ARGS_NAMES_>                                \ 
+  return_type full_name<GMOCK_ACTION_TYPE_PARAMS_(params)>::gmock_Impl::      \ 
+  gmock_PerformImpl(GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const 
+ 
+}  // namespace internal 
+ 
+// Similar to GMOCK_INTERNAL_ACTION, but no bound parameters are stored. 
+#define ACTION(name)                                                          \ 
+  class name##Action {                                                        \ 
+   public:                                                                    \ 
+   explicit name##Action() noexcept {}                                        \ 
+   name##Action(const name##Action&) noexcept {}                              \ 
+    template <typename F>                                                     \ 
+    operator ::testing::Action<F>() const {                                   \ 
+      return ::testing::internal::MakeAction<F, gmock_Impl>();                \ 
+    }                                                                         \ 
+   private:                                                                   \ 
+    class gmock_Impl {                                                        \ 
+     public:                                                                  \ 
+      template <typename function_type, typename return_type,                 \ 
+                typename args_type, GMOCK_ACTION_TEMPLATE_ARGS_NAMES_>        \ 
+      return_type gmock_PerformImpl(GMOCK_ACTION_ARG_TYPES_AND_NAMES_) const; \ 
+    };                                                                        \ 
+  };                                                                          \ 
+  inline name##Action name() GTEST_MUST_USE_RESULT_;                          \ 
+  inline name##Action name() { return name##Action(); }                       \ 
+  template <typename function_type, typename return_type, typename args_type, \ 
+            GMOCK_ACTION_TEMPLATE_ARGS_NAMES_>                                \ 
+  return_type name##Action::gmock_Impl::gmock_PerformImpl(                    \ 
+      GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const 
+ 
+#define ACTION_P(name, ...) \ 
+  GMOCK_INTERNAL_ACTION(name, name##ActionP, (__VA_ARGS__)) 
+ 
+#define ACTION_P2(name, ...) \ 
+  GMOCK_INTERNAL_ACTION(name, name##ActionP2, (__VA_ARGS__)) 
+ 
+#define ACTION_P3(name, ...) \ 
+  GMOCK_INTERNAL_ACTION(name, name##ActionP3, (__VA_ARGS__)) 
+ 
+#define ACTION_P4(name, ...) \ 
+  GMOCK_INTERNAL_ACTION(name, name##ActionP4, (__VA_ARGS__)) 
+ 
+#define ACTION_P5(name, ...) \ 
+  GMOCK_INTERNAL_ACTION(name, name##ActionP5, (__VA_ARGS__)) 
+ 
+#define ACTION_P6(name, ...) \ 
+  GMOCK_INTERNAL_ACTION(name, name##ActionP6, (__VA_ARGS__)) 
+ 
+#define ACTION_P7(name, ...) \ 
+  GMOCK_INTERNAL_ACTION(name, name##ActionP7, (__VA_ARGS__)) 
+ 
+#define ACTION_P8(name, ...) \ 
+  GMOCK_INTERNAL_ACTION(name, name##ActionP8, (__VA_ARGS__)) 
+ 
+#define ACTION_P9(name, ...) \ 
+  GMOCK_INTERNAL_ACTION(name, name##ActionP9, (__VA_ARGS__)) 
+ 
+#define ACTION_P10(name, ...) \ 
+  GMOCK_INTERNAL_ACTION(name, name##ActionP10, (__VA_ARGS__)) 
+ 
 }  // namespace testing
 
-#ifdef _MSC_VER
-# pragma warning(pop)
-#endif
-
-#endif  // GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_ACTIONS_H_
+#ifdef _MSC_VER 
+# pragma warning(pop) 
+#endif 
+ 
+#endif  // GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_ACTIONS_H_ 
diff --git a/contrib/restricted/googletest/googlemock/include/gmock/gmock-cardinalities.h b/contrib/restricted/googletest/googlemock/include/gmock/gmock-cardinalities.h
index fc7f803a7a..12cc925411 100644
--- a/contrib/restricted/googletest/googlemock/include/gmock/gmock-cardinalities.h
+++ b/contrib/restricted/googletest/googlemock/include/gmock/gmock-cardinalities.h
@@ -27,27 +27,27 @@
 // (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_
+// GOOGLETEST_CM0002 DO NOT DELETE 
+ 
+#ifndef GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_CARDINALITIES_H_ 
+#define GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_CARDINALITIES_H_ 
 
 #include <limits.h>
-#include <memory>
+#include <memory> 
 #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 */)
-
+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:
@@ -70,12 +70,12 @@ class CardinalityInterface {
   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.
+  // Returns true if and only if call_count calls will satisfy this 
+  // cardinality. 
   virtual bool IsSatisfiedByCallCount(int call_count) const = 0;
 
-  // Returns true if and only if call_count calls will saturate this
-  // cardinality.
+  // 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.
@@ -84,8 +84,8 @@ class CardinalityInterface {
 
 // 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!
+// 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
@@ -100,19 +100,19 @@ class GTEST_API_ Cardinality {
   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.
+  // Returns true if and only if call_count calls will satisfy this 
+  // cardinality. 
   bool IsSatisfiedByCallCount(int call_count) const {
     return impl_->IsSatisfiedByCallCount(call_count);
   }
 
-  // Returns true if and only if call_count calls will saturate this
-  // cardinality.
+  // Returns true if and only if call_count calls will saturate this 
+  // cardinality. 
   bool IsSaturatedByCallCount(int call_count) const {
     return impl_->IsSaturatedByCallCount(call_count);
   }
 
-  // Returns true if and only if call_count calls will over-saturate this
+  // 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) &&
@@ -127,7 +127,7 @@ class GTEST_API_ Cardinality {
                                         ::std::ostream* os);
 
  private:
-  std::shared_ptr<const CardinalityInterface> impl_;
+  std::shared_ptr<const CardinalityInterface> impl_; 
 };
 
 // Creates a cardinality that allows at least n calls.
@@ -152,6 +152,6 @@ inline Cardinality MakeCardinality(const CardinalityInterface* c) {
 
 }  // namespace testing
 
-GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251
-
-#endif  // GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_CARDINALITIES_H_
+GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251 
+ 
+#endif  // GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_CARDINALITIES_H_ 
diff --git a/contrib/restricted/googletest/googlemock/include/gmock/gmock-function-mocker.h b/contrib/restricted/googletest/googlemock/include/gmock/gmock-function-mocker.h
index 0fc6f6f3f1..2fe1b20100 100644
--- a/contrib/restricted/googletest/googlemock/include/gmock/gmock-function-mocker.h
+++ b/contrib/restricted/googletest/googlemock/include/gmock/gmock-function-mocker.h
@@ -1,479 +1,479 @@
-// 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 MOCK_METHOD.
-
-// GOOGLETEST_CM0002 DO NOT DELETE
-
-#ifndef GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_FUNCTION_MOCKER_H_  // NOLINT
-#define GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_FUNCTION_MOCKER_H_  // NOLINT
-
-#include <type_traits>  // IWYU pragma: keep
-#include <utility>      // IWYU pragma: keep
-
-#include "gmock/gmock-spec-builders.h"
-#include "gmock/internal/gmock-internal-utils.h"
-#include "gmock/internal/gmock-pp.h"
-
-namespace testing {
-namespace internal {
-template <typename T>
-using identity_t = T;
-
-template <typename Pattern>
-struct ThisRefAdjuster {
-  template <typename T>
-  using AdjustT = typename std::conditional<
-      std::is_const<typename std::remove_reference<Pattern>::type>::value,
-      typename std::conditional<std::is_lvalue_reference<Pattern>::value,
-                                const T&, const T&&>::type,
-      typename std::conditional<std::is_lvalue_reference<Pattern>::value, T&,
-                                T&&>::type>::type;
-
-  template <typename MockType>
-  static AdjustT<MockType> Adjust(const MockType& mock) {
-    return static_cast<AdjustT<MockType>>(const_cast<MockType&>(mock));
-  }
-};
-
-}  // namespace internal
-
-// The style guide prohibits "using" statements in a namespace scope
-// inside a header file.  However, the FunctionMocker 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 FunctionMocker in ::testing.
-using internal::FunctionMocker;
-}  // namespace testing
-
-#define MOCK_METHOD(...) \
-  GMOCK_PP_VARIADIC_CALL(GMOCK_INTERNAL_MOCK_METHOD_ARG_, __VA_ARGS__)
-
-#define GMOCK_INTERNAL_MOCK_METHOD_ARG_1(...) \
-  GMOCK_INTERNAL_WRONG_ARITY(__VA_ARGS__)
-
-#define GMOCK_INTERNAL_MOCK_METHOD_ARG_2(...) \
-  GMOCK_INTERNAL_WRONG_ARITY(__VA_ARGS__)
-
-#define GMOCK_INTERNAL_MOCK_METHOD_ARG_3(_Ret, _MethodName, _Args) \
-  GMOCK_INTERNAL_MOCK_METHOD_ARG_4(_Ret, _MethodName, _Args, ())
-
-#define GMOCK_INTERNAL_MOCK_METHOD_ARG_4(_Ret, _MethodName, _Args, _Spec)     \
-  GMOCK_INTERNAL_ASSERT_PARENTHESIS(_Args);                                   \
-  GMOCK_INTERNAL_ASSERT_PARENTHESIS(_Spec);                                   \
-  GMOCK_INTERNAL_ASSERT_VALID_SIGNATURE(                                      \
-      GMOCK_PP_NARG0 _Args, GMOCK_INTERNAL_SIGNATURE(_Ret, _Args));           \
-  GMOCK_INTERNAL_ASSERT_VALID_SPEC(_Spec)                                     \
-  GMOCK_INTERNAL_MOCK_METHOD_IMPL(                                            \
-      GMOCK_PP_NARG0 _Args, _MethodName, GMOCK_INTERNAL_HAS_CONST(_Spec),     \
-      GMOCK_INTERNAL_HAS_OVERRIDE(_Spec), GMOCK_INTERNAL_HAS_FINAL(_Spec),    \
-      GMOCK_INTERNAL_GET_NOEXCEPT_SPEC(_Spec),                                \
-      GMOCK_INTERNAL_GET_CALLTYPE(_Spec), GMOCK_INTERNAL_GET_REF_SPEC(_Spec), \
-      (GMOCK_INTERNAL_SIGNATURE(_Ret, _Args)))
-
-#define GMOCK_INTERNAL_MOCK_METHOD_ARG_5(...) \
-  GMOCK_INTERNAL_WRONG_ARITY(__VA_ARGS__)
-
-#define GMOCK_INTERNAL_MOCK_METHOD_ARG_6(...) \
-  GMOCK_INTERNAL_WRONG_ARITY(__VA_ARGS__)
-
-#define GMOCK_INTERNAL_MOCK_METHOD_ARG_7(...) \
-  GMOCK_INTERNAL_WRONG_ARITY(__VA_ARGS__)
-
-#define GMOCK_INTERNAL_WRONG_ARITY(...)                                      \
-  static_assert(                                                             \
-      false,                                                                 \
-      "MOCK_METHOD must be called with 3 or 4 arguments. _Ret, "             \
-      "_MethodName, _Args and optionally _Spec. _Args and _Spec must be "    \
-      "enclosed in parentheses. If _Ret is a type with unprotected commas, " \
-      "it must also be enclosed in parentheses.")
-
-#define GMOCK_INTERNAL_ASSERT_PARENTHESIS(_Tuple) \
-  static_assert(                                  \
-      GMOCK_PP_IS_ENCLOSED_PARENS(_Tuple),        \
-      GMOCK_PP_STRINGIZE(_Tuple) " should be enclosed in parentheses.")
-
-#define GMOCK_INTERNAL_ASSERT_VALID_SIGNATURE(_N, ...)                 \
-  static_assert(                                                       \
-      std::is_function<__VA_ARGS__>::value,                            \
-      "Signature must be a function type, maybe return type contains " \
-      "unprotected comma.");                                           \
-  static_assert(                                                       \
-      ::testing::tuple_size<typename ::testing::internal::Function<    \
-              __VA_ARGS__>::ArgumentTuple>::value == _N,               \
-      "This method does not take " GMOCK_PP_STRINGIZE(                 \
-          _N) " arguments. Parenthesize all types with unprotected commas.")
-
-#define GMOCK_INTERNAL_ASSERT_VALID_SPEC(_Spec) \
-  GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_ASSERT_VALID_SPEC_ELEMENT, ~, _Spec)
-
-#define GMOCK_INTERNAL_MOCK_METHOD_IMPL(_N, _MethodName, _Constness,           \
-                                        _Override, _Final, _NoexceptSpec,      \
-                                        _CallType, _RefSpec, _Signature)       \
-  typename ::testing::internal::Function<GMOCK_PP_REMOVE_PARENS(               \
-      _Signature)>::Result                                                     \
-  GMOCK_INTERNAL_EXPAND(_CallType)                                             \
-      _MethodName(GMOCK_PP_REPEAT(GMOCK_INTERNAL_PARAMETER, _Signature, _N))   \
-          GMOCK_PP_IF(_Constness, const, ) _RefSpec _NoexceptSpec              \
-          GMOCK_PP_IF(_Override, override, ) GMOCK_PP_IF(_Final, final, ) {    \
-    GMOCK_MOCKER_(_N, _Constness, _MethodName)                                 \
-        .SetOwnerAndName(this, #_MethodName);                                  \
-    return GMOCK_MOCKER_(_N, _Constness, _MethodName)                          \
-        .Invoke(GMOCK_PP_REPEAT(GMOCK_INTERNAL_FORWARD_ARG, _Signature, _N));  \
-  }                                                                            \
-  ::testing::MockSpec<GMOCK_PP_REMOVE_PARENS(_Signature)> gmock_##_MethodName( \
-      GMOCK_PP_REPEAT(GMOCK_INTERNAL_MATCHER_PARAMETER, _Signature, _N))       \
-      GMOCK_PP_IF(_Constness, const, ) _RefSpec {                              \
-    GMOCK_MOCKER_(_N, _Constness, _MethodName).RegisterOwner(this);            \
-    return GMOCK_MOCKER_(_N, _Constness, _MethodName)                          \
-        .With(GMOCK_PP_REPEAT(GMOCK_INTERNAL_MATCHER_ARGUMENT, , _N));         \
-  }                                                                            \
-  ::testing::MockSpec<GMOCK_PP_REMOVE_PARENS(_Signature)> gmock_##_MethodName( \
-      const ::testing::internal::WithoutMatchers&,                             \
-      GMOCK_PP_IF(_Constness, const, )::testing::internal::Function<           \
-          GMOCK_PP_REMOVE_PARENS(_Signature)>*) const _RefSpec _NoexceptSpec { \
-    return ::testing::internal::ThisRefAdjuster<GMOCK_PP_IF(                   \
-        _Constness, const, ) int _RefSpec>::Adjust(*this)                      \
-        .gmock_##_MethodName(GMOCK_PP_REPEAT(                                  \
-            GMOCK_INTERNAL_A_MATCHER_ARGUMENT, _Signature, _N));               \
-  }                                                                            \
-  mutable ::testing::FunctionMocker<GMOCK_PP_REMOVE_PARENS(_Signature)>        \
-      GMOCK_MOCKER_(_N, _Constness, _MethodName)
-
-#define GMOCK_INTERNAL_EXPAND(...) __VA_ARGS__
-
-// Five Valid modifiers.
-#define GMOCK_INTERNAL_HAS_CONST(_Tuple) \
-  GMOCK_PP_HAS_COMMA(GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_DETECT_CONST, ~, _Tuple))
-
-#define GMOCK_INTERNAL_HAS_OVERRIDE(_Tuple) \
-  GMOCK_PP_HAS_COMMA(                       \
-      GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_DETECT_OVERRIDE, ~, _Tuple))
-
-#define GMOCK_INTERNAL_HAS_FINAL(_Tuple) \
-  GMOCK_PP_HAS_COMMA(GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_DETECT_FINAL, ~, _Tuple))
-
-#define GMOCK_INTERNAL_GET_NOEXCEPT_SPEC(_Tuple) \
-  GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_NOEXCEPT_SPEC_IF_NOEXCEPT, ~, _Tuple)
-
-#define GMOCK_INTERNAL_NOEXCEPT_SPEC_IF_NOEXCEPT(_i, _, _elem)          \
-  GMOCK_PP_IF(                                                          \
-      GMOCK_PP_HAS_COMMA(GMOCK_INTERNAL_DETECT_NOEXCEPT(_i, _, _elem)), \
-      _elem, )
-
-#define GMOCK_INTERNAL_GET_REF_SPEC(_Tuple) \
-  GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_REF_SPEC_IF_REF, ~, _Tuple)
-
-#define GMOCK_INTERNAL_REF_SPEC_IF_REF(_i, _, _elem)                       \
-  GMOCK_PP_IF(GMOCK_PP_HAS_COMMA(GMOCK_INTERNAL_DETECT_REF(_i, _, _elem)), \
-              GMOCK_PP_CAT(GMOCK_INTERNAL_UNPACK_, _elem), )
-
-#define GMOCK_INTERNAL_GET_CALLTYPE(_Tuple) \
-  GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_GET_CALLTYPE_IMPL, ~, _Tuple)
-
-#define GMOCK_INTERNAL_ASSERT_VALID_SPEC_ELEMENT(_i, _, _elem)            \
-  static_assert(                                                          \
-      (GMOCK_PP_HAS_COMMA(GMOCK_INTERNAL_DETECT_CONST(_i, _, _elem)) +    \
-       GMOCK_PP_HAS_COMMA(GMOCK_INTERNAL_DETECT_OVERRIDE(_i, _, _elem)) + \
-       GMOCK_PP_HAS_COMMA(GMOCK_INTERNAL_DETECT_FINAL(_i, _, _elem)) +    \
-       GMOCK_PP_HAS_COMMA(GMOCK_INTERNAL_DETECT_NOEXCEPT(_i, _, _elem)) + \
-       GMOCK_PP_HAS_COMMA(GMOCK_INTERNAL_DETECT_REF(_i, _, _elem)) +      \
-       GMOCK_INTERNAL_IS_CALLTYPE(_elem)) == 1,                           \
-      GMOCK_PP_STRINGIZE(                                                 \
-          _elem) " cannot be recognized as a valid specification modifier.");
-
-// Modifiers implementation.
-#define GMOCK_INTERNAL_DETECT_CONST(_i, _, _elem) \
-  GMOCK_PP_CAT(GMOCK_INTERNAL_DETECT_CONST_I_, _elem)
-
-#define GMOCK_INTERNAL_DETECT_CONST_I_const ,
-
-#define GMOCK_INTERNAL_DETECT_OVERRIDE(_i, _, _elem) \
-  GMOCK_PP_CAT(GMOCK_INTERNAL_DETECT_OVERRIDE_I_, _elem)
-
-#define GMOCK_INTERNAL_DETECT_OVERRIDE_I_override ,
-
-#define GMOCK_INTERNAL_DETECT_FINAL(_i, _, _elem) \
-  GMOCK_PP_CAT(GMOCK_INTERNAL_DETECT_FINAL_I_, _elem)
-
-#define GMOCK_INTERNAL_DETECT_FINAL_I_final ,
-
-#define GMOCK_INTERNAL_DETECT_NOEXCEPT(_i, _, _elem) \
-  GMOCK_PP_CAT(GMOCK_INTERNAL_DETECT_NOEXCEPT_I_, _elem)
-
-#define GMOCK_INTERNAL_DETECT_NOEXCEPT_I_noexcept ,
-
-#define GMOCK_INTERNAL_DETECT_REF(_i, _, _elem) \
-  GMOCK_PP_CAT(GMOCK_INTERNAL_DETECT_REF_I_, _elem)
-
-#define GMOCK_INTERNAL_DETECT_REF_I_ref ,
-
-#define GMOCK_INTERNAL_UNPACK_ref(x) x
-
-#define GMOCK_INTERNAL_GET_CALLTYPE_IMPL(_i, _, _elem)           \
-  GMOCK_PP_IF(GMOCK_INTERNAL_IS_CALLTYPE(_elem),                 \
-              GMOCK_INTERNAL_GET_VALUE_CALLTYPE, GMOCK_PP_EMPTY) \
-  (_elem)
-
-// TODO(iserna): GMOCK_INTERNAL_IS_CALLTYPE and
-// GMOCK_INTERNAL_GET_VALUE_CALLTYPE needed more expansions to work on windows
-// maybe they can be simplified somehow.
-#define GMOCK_INTERNAL_IS_CALLTYPE(_arg) \
-  GMOCK_INTERNAL_IS_CALLTYPE_I(          \
-      GMOCK_PP_CAT(GMOCK_INTERNAL_IS_CALLTYPE_HELPER_, _arg))
-#define GMOCK_INTERNAL_IS_CALLTYPE_I(_arg) GMOCK_PP_IS_ENCLOSED_PARENS(_arg)
-
-#define GMOCK_INTERNAL_GET_VALUE_CALLTYPE(_arg) \
-  GMOCK_INTERNAL_GET_VALUE_CALLTYPE_I(          \
-      GMOCK_PP_CAT(GMOCK_INTERNAL_IS_CALLTYPE_HELPER_, _arg))
-#define GMOCK_INTERNAL_GET_VALUE_CALLTYPE_I(_arg) \
-  GMOCK_PP_IDENTITY _arg
-
-#define GMOCK_INTERNAL_IS_CALLTYPE_HELPER_Calltype
-
-// Note: The use of `identity_t` here allows _Ret to represent return types that
-// would normally need to be specified in a different way. For example, a method
-// returning a function pointer must be written as
-//
-// fn_ptr_return_t (*method(method_args_t...))(fn_ptr_args_t...)
-//
-// But we only support placing the return type at the beginning. To handle this,
-// we wrap all calls in identity_t, so that a declaration will be expanded to
-//
-// identity_t<fn_ptr_return_t (*)(fn_ptr_args_t...)> method(method_args_t...)
-//
-// This allows us to work around the syntactic oddities of function/method
-// types.
-#define GMOCK_INTERNAL_SIGNATURE(_Ret, _Args)                                 \
-  ::testing::internal::identity_t<GMOCK_PP_IF(GMOCK_PP_IS_BEGIN_PARENS(_Ret), \
-                                              GMOCK_PP_REMOVE_PARENS,         \
-                                              GMOCK_PP_IDENTITY)(_Ret)>(      \
-      GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_GET_TYPE, _, _Args))
-
-#define GMOCK_INTERNAL_GET_TYPE(_i, _, _elem)                          \
-  GMOCK_PP_COMMA_IF(_i)                                                \
-  GMOCK_PP_IF(GMOCK_PP_IS_BEGIN_PARENS(_elem), GMOCK_PP_REMOVE_PARENS, \
-              GMOCK_PP_IDENTITY)                                       \
-  (_elem)
-
-#define GMOCK_INTERNAL_PARAMETER(_i, _Signature, _)            \
-  GMOCK_PP_COMMA_IF(_i)                                        \
-  GMOCK_INTERNAL_ARG_O(_i, GMOCK_PP_REMOVE_PARENS(_Signature)) \
-  gmock_a##_i
-
-#define GMOCK_INTERNAL_FORWARD_ARG(_i, _Signature, _) \
-  GMOCK_PP_COMMA_IF(_i)                               \
-  ::std::forward<GMOCK_INTERNAL_ARG_O(                \
-      _i, GMOCK_PP_REMOVE_PARENS(_Signature))>(gmock_a##_i)
-
-#define GMOCK_INTERNAL_MATCHER_PARAMETER(_i, _Signature, _)        \
-  GMOCK_PP_COMMA_IF(_i)                                            \
-  GMOCK_INTERNAL_MATCHER_O(_i, GMOCK_PP_REMOVE_PARENS(_Signature)) \
-  gmock_a##_i
-
-#define GMOCK_INTERNAL_MATCHER_ARGUMENT(_i, _1, _2) \
-  GMOCK_PP_COMMA_IF(_i)                             \
-  gmock_a##_i
-
-#define GMOCK_INTERNAL_A_MATCHER_ARGUMENT(_i, _Signature, _) \
-  GMOCK_PP_COMMA_IF(_i)                                      \
-  ::testing::A<GMOCK_INTERNAL_ARG_O(_i, GMOCK_PP_REMOVE_PARENS(_Signature))>()
-
-#define GMOCK_INTERNAL_ARG_O(_i, ...) \
-  typename ::testing::internal::Function<__VA_ARGS__>::template Arg<_i>::type
-
-#define GMOCK_INTERNAL_MATCHER_O(_i, ...)                          \
-  const ::testing::Matcher<typename ::testing::internal::Function< \
-      __VA_ARGS__>::template Arg<_i>::type>&
-
-#define MOCK_METHOD0(m, ...) GMOCK_INTERNAL_MOCK_METHODN(, , m, 0, __VA_ARGS__)
-#define MOCK_METHOD1(m, ...) GMOCK_INTERNAL_MOCK_METHODN(, , m, 1, __VA_ARGS__)
-#define MOCK_METHOD2(m, ...) GMOCK_INTERNAL_MOCK_METHODN(, , m, 2, __VA_ARGS__)
-#define MOCK_METHOD3(m, ...) GMOCK_INTERNAL_MOCK_METHODN(, , m, 3, __VA_ARGS__)
-#define MOCK_METHOD4(m, ...) GMOCK_INTERNAL_MOCK_METHODN(, , m, 4, __VA_ARGS__)
-#define MOCK_METHOD5(m, ...) GMOCK_INTERNAL_MOCK_METHODN(, , m, 5, __VA_ARGS__)
-#define MOCK_METHOD6(m, ...) GMOCK_INTERNAL_MOCK_METHODN(, , m, 6, __VA_ARGS__)
-#define MOCK_METHOD7(m, ...) GMOCK_INTERNAL_MOCK_METHODN(, , m, 7, __VA_ARGS__)
-#define MOCK_METHOD8(m, ...) GMOCK_INTERNAL_MOCK_METHODN(, , m, 8, __VA_ARGS__)
-#define MOCK_METHOD9(m, ...) GMOCK_INTERNAL_MOCK_METHODN(, , m, 9, __VA_ARGS__)
-#define MOCK_METHOD10(m, ...) \
-  GMOCK_INTERNAL_MOCK_METHODN(, , m, 10, __VA_ARGS__)
-
-#define MOCK_CONST_METHOD0(m, ...) \
-  GMOCK_INTERNAL_MOCK_METHODN(const, , m, 0, __VA_ARGS__)
-#define MOCK_CONST_METHOD1(m, ...) \
-  GMOCK_INTERNAL_MOCK_METHODN(const, , m, 1, __VA_ARGS__)
-#define MOCK_CONST_METHOD2(m, ...) \
-  GMOCK_INTERNAL_MOCK_METHODN(const, , m, 2, __VA_ARGS__)
-#define MOCK_CONST_METHOD3(m, ...) \
-  GMOCK_INTERNAL_MOCK_METHODN(const, , m, 3, __VA_ARGS__)
-#define MOCK_CONST_METHOD4(m, ...) \
-  GMOCK_INTERNAL_MOCK_METHODN(const, , m, 4, __VA_ARGS__)
-#define MOCK_CONST_METHOD5(m, ...) \
-  GMOCK_INTERNAL_MOCK_METHODN(const, , m, 5, __VA_ARGS__)
-#define MOCK_CONST_METHOD6(m, ...) \
-  GMOCK_INTERNAL_MOCK_METHODN(const, , m, 6, __VA_ARGS__)
-#define MOCK_CONST_METHOD7(m, ...) \
-  GMOCK_INTERNAL_MOCK_METHODN(const, , m, 7, __VA_ARGS__)
-#define MOCK_CONST_METHOD8(m, ...) \
-  GMOCK_INTERNAL_MOCK_METHODN(const, , m, 8, __VA_ARGS__)
-#define MOCK_CONST_METHOD9(m, ...) \
-  GMOCK_INTERNAL_MOCK_METHODN(const, , m, 9, __VA_ARGS__)
-#define MOCK_CONST_METHOD10(m, ...) \
-  GMOCK_INTERNAL_MOCK_METHODN(const, , m, 10, __VA_ARGS__)
-
-#define MOCK_METHOD0_T(m, ...) MOCK_METHOD0(m, __VA_ARGS__)
-#define MOCK_METHOD1_T(m, ...) MOCK_METHOD1(m, __VA_ARGS__)
-#define MOCK_METHOD2_T(m, ...) MOCK_METHOD2(m, __VA_ARGS__)
-#define MOCK_METHOD3_T(m, ...) MOCK_METHOD3(m, __VA_ARGS__)
-#define MOCK_METHOD4_T(m, ...) MOCK_METHOD4(m, __VA_ARGS__)
-#define MOCK_METHOD5_T(m, ...) MOCK_METHOD5(m, __VA_ARGS__)
-#define MOCK_METHOD6_T(m, ...) MOCK_METHOD6(m, __VA_ARGS__)
-#define MOCK_METHOD7_T(m, ...) MOCK_METHOD7(m, __VA_ARGS__)
-#define MOCK_METHOD8_T(m, ...) MOCK_METHOD8(m, __VA_ARGS__)
-#define MOCK_METHOD9_T(m, ...) MOCK_METHOD9(m, __VA_ARGS__)
-#define MOCK_METHOD10_T(m, ...) MOCK_METHOD10(m, __VA_ARGS__)
-
-#define MOCK_CONST_METHOD0_T(m, ...) MOCK_CONST_METHOD0(m, __VA_ARGS__)
-#define MOCK_CONST_METHOD1_T(m, ...) MOCK_CONST_METHOD1(m, __VA_ARGS__)
-#define MOCK_CONST_METHOD2_T(m, ...) MOCK_CONST_METHOD2(m, __VA_ARGS__)
-#define MOCK_CONST_METHOD3_T(m, ...) MOCK_CONST_METHOD3(m, __VA_ARGS__)
-#define MOCK_CONST_METHOD4_T(m, ...) MOCK_CONST_METHOD4(m, __VA_ARGS__)
-#define MOCK_CONST_METHOD5_T(m, ...) MOCK_CONST_METHOD5(m, __VA_ARGS__)
-#define MOCK_CONST_METHOD6_T(m, ...) MOCK_CONST_METHOD6(m, __VA_ARGS__)
-#define MOCK_CONST_METHOD7_T(m, ...) MOCK_CONST_METHOD7(m, __VA_ARGS__)
-#define MOCK_CONST_METHOD8_T(m, ...) MOCK_CONST_METHOD8(m, __VA_ARGS__)
-#define MOCK_CONST_METHOD9_T(m, ...) MOCK_CONST_METHOD9(m, __VA_ARGS__)
-#define MOCK_CONST_METHOD10_T(m, ...) MOCK_CONST_METHOD10(m, __VA_ARGS__)
-
-#define MOCK_METHOD0_WITH_CALLTYPE(ct, m, ...) \
-  GMOCK_INTERNAL_MOCK_METHODN(, ct, m, 0, __VA_ARGS__)
-#define MOCK_METHOD1_WITH_CALLTYPE(ct, m, ...) \
-  GMOCK_INTERNAL_MOCK_METHODN(, ct, m, 1, __VA_ARGS__)
-#define MOCK_METHOD2_WITH_CALLTYPE(ct, m, ...) \
-  GMOCK_INTERNAL_MOCK_METHODN(, ct, m, 2, __VA_ARGS__)
-#define MOCK_METHOD3_WITH_CALLTYPE(ct, m, ...) \
-  GMOCK_INTERNAL_MOCK_METHODN(, ct, m, 3, __VA_ARGS__)
-#define MOCK_METHOD4_WITH_CALLTYPE(ct, m, ...) \
-  GMOCK_INTERNAL_MOCK_METHODN(, ct, m, 4, __VA_ARGS__)
-#define MOCK_METHOD5_WITH_CALLTYPE(ct, m, ...) \
-  GMOCK_INTERNAL_MOCK_METHODN(, ct, m, 5, __VA_ARGS__)
-#define MOCK_METHOD6_WITH_CALLTYPE(ct, m, ...) \
-  GMOCK_INTERNAL_MOCK_METHODN(, ct, m, 6, __VA_ARGS__)
-#define MOCK_METHOD7_WITH_CALLTYPE(ct, m, ...) \
-  GMOCK_INTERNAL_MOCK_METHODN(, ct, m, 7, __VA_ARGS__)
-#define MOCK_METHOD8_WITH_CALLTYPE(ct, m, ...) \
-  GMOCK_INTERNAL_MOCK_METHODN(, ct, m, 8, __VA_ARGS__)
-#define MOCK_METHOD9_WITH_CALLTYPE(ct, m, ...) \
-  GMOCK_INTERNAL_MOCK_METHODN(, ct, m, 9, __VA_ARGS__)
-#define MOCK_METHOD10_WITH_CALLTYPE(ct, m, ...) \
-  GMOCK_INTERNAL_MOCK_METHODN(, ct, m, 10, __VA_ARGS__)
-
-#define MOCK_CONST_METHOD0_WITH_CALLTYPE(ct, m, ...) \
-  GMOCK_INTERNAL_MOCK_METHODN(const, ct, m, 0, __VA_ARGS__)
-#define MOCK_CONST_METHOD1_WITH_CALLTYPE(ct, m, ...) \
-  GMOCK_INTERNAL_MOCK_METHODN(const, ct, m, 1, __VA_ARGS__)
-#define MOCK_CONST_METHOD2_WITH_CALLTYPE(ct, m, ...) \
-  GMOCK_INTERNAL_MOCK_METHODN(const, ct, m, 2, __VA_ARGS__)
-#define MOCK_CONST_METHOD3_WITH_CALLTYPE(ct, m, ...) \
-  GMOCK_INTERNAL_MOCK_METHODN(const, ct, m, 3, __VA_ARGS__)
-#define MOCK_CONST_METHOD4_WITH_CALLTYPE(ct, m, ...) \
-  GMOCK_INTERNAL_MOCK_METHODN(const, ct, m, 4, __VA_ARGS__)
-#define MOCK_CONST_METHOD5_WITH_CALLTYPE(ct, m, ...) \
-  GMOCK_INTERNAL_MOCK_METHODN(const, ct, m, 5, __VA_ARGS__)
-#define MOCK_CONST_METHOD6_WITH_CALLTYPE(ct, m, ...) \
-  GMOCK_INTERNAL_MOCK_METHODN(const, ct, m, 6, __VA_ARGS__)
-#define MOCK_CONST_METHOD7_WITH_CALLTYPE(ct, m, ...) \
-  GMOCK_INTERNAL_MOCK_METHODN(const, ct, m, 7, __VA_ARGS__)
-#define MOCK_CONST_METHOD8_WITH_CALLTYPE(ct, m, ...) \
-  GMOCK_INTERNAL_MOCK_METHODN(const, ct, m, 8, __VA_ARGS__)
-#define MOCK_CONST_METHOD9_WITH_CALLTYPE(ct, m, ...) \
-  GMOCK_INTERNAL_MOCK_METHODN(const, ct, m, 9, __VA_ARGS__)
-#define MOCK_CONST_METHOD10_WITH_CALLTYPE(ct, m, ...) \
-  GMOCK_INTERNAL_MOCK_METHODN(const, ct, m, 10, __VA_ARGS__)
-
-#define MOCK_METHOD0_T_WITH_CALLTYPE(ct, m, ...) \
-  MOCK_METHOD0_WITH_CALLTYPE(ct, m, __VA_ARGS__)
-#define MOCK_METHOD1_T_WITH_CALLTYPE(ct, m, ...) \
-  MOCK_METHOD1_WITH_CALLTYPE(ct, m, __VA_ARGS__)
-#define MOCK_METHOD2_T_WITH_CALLTYPE(ct, m, ...) \
-  MOCK_METHOD2_WITH_CALLTYPE(ct, m, __VA_ARGS__)
-#define MOCK_METHOD3_T_WITH_CALLTYPE(ct, m, ...) \
-  MOCK_METHOD3_WITH_CALLTYPE(ct, m, __VA_ARGS__)
-#define MOCK_METHOD4_T_WITH_CALLTYPE(ct, m, ...) \
-  MOCK_METHOD4_WITH_CALLTYPE(ct, m, __VA_ARGS__)
-#define MOCK_METHOD5_T_WITH_CALLTYPE(ct, m, ...) \
-  MOCK_METHOD5_WITH_CALLTYPE(ct, m, __VA_ARGS__)
-#define MOCK_METHOD6_T_WITH_CALLTYPE(ct, m, ...) \
-  MOCK_METHOD6_WITH_CALLTYPE(ct, m, __VA_ARGS__)
-#define MOCK_METHOD7_T_WITH_CALLTYPE(ct, m, ...) \
-  MOCK_METHOD7_WITH_CALLTYPE(ct, m, __VA_ARGS__)
-#define MOCK_METHOD8_T_WITH_CALLTYPE(ct, m, ...) \
-  MOCK_METHOD8_WITH_CALLTYPE(ct, m, __VA_ARGS__)
-#define MOCK_METHOD9_T_WITH_CALLTYPE(ct, m, ...) \
-  MOCK_METHOD9_WITH_CALLTYPE(ct, m, __VA_ARGS__)
-#define MOCK_METHOD10_T_WITH_CALLTYPE(ct, m, ...) \
-  MOCK_METHOD10_WITH_CALLTYPE(ct, m, __VA_ARGS__)
-
-#define MOCK_CONST_METHOD0_T_WITH_CALLTYPE(ct, m, ...) \
-  MOCK_CONST_METHOD0_WITH_CALLTYPE(ct, m, __VA_ARGS__)
-#define MOCK_CONST_METHOD1_T_WITH_CALLTYPE(ct, m, ...) \
-  MOCK_CONST_METHOD1_WITH_CALLTYPE(ct, m, __VA_ARGS__)
-#define MOCK_CONST_METHOD2_T_WITH_CALLTYPE(ct, m, ...) \
-  MOCK_CONST_METHOD2_WITH_CALLTYPE(ct, m, __VA_ARGS__)
-#define MOCK_CONST_METHOD3_T_WITH_CALLTYPE(ct, m, ...) \
-  MOCK_CONST_METHOD3_WITH_CALLTYPE(ct, m, __VA_ARGS__)
-#define MOCK_CONST_METHOD4_T_WITH_CALLTYPE(ct, m, ...) \
-  MOCK_CONST_METHOD4_WITH_CALLTYPE(ct, m, __VA_ARGS__)
-#define MOCK_CONST_METHOD5_T_WITH_CALLTYPE(ct, m, ...) \
-  MOCK_CONST_METHOD5_WITH_CALLTYPE(ct, m, __VA_ARGS__)
-#define MOCK_CONST_METHOD6_T_WITH_CALLTYPE(ct, m, ...) \
-  MOCK_CONST_METHOD6_WITH_CALLTYPE(ct, m, __VA_ARGS__)
-#define MOCK_CONST_METHOD7_T_WITH_CALLTYPE(ct, m, ...) \
-  MOCK_CONST_METHOD7_WITH_CALLTYPE(ct, m, __VA_ARGS__)
-#define MOCK_CONST_METHOD8_T_WITH_CALLTYPE(ct, m, ...) \
-  MOCK_CONST_METHOD8_WITH_CALLTYPE(ct, m, __VA_ARGS__)
-#define MOCK_CONST_METHOD9_T_WITH_CALLTYPE(ct, m, ...) \
-  MOCK_CONST_METHOD9_WITH_CALLTYPE(ct, m, __VA_ARGS__)
-#define MOCK_CONST_METHOD10_T_WITH_CALLTYPE(ct, m, ...) \
-  MOCK_CONST_METHOD10_WITH_CALLTYPE(ct, m, __VA_ARGS__)
-
-#define GMOCK_INTERNAL_MOCK_METHODN(constness, ct, Method, args_num, ...) \
-  GMOCK_INTERNAL_ASSERT_VALID_SIGNATURE(                                  \
-      args_num, ::testing::internal::identity_t<__VA_ARGS__>);            \
-  GMOCK_INTERNAL_MOCK_METHOD_IMPL(                                        \
-      args_num, Method, GMOCK_PP_NARG0(constness), 0, 0, , ct, ,          \
-      (::testing::internal::identity_t<__VA_ARGS__>))
-
-#define GMOCK_MOCKER_(arity, constness, Method) \
-  GTEST_CONCAT_TOKEN_(gmock##constness##arity##_##Method##_, __LINE__)
-
-#endif  // GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_FUNCTION_MOCKER_H_
+// 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 MOCK_METHOD. 
+ 
+// GOOGLETEST_CM0002 DO NOT DELETE 
+ 
+#ifndef GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_FUNCTION_MOCKER_H_  // NOLINT 
+#define GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_FUNCTION_MOCKER_H_  // NOLINT 
+ 
+#include <type_traits>  // IWYU pragma: keep 
+#include <utility>      // IWYU pragma: keep 
+ 
+#include "gmock/gmock-spec-builders.h" 
+#include "gmock/internal/gmock-internal-utils.h" 
+#include "gmock/internal/gmock-pp.h" 
+ 
+namespace testing { 
+namespace internal { 
+template <typename T> 
+using identity_t = T; 
+ 
+template <typename Pattern> 
+struct ThisRefAdjuster { 
+  template <typename T> 
+  using AdjustT = typename std::conditional< 
+      std::is_const<typename std::remove_reference<Pattern>::type>::value, 
+      typename std::conditional<std::is_lvalue_reference<Pattern>::value, 
+                                const T&, const T&&>::type, 
+      typename std::conditional<std::is_lvalue_reference<Pattern>::value, T&, 
+                                T&&>::type>::type; 
+ 
+  template <typename MockType> 
+  static AdjustT<MockType> Adjust(const MockType& mock) { 
+    return static_cast<AdjustT<MockType>>(const_cast<MockType&>(mock)); 
+  } 
+}; 
+ 
+}  // namespace internal 
+ 
+// The style guide prohibits "using" statements in a namespace scope 
+// inside a header file.  However, the FunctionMocker 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 FunctionMocker in ::testing. 
+using internal::FunctionMocker; 
+}  // namespace testing 
+ 
+#define MOCK_METHOD(...) \ 
+  GMOCK_PP_VARIADIC_CALL(GMOCK_INTERNAL_MOCK_METHOD_ARG_, __VA_ARGS__) 
+ 
+#define GMOCK_INTERNAL_MOCK_METHOD_ARG_1(...) \ 
+  GMOCK_INTERNAL_WRONG_ARITY(__VA_ARGS__) 
+ 
+#define GMOCK_INTERNAL_MOCK_METHOD_ARG_2(...) \ 
+  GMOCK_INTERNAL_WRONG_ARITY(__VA_ARGS__) 
+ 
+#define GMOCK_INTERNAL_MOCK_METHOD_ARG_3(_Ret, _MethodName, _Args) \ 
+  GMOCK_INTERNAL_MOCK_METHOD_ARG_4(_Ret, _MethodName, _Args, ()) 
+ 
+#define GMOCK_INTERNAL_MOCK_METHOD_ARG_4(_Ret, _MethodName, _Args, _Spec)     \ 
+  GMOCK_INTERNAL_ASSERT_PARENTHESIS(_Args);                                   \ 
+  GMOCK_INTERNAL_ASSERT_PARENTHESIS(_Spec);                                   \ 
+  GMOCK_INTERNAL_ASSERT_VALID_SIGNATURE(                                      \ 
+      GMOCK_PP_NARG0 _Args, GMOCK_INTERNAL_SIGNATURE(_Ret, _Args));           \ 
+  GMOCK_INTERNAL_ASSERT_VALID_SPEC(_Spec)                                     \ 
+  GMOCK_INTERNAL_MOCK_METHOD_IMPL(                                            \ 
+      GMOCK_PP_NARG0 _Args, _MethodName, GMOCK_INTERNAL_HAS_CONST(_Spec),     \ 
+      GMOCK_INTERNAL_HAS_OVERRIDE(_Spec), GMOCK_INTERNAL_HAS_FINAL(_Spec),    \ 
+      GMOCK_INTERNAL_GET_NOEXCEPT_SPEC(_Spec),                                \ 
+      GMOCK_INTERNAL_GET_CALLTYPE(_Spec), GMOCK_INTERNAL_GET_REF_SPEC(_Spec), \ 
+      (GMOCK_INTERNAL_SIGNATURE(_Ret, _Args))) 
+ 
+#define GMOCK_INTERNAL_MOCK_METHOD_ARG_5(...) \ 
+  GMOCK_INTERNAL_WRONG_ARITY(__VA_ARGS__) 
+ 
+#define GMOCK_INTERNAL_MOCK_METHOD_ARG_6(...) \ 
+  GMOCK_INTERNAL_WRONG_ARITY(__VA_ARGS__) 
+ 
+#define GMOCK_INTERNAL_MOCK_METHOD_ARG_7(...) \ 
+  GMOCK_INTERNAL_WRONG_ARITY(__VA_ARGS__) 
+ 
+#define GMOCK_INTERNAL_WRONG_ARITY(...)                                      \ 
+  static_assert(                                                             \ 
+      false,                                                                 \ 
+      "MOCK_METHOD must be called with 3 or 4 arguments. _Ret, "             \ 
+      "_MethodName, _Args and optionally _Spec. _Args and _Spec must be "    \ 
+      "enclosed in parentheses. If _Ret is a type with unprotected commas, " \ 
+      "it must also be enclosed in parentheses.") 
+ 
+#define GMOCK_INTERNAL_ASSERT_PARENTHESIS(_Tuple) \ 
+  static_assert(                                  \ 
+      GMOCK_PP_IS_ENCLOSED_PARENS(_Tuple),        \ 
+      GMOCK_PP_STRINGIZE(_Tuple) " should be enclosed in parentheses.") 
+ 
+#define GMOCK_INTERNAL_ASSERT_VALID_SIGNATURE(_N, ...)                 \ 
+  static_assert(                                                       \ 
+      std::is_function<__VA_ARGS__>::value,                            \ 
+      "Signature must be a function type, maybe return type contains " \ 
+      "unprotected comma.");                                           \ 
+  static_assert(                                                       \ 
+      ::testing::tuple_size<typename ::testing::internal::Function<    \ 
+              __VA_ARGS__>::ArgumentTuple>::value == _N,               \ 
+      "This method does not take " GMOCK_PP_STRINGIZE(                 \ 
+          _N) " arguments. Parenthesize all types with unprotected commas.") 
+ 
+#define GMOCK_INTERNAL_ASSERT_VALID_SPEC(_Spec) \ 
+  GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_ASSERT_VALID_SPEC_ELEMENT, ~, _Spec) 
+ 
+#define GMOCK_INTERNAL_MOCK_METHOD_IMPL(_N, _MethodName, _Constness,           \ 
+                                        _Override, _Final, _NoexceptSpec,      \ 
+                                        _CallType, _RefSpec, _Signature)       \ 
+  typename ::testing::internal::Function<GMOCK_PP_REMOVE_PARENS(               \ 
+      _Signature)>::Result                                                     \ 
+  GMOCK_INTERNAL_EXPAND(_CallType)                                             \ 
+      _MethodName(GMOCK_PP_REPEAT(GMOCK_INTERNAL_PARAMETER, _Signature, _N))   \ 
+          GMOCK_PP_IF(_Constness, const, ) _RefSpec _NoexceptSpec              \ 
+          GMOCK_PP_IF(_Override, override, ) GMOCK_PP_IF(_Final, final, ) {    \ 
+    GMOCK_MOCKER_(_N, _Constness, _MethodName)                                 \ 
+        .SetOwnerAndName(this, #_MethodName);                                  \ 
+    return GMOCK_MOCKER_(_N, _Constness, _MethodName)                          \ 
+        .Invoke(GMOCK_PP_REPEAT(GMOCK_INTERNAL_FORWARD_ARG, _Signature, _N));  \ 
+  }                                                                            \ 
+  ::testing::MockSpec<GMOCK_PP_REMOVE_PARENS(_Signature)> gmock_##_MethodName( \ 
+      GMOCK_PP_REPEAT(GMOCK_INTERNAL_MATCHER_PARAMETER, _Signature, _N))       \ 
+      GMOCK_PP_IF(_Constness, const, ) _RefSpec {                              \ 
+    GMOCK_MOCKER_(_N, _Constness, _MethodName).RegisterOwner(this);            \ 
+    return GMOCK_MOCKER_(_N, _Constness, _MethodName)                          \ 
+        .With(GMOCK_PP_REPEAT(GMOCK_INTERNAL_MATCHER_ARGUMENT, , _N));         \ 
+  }                                                                            \ 
+  ::testing::MockSpec<GMOCK_PP_REMOVE_PARENS(_Signature)> gmock_##_MethodName( \ 
+      const ::testing::internal::WithoutMatchers&,                             \ 
+      GMOCK_PP_IF(_Constness, const, )::testing::internal::Function<           \ 
+          GMOCK_PP_REMOVE_PARENS(_Signature)>*) const _RefSpec _NoexceptSpec { \ 
+    return ::testing::internal::ThisRefAdjuster<GMOCK_PP_IF(                   \ 
+        _Constness, const, ) int _RefSpec>::Adjust(*this)                      \ 
+        .gmock_##_MethodName(GMOCK_PP_REPEAT(                                  \ 
+            GMOCK_INTERNAL_A_MATCHER_ARGUMENT, _Signature, _N));               \ 
+  }                                                                            \ 
+  mutable ::testing::FunctionMocker<GMOCK_PP_REMOVE_PARENS(_Signature)>        \ 
+      GMOCK_MOCKER_(_N, _Constness, _MethodName) 
+ 
+#define GMOCK_INTERNAL_EXPAND(...) __VA_ARGS__ 
+ 
+// Five Valid modifiers. 
+#define GMOCK_INTERNAL_HAS_CONST(_Tuple) \ 
+  GMOCK_PP_HAS_COMMA(GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_DETECT_CONST, ~, _Tuple)) 
+ 
+#define GMOCK_INTERNAL_HAS_OVERRIDE(_Tuple) \ 
+  GMOCK_PP_HAS_COMMA(                       \ 
+      GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_DETECT_OVERRIDE, ~, _Tuple)) 
+ 
+#define GMOCK_INTERNAL_HAS_FINAL(_Tuple) \ 
+  GMOCK_PP_HAS_COMMA(GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_DETECT_FINAL, ~, _Tuple)) 
+ 
+#define GMOCK_INTERNAL_GET_NOEXCEPT_SPEC(_Tuple) \ 
+  GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_NOEXCEPT_SPEC_IF_NOEXCEPT, ~, _Tuple) 
+ 
+#define GMOCK_INTERNAL_NOEXCEPT_SPEC_IF_NOEXCEPT(_i, _, _elem)          \ 
+  GMOCK_PP_IF(                                                          \ 
+      GMOCK_PP_HAS_COMMA(GMOCK_INTERNAL_DETECT_NOEXCEPT(_i, _, _elem)), \ 
+      _elem, ) 
+ 
+#define GMOCK_INTERNAL_GET_REF_SPEC(_Tuple) \ 
+  GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_REF_SPEC_IF_REF, ~, _Tuple) 
+ 
+#define GMOCK_INTERNAL_REF_SPEC_IF_REF(_i, _, _elem)                       \ 
+  GMOCK_PP_IF(GMOCK_PP_HAS_COMMA(GMOCK_INTERNAL_DETECT_REF(_i, _, _elem)), \ 
+              GMOCK_PP_CAT(GMOCK_INTERNAL_UNPACK_, _elem), ) 
+ 
+#define GMOCK_INTERNAL_GET_CALLTYPE(_Tuple) \ 
+  GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_GET_CALLTYPE_IMPL, ~, _Tuple) 
+ 
+#define GMOCK_INTERNAL_ASSERT_VALID_SPEC_ELEMENT(_i, _, _elem)            \ 
+  static_assert(                                                          \ 
+      (GMOCK_PP_HAS_COMMA(GMOCK_INTERNAL_DETECT_CONST(_i, _, _elem)) +    \ 
+       GMOCK_PP_HAS_COMMA(GMOCK_INTERNAL_DETECT_OVERRIDE(_i, _, _elem)) + \ 
+       GMOCK_PP_HAS_COMMA(GMOCK_INTERNAL_DETECT_FINAL(_i, _, _elem)) +    \ 
+       GMOCK_PP_HAS_COMMA(GMOCK_INTERNAL_DETECT_NOEXCEPT(_i, _, _elem)) + \ 
+       GMOCK_PP_HAS_COMMA(GMOCK_INTERNAL_DETECT_REF(_i, _, _elem)) +      \ 
+       GMOCK_INTERNAL_IS_CALLTYPE(_elem)) == 1,                           \ 
+      GMOCK_PP_STRINGIZE(                                                 \ 
+          _elem) " cannot be recognized as a valid specification modifier."); 
+ 
+// Modifiers implementation. 
+#define GMOCK_INTERNAL_DETECT_CONST(_i, _, _elem) \ 
+  GMOCK_PP_CAT(GMOCK_INTERNAL_DETECT_CONST_I_, _elem) 
+ 
+#define GMOCK_INTERNAL_DETECT_CONST_I_const , 
+ 
+#define GMOCK_INTERNAL_DETECT_OVERRIDE(_i, _, _elem) \ 
+  GMOCK_PP_CAT(GMOCK_INTERNAL_DETECT_OVERRIDE_I_, _elem) 
+ 
+#define GMOCK_INTERNAL_DETECT_OVERRIDE_I_override , 
+ 
+#define GMOCK_INTERNAL_DETECT_FINAL(_i, _, _elem) \ 
+  GMOCK_PP_CAT(GMOCK_INTERNAL_DETECT_FINAL_I_, _elem) 
+ 
+#define GMOCK_INTERNAL_DETECT_FINAL_I_final , 
+ 
+#define GMOCK_INTERNAL_DETECT_NOEXCEPT(_i, _, _elem) \ 
+  GMOCK_PP_CAT(GMOCK_INTERNAL_DETECT_NOEXCEPT_I_, _elem) 
+ 
+#define GMOCK_INTERNAL_DETECT_NOEXCEPT_I_noexcept , 
+ 
+#define GMOCK_INTERNAL_DETECT_REF(_i, _, _elem) \ 
+  GMOCK_PP_CAT(GMOCK_INTERNAL_DETECT_REF_I_, _elem) 
+ 
+#define GMOCK_INTERNAL_DETECT_REF_I_ref , 
+ 
+#define GMOCK_INTERNAL_UNPACK_ref(x) x 
+ 
+#define GMOCK_INTERNAL_GET_CALLTYPE_IMPL(_i, _, _elem)           \ 
+  GMOCK_PP_IF(GMOCK_INTERNAL_IS_CALLTYPE(_elem),                 \ 
+              GMOCK_INTERNAL_GET_VALUE_CALLTYPE, GMOCK_PP_EMPTY) \ 
+  (_elem) 
+ 
+// TODO(iserna): GMOCK_INTERNAL_IS_CALLTYPE and 
+// GMOCK_INTERNAL_GET_VALUE_CALLTYPE needed more expansions to work on windows 
+// maybe they can be simplified somehow. 
+#define GMOCK_INTERNAL_IS_CALLTYPE(_arg) \ 
+  GMOCK_INTERNAL_IS_CALLTYPE_I(          \ 
+      GMOCK_PP_CAT(GMOCK_INTERNAL_IS_CALLTYPE_HELPER_, _arg)) 
+#define GMOCK_INTERNAL_IS_CALLTYPE_I(_arg) GMOCK_PP_IS_ENCLOSED_PARENS(_arg) 
+ 
+#define GMOCK_INTERNAL_GET_VALUE_CALLTYPE(_arg) \ 
+  GMOCK_INTERNAL_GET_VALUE_CALLTYPE_I(          \ 
+      GMOCK_PP_CAT(GMOCK_INTERNAL_IS_CALLTYPE_HELPER_, _arg)) 
+#define GMOCK_INTERNAL_GET_VALUE_CALLTYPE_I(_arg) \ 
+  GMOCK_PP_IDENTITY _arg 
+ 
+#define GMOCK_INTERNAL_IS_CALLTYPE_HELPER_Calltype 
+ 
+// Note: The use of `identity_t` here allows _Ret to represent return types that 
+// would normally need to be specified in a different way. For example, a method 
+// returning a function pointer must be written as 
+// 
+// fn_ptr_return_t (*method(method_args_t...))(fn_ptr_args_t...) 
+// 
+// But we only support placing the return type at the beginning. To handle this, 
+// we wrap all calls in identity_t, so that a declaration will be expanded to 
+// 
+// identity_t<fn_ptr_return_t (*)(fn_ptr_args_t...)> method(method_args_t...) 
+// 
+// This allows us to work around the syntactic oddities of function/method 
+// types. 
+#define GMOCK_INTERNAL_SIGNATURE(_Ret, _Args)                                 \ 
+  ::testing::internal::identity_t<GMOCK_PP_IF(GMOCK_PP_IS_BEGIN_PARENS(_Ret), \ 
+                                              GMOCK_PP_REMOVE_PARENS,         \ 
+                                              GMOCK_PP_IDENTITY)(_Ret)>(      \ 
+      GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_GET_TYPE, _, _Args)) 
+ 
+#define GMOCK_INTERNAL_GET_TYPE(_i, _, _elem)                          \ 
+  GMOCK_PP_COMMA_IF(_i)                                                \ 
+  GMOCK_PP_IF(GMOCK_PP_IS_BEGIN_PARENS(_elem), GMOCK_PP_REMOVE_PARENS, \ 
+              GMOCK_PP_IDENTITY)                                       \ 
+  (_elem) 
+ 
+#define GMOCK_INTERNAL_PARAMETER(_i, _Signature, _)            \ 
+  GMOCK_PP_COMMA_IF(_i)                                        \ 
+  GMOCK_INTERNAL_ARG_O(_i, GMOCK_PP_REMOVE_PARENS(_Signature)) \ 
+  gmock_a##_i 
+ 
+#define GMOCK_INTERNAL_FORWARD_ARG(_i, _Signature, _) \ 
+  GMOCK_PP_COMMA_IF(_i)                               \ 
+  ::std::forward<GMOCK_INTERNAL_ARG_O(                \ 
+      _i, GMOCK_PP_REMOVE_PARENS(_Signature))>(gmock_a##_i) 
+ 
+#define GMOCK_INTERNAL_MATCHER_PARAMETER(_i, _Signature, _)        \ 
+  GMOCK_PP_COMMA_IF(_i)                                            \ 
+  GMOCK_INTERNAL_MATCHER_O(_i, GMOCK_PP_REMOVE_PARENS(_Signature)) \ 
+  gmock_a##_i 
+ 
+#define GMOCK_INTERNAL_MATCHER_ARGUMENT(_i, _1, _2) \ 
+  GMOCK_PP_COMMA_IF(_i)                             \ 
+  gmock_a##_i 
+ 
+#define GMOCK_INTERNAL_A_MATCHER_ARGUMENT(_i, _Signature, _) \ 
+  GMOCK_PP_COMMA_IF(_i)                                      \ 
+  ::testing::A<GMOCK_INTERNAL_ARG_O(_i, GMOCK_PP_REMOVE_PARENS(_Signature))>() 
+ 
+#define GMOCK_INTERNAL_ARG_O(_i, ...) \ 
+  typename ::testing::internal::Function<__VA_ARGS__>::template Arg<_i>::type 
+ 
+#define GMOCK_INTERNAL_MATCHER_O(_i, ...)                          \ 
+  const ::testing::Matcher<typename ::testing::internal::Function< \ 
+      __VA_ARGS__>::template Arg<_i>::type>& 
+ 
+#define MOCK_METHOD0(m, ...) GMOCK_INTERNAL_MOCK_METHODN(, , m, 0, __VA_ARGS__) 
+#define MOCK_METHOD1(m, ...) GMOCK_INTERNAL_MOCK_METHODN(, , m, 1, __VA_ARGS__) 
+#define MOCK_METHOD2(m, ...) GMOCK_INTERNAL_MOCK_METHODN(, , m, 2, __VA_ARGS__) 
+#define MOCK_METHOD3(m, ...) GMOCK_INTERNAL_MOCK_METHODN(, , m, 3, __VA_ARGS__) 
+#define MOCK_METHOD4(m, ...) GMOCK_INTERNAL_MOCK_METHODN(, , m, 4, __VA_ARGS__) 
+#define MOCK_METHOD5(m, ...) GMOCK_INTERNAL_MOCK_METHODN(, , m, 5, __VA_ARGS__) 
+#define MOCK_METHOD6(m, ...) GMOCK_INTERNAL_MOCK_METHODN(, , m, 6, __VA_ARGS__) 
+#define MOCK_METHOD7(m, ...) GMOCK_INTERNAL_MOCK_METHODN(, , m, 7, __VA_ARGS__) 
+#define MOCK_METHOD8(m, ...) GMOCK_INTERNAL_MOCK_METHODN(, , m, 8, __VA_ARGS__) 
+#define MOCK_METHOD9(m, ...) GMOCK_INTERNAL_MOCK_METHODN(, , m, 9, __VA_ARGS__) 
+#define MOCK_METHOD10(m, ...) \ 
+  GMOCK_INTERNAL_MOCK_METHODN(, , m, 10, __VA_ARGS__) 
+ 
+#define MOCK_CONST_METHOD0(m, ...) \ 
+  GMOCK_INTERNAL_MOCK_METHODN(const, , m, 0, __VA_ARGS__) 
+#define MOCK_CONST_METHOD1(m, ...) \ 
+  GMOCK_INTERNAL_MOCK_METHODN(const, , m, 1, __VA_ARGS__) 
+#define MOCK_CONST_METHOD2(m, ...) \ 
+  GMOCK_INTERNAL_MOCK_METHODN(const, , m, 2, __VA_ARGS__) 
+#define MOCK_CONST_METHOD3(m, ...) \ 
+  GMOCK_INTERNAL_MOCK_METHODN(const, , m, 3, __VA_ARGS__) 
+#define MOCK_CONST_METHOD4(m, ...) \ 
+  GMOCK_INTERNAL_MOCK_METHODN(const, , m, 4, __VA_ARGS__) 
+#define MOCK_CONST_METHOD5(m, ...) \ 
+  GMOCK_INTERNAL_MOCK_METHODN(const, , m, 5, __VA_ARGS__) 
+#define MOCK_CONST_METHOD6(m, ...) \ 
+  GMOCK_INTERNAL_MOCK_METHODN(const, , m, 6, __VA_ARGS__) 
+#define MOCK_CONST_METHOD7(m, ...) \ 
+  GMOCK_INTERNAL_MOCK_METHODN(const, , m, 7, __VA_ARGS__) 
+#define MOCK_CONST_METHOD8(m, ...) \ 
+  GMOCK_INTERNAL_MOCK_METHODN(const, , m, 8, __VA_ARGS__) 
+#define MOCK_CONST_METHOD9(m, ...) \ 
+  GMOCK_INTERNAL_MOCK_METHODN(const, , m, 9, __VA_ARGS__) 
+#define MOCK_CONST_METHOD10(m, ...) \ 
+  GMOCK_INTERNAL_MOCK_METHODN(const, , m, 10, __VA_ARGS__) 
+ 
+#define MOCK_METHOD0_T(m, ...) MOCK_METHOD0(m, __VA_ARGS__) 
+#define MOCK_METHOD1_T(m, ...) MOCK_METHOD1(m, __VA_ARGS__) 
+#define MOCK_METHOD2_T(m, ...) MOCK_METHOD2(m, __VA_ARGS__) 
+#define MOCK_METHOD3_T(m, ...) MOCK_METHOD3(m, __VA_ARGS__) 
+#define MOCK_METHOD4_T(m, ...) MOCK_METHOD4(m, __VA_ARGS__) 
+#define MOCK_METHOD5_T(m, ...) MOCK_METHOD5(m, __VA_ARGS__) 
+#define MOCK_METHOD6_T(m, ...) MOCK_METHOD6(m, __VA_ARGS__) 
+#define MOCK_METHOD7_T(m, ...) MOCK_METHOD7(m, __VA_ARGS__) 
+#define MOCK_METHOD8_T(m, ...) MOCK_METHOD8(m, __VA_ARGS__) 
+#define MOCK_METHOD9_T(m, ...) MOCK_METHOD9(m, __VA_ARGS__) 
+#define MOCK_METHOD10_T(m, ...) MOCK_METHOD10(m, __VA_ARGS__) 
+ 
+#define MOCK_CONST_METHOD0_T(m, ...) MOCK_CONST_METHOD0(m, __VA_ARGS__) 
+#define MOCK_CONST_METHOD1_T(m, ...) MOCK_CONST_METHOD1(m, __VA_ARGS__) 
+#define MOCK_CONST_METHOD2_T(m, ...) MOCK_CONST_METHOD2(m, __VA_ARGS__) 
+#define MOCK_CONST_METHOD3_T(m, ...) MOCK_CONST_METHOD3(m, __VA_ARGS__) 
+#define MOCK_CONST_METHOD4_T(m, ...) MOCK_CONST_METHOD4(m, __VA_ARGS__) 
+#define MOCK_CONST_METHOD5_T(m, ...) MOCK_CONST_METHOD5(m, __VA_ARGS__) 
+#define MOCK_CONST_METHOD6_T(m, ...) MOCK_CONST_METHOD6(m, __VA_ARGS__) 
+#define MOCK_CONST_METHOD7_T(m, ...) MOCK_CONST_METHOD7(m, __VA_ARGS__) 
+#define MOCK_CONST_METHOD8_T(m, ...) MOCK_CONST_METHOD8(m, __VA_ARGS__) 
+#define MOCK_CONST_METHOD9_T(m, ...) MOCK_CONST_METHOD9(m, __VA_ARGS__) 
+#define MOCK_CONST_METHOD10_T(m, ...) MOCK_CONST_METHOD10(m, __VA_ARGS__) 
+ 
+#define MOCK_METHOD0_WITH_CALLTYPE(ct, m, ...) \ 
+  GMOCK_INTERNAL_MOCK_METHODN(, ct, m, 0, __VA_ARGS__) 
+#define MOCK_METHOD1_WITH_CALLTYPE(ct, m, ...) \ 
+  GMOCK_INTERNAL_MOCK_METHODN(, ct, m, 1, __VA_ARGS__) 
+#define MOCK_METHOD2_WITH_CALLTYPE(ct, m, ...) \ 
+  GMOCK_INTERNAL_MOCK_METHODN(, ct, m, 2, __VA_ARGS__) 
+#define MOCK_METHOD3_WITH_CALLTYPE(ct, m, ...) \ 
+  GMOCK_INTERNAL_MOCK_METHODN(, ct, m, 3, __VA_ARGS__) 
+#define MOCK_METHOD4_WITH_CALLTYPE(ct, m, ...) \ 
+  GMOCK_INTERNAL_MOCK_METHODN(, ct, m, 4, __VA_ARGS__) 
+#define MOCK_METHOD5_WITH_CALLTYPE(ct, m, ...) \ 
+  GMOCK_INTERNAL_MOCK_METHODN(, ct, m, 5, __VA_ARGS__) 
+#define MOCK_METHOD6_WITH_CALLTYPE(ct, m, ...) \ 
+  GMOCK_INTERNAL_MOCK_METHODN(, ct, m, 6, __VA_ARGS__) 
+#define MOCK_METHOD7_WITH_CALLTYPE(ct, m, ...) \ 
+  GMOCK_INTERNAL_MOCK_METHODN(, ct, m, 7, __VA_ARGS__) 
+#define MOCK_METHOD8_WITH_CALLTYPE(ct, m, ...) \ 
+  GMOCK_INTERNAL_MOCK_METHODN(, ct, m, 8, __VA_ARGS__) 
+#define MOCK_METHOD9_WITH_CALLTYPE(ct, m, ...) \ 
+  GMOCK_INTERNAL_MOCK_METHODN(, ct, m, 9, __VA_ARGS__) 
+#define MOCK_METHOD10_WITH_CALLTYPE(ct, m, ...) \ 
+  GMOCK_INTERNAL_MOCK_METHODN(, ct, m, 10, __VA_ARGS__) 
+ 
+#define MOCK_CONST_METHOD0_WITH_CALLTYPE(ct, m, ...) \ 
+  GMOCK_INTERNAL_MOCK_METHODN(const, ct, m, 0, __VA_ARGS__) 
+#define MOCK_CONST_METHOD1_WITH_CALLTYPE(ct, m, ...) \ 
+  GMOCK_INTERNAL_MOCK_METHODN(const, ct, m, 1, __VA_ARGS__) 
+#define MOCK_CONST_METHOD2_WITH_CALLTYPE(ct, m, ...) \ 
+  GMOCK_INTERNAL_MOCK_METHODN(const, ct, m, 2, __VA_ARGS__) 
+#define MOCK_CONST_METHOD3_WITH_CALLTYPE(ct, m, ...) \ 
+  GMOCK_INTERNAL_MOCK_METHODN(const, ct, m, 3, __VA_ARGS__) 
+#define MOCK_CONST_METHOD4_WITH_CALLTYPE(ct, m, ...) \ 
+  GMOCK_INTERNAL_MOCK_METHODN(const, ct, m, 4, __VA_ARGS__) 
+#define MOCK_CONST_METHOD5_WITH_CALLTYPE(ct, m, ...) \ 
+  GMOCK_INTERNAL_MOCK_METHODN(const, ct, m, 5, __VA_ARGS__) 
+#define MOCK_CONST_METHOD6_WITH_CALLTYPE(ct, m, ...) \ 
+  GMOCK_INTERNAL_MOCK_METHODN(const, ct, m, 6, __VA_ARGS__) 
+#define MOCK_CONST_METHOD7_WITH_CALLTYPE(ct, m, ...) \ 
+  GMOCK_INTERNAL_MOCK_METHODN(const, ct, m, 7, __VA_ARGS__) 
+#define MOCK_CONST_METHOD8_WITH_CALLTYPE(ct, m, ...) \ 
+  GMOCK_INTERNAL_MOCK_METHODN(const, ct, m, 8, __VA_ARGS__) 
+#define MOCK_CONST_METHOD9_WITH_CALLTYPE(ct, m, ...) \ 
+  GMOCK_INTERNAL_MOCK_METHODN(const, ct, m, 9, __VA_ARGS__) 
+#define MOCK_CONST_METHOD10_WITH_CALLTYPE(ct, m, ...) \ 
+  GMOCK_INTERNAL_MOCK_METHODN(const, ct, m, 10, __VA_ARGS__) 
+ 
+#define MOCK_METHOD0_T_WITH_CALLTYPE(ct, m, ...) \ 
+  MOCK_METHOD0_WITH_CALLTYPE(ct, m, __VA_ARGS__) 
+#define MOCK_METHOD1_T_WITH_CALLTYPE(ct, m, ...) \ 
+  MOCK_METHOD1_WITH_CALLTYPE(ct, m, __VA_ARGS__) 
+#define MOCK_METHOD2_T_WITH_CALLTYPE(ct, m, ...) \ 
+  MOCK_METHOD2_WITH_CALLTYPE(ct, m, __VA_ARGS__) 
+#define MOCK_METHOD3_T_WITH_CALLTYPE(ct, m, ...) \ 
+  MOCK_METHOD3_WITH_CALLTYPE(ct, m, __VA_ARGS__) 
+#define MOCK_METHOD4_T_WITH_CALLTYPE(ct, m, ...) \ 
+  MOCK_METHOD4_WITH_CALLTYPE(ct, m, __VA_ARGS__) 
+#define MOCK_METHOD5_T_WITH_CALLTYPE(ct, m, ...) \ 
+  MOCK_METHOD5_WITH_CALLTYPE(ct, m, __VA_ARGS__) 
+#define MOCK_METHOD6_T_WITH_CALLTYPE(ct, m, ...) \ 
+  MOCK_METHOD6_WITH_CALLTYPE(ct, m, __VA_ARGS__) 
+#define MOCK_METHOD7_T_WITH_CALLTYPE(ct, m, ...) \ 
+  MOCK_METHOD7_WITH_CALLTYPE(ct, m, __VA_ARGS__) 
+#define MOCK_METHOD8_T_WITH_CALLTYPE(ct, m, ...) \ 
+  MOCK_METHOD8_WITH_CALLTYPE(ct, m, __VA_ARGS__) 
+#define MOCK_METHOD9_T_WITH_CALLTYPE(ct, m, ...) \ 
+  MOCK_METHOD9_WITH_CALLTYPE(ct, m, __VA_ARGS__) 
+#define MOCK_METHOD10_T_WITH_CALLTYPE(ct, m, ...) \ 
+  MOCK_METHOD10_WITH_CALLTYPE(ct, m, __VA_ARGS__) 
+ 
+#define MOCK_CONST_METHOD0_T_WITH_CALLTYPE(ct, m, ...) \ 
+  MOCK_CONST_METHOD0_WITH_CALLTYPE(ct, m, __VA_ARGS__) 
+#define MOCK_CONST_METHOD1_T_WITH_CALLTYPE(ct, m, ...) \ 
+  MOCK_CONST_METHOD1_WITH_CALLTYPE(ct, m, __VA_ARGS__) 
+#define MOCK_CONST_METHOD2_T_WITH_CALLTYPE(ct, m, ...) \ 
+  MOCK_CONST_METHOD2_WITH_CALLTYPE(ct, m, __VA_ARGS__) 
+#define MOCK_CONST_METHOD3_T_WITH_CALLTYPE(ct, m, ...) \ 
+  MOCK_CONST_METHOD3_WITH_CALLTYPE(ct, m, __VA_ARGS__) 
+#define MOCK_CONST_METHOD4_T_WITH_CALLTYPE(ct, m, ...) \ 
+  MOCK_CONST_METHOD4_WITH_CALLTYPE(ct, m, __VA_ARGS__) 
+#define MOCK_CONST_METHOD5_T_WITH_CALLTYPE(ct, m, ...) \ 
+  MOCK_CONST_METHOD5_WITH_CALLTYPE(ct, m, __VA_ARGS__) 
+#define MOCK_CONST_METHOD6_T_WITH_CALLTYPE(ct, m, ...) \ 
+  MOCK_CONST_METHOD6_WITH_CALLTYPE(ct, m, __VA_ARGS__) 
+#define MOCK_CONST_METHOD7_T_WITH_CALLTYPE(ct, m, ...) \ 
+  MOCK_CONST_METHOD7_WITH_CALLTYPE(ct, m, __VA_ARGS__) 
+#define MOCK_CONST_METHOD8_T_WITH_CALLTYPE(ct, m, ...) \ 
+  MOCK_CONST_METHOD8_WITH_CALLTYPE(ct, m, __VA_ARGS__) 
+#define MOCK_CONST_METHOD9_T_WITH_CALLTYPE(ct, m, ...) \ 
+  MOCK_CONST_METHOD9_WITH_CALLTYPE(ct, m, __VA_ARGS__) 
+#define MOCK_CONST_METHOD10_T_WITH_CALLTYPE(ct, m, ...) \ 
+  MOCK_CONST_METHOD10_WITH_CALLTYPE(ct, m, __VA_ARGS__) 
+ 
+#define GMOCK_INTERNAL_MOCK_METHODN(constness, ct, Method, args_num, ...) \ 
+  GMOCK_INTERNAL_ASSERT_VALID_SIGNATURE(                                  \ 
+      args_num, ::testing::internal::identity_t<__VA_ARGS__>);            \ 
+  GMOCK_INTERNAL_MOCK_METHOD_IMPL(                                        \ 
+      args_num, Method, GMOCK_PP_NARG0(constness), 0, 0, , ct, ,          \ 
+      (::testing::internal::identity_t<__VA_ARGS__>)) 
+ 
+#define GMOCK_MOCKER_(arity, constness, Method) \ 
+  GTEST_CONCAT_TOKEN_(gmock##constness##arity##_##Method##_, __LINE__) 
+ 
+#endif  // GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_FUNCTION_MOCKER_H_ 
diff --git a/contrib/restricted/googletest/googlemock/include/gmock/gmock-matchers.h b/contrib/restricted/googletest/googlemock/include/gmock/gmock-matchers.h
index 86be9c176e..d386fb6f86 100644
--- a/contrib/restricted/googletest/googlemock/include/gmock/gmock-matchers.h
+++ b/contrib/restricted/googletest/googlemock/include/gmock/gmock-matchers.h
@@ -27,264 +27,264 @@
 // (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.
-//
-// Basic Usage
-// ===========
-//
-// The syntax
-//
-//   MATCHER(name, description_string) { statements; }
-//
-// defines a matcher with the given name that executes the statements,
-// which must return a bool to indicate if the match succeeds.  Inside
-// the statements, you can refer to the value being matched by 'arg',
-// and refer to its type by 'arg_type'.
-//
-// The description string documents what the matcher does, and is used
-// to generate the failure message when the match fails.  Since a
-// MATCHER() is usually defined in a header file shared by multiple
-// C++ source files, we require the description to be a C-string
-// literal to avoid possible side effects.  It can be empty, in which
-// case we'll use the sequence of words in the matcher name as the
-// description.
-//
-// For example:
-//
-//   MATCHER(IsEven, "") { return (arg % 2) == 0; }
-//
-// allows you to write
-//
-//   // Expects mock_foo.Bar(n) to be called where n is even.
-//   EXPECT_CALL(mock_foo, Bar(IsEven()));
-//
-// or,
-//
-//   // Verifies that the value of some_expression is even.
-//   EXPECT_THAT(some_expression, IsEven());
-//
-// If the above assertion fails, it will print something like:
-//
-//   Value of: some_expression
-//   Expected: is even
-//     Actual: 7
-//
-// where the description "is even" is automatically calculated from the
-// matcher name IsEven.
-//
-// Argument Type
-// =============
-//
-// Note that the type of the value being matched (arg_type) is
-// determined by the context in which you use the matcher and is
-// supplied to you by the compiler, so you don't need to worry about
-// declaring it (nor can you).  This allows the matcher to be
-// polymorphic.  For example, IsEven() can be used to match any type
-// where the value of "(arg % 2) == 0" can be implicitly converted to
-// a bool.  In the "Bar(IsEven())" example above, if method Bar()
-// takes an int, 'arg_type' will be int; if it takes an unsigned long,
-// 'arg_type' will be unsigned long; and so on.
-//
-// Parameterizing Matchers
-// =======================
-//
-// Sometimes you'll want to parameterize the matcher.  For that you
-// can use another macro:
-//
-//   MATCHER_P(name, param_name, description_string) { statements; }
-//
-// For example:
-//
-//   MATCHER_P(HasAbsoluteValue, value, "") { return abs(arg) == value; }
-//
-// will allow you to write:
-//
-//   EXPECT_THAT(Blah("a"), HasAbsoluteValue(n));
-//
-// which may lead to this message (assuming n is 10):
-//
-//   Value of: Blah("a")
-//   Expected: has absolute value 10
-//     Actual: -9
-//
-// Note that both the matcher description and its parameter are
-// printed, making the message human-friendly.
-//
-// In the matcher definition body, you can write 'foo_type' to
-// reference the type of a parameter named 'foo'.  For example, in the
-// body of MATCHER_P(HasAbsoluteValue, value) above, you can write
-// 'value_type' to refer to the type of 'value'.
-//
-// We also provide MATCHER_P2, MATCHER_P3, ..., up to MATCHER_P$n to
-// support multi-parameter matchers.
-//
-// Describing Parameterized Matchers
-// =================================
-//
-// The last argument to MATCHER*() is a string-typed expression.  The
-// expression can reference all of the matcher's parameters and a
-// special bool-typed variable named 'negation'.  When 'negation' is
-// false, the expression should evaluate to the matcher's description;
-// otherwise it should evaluate to the description of the negation of
-// the matcher.  For example,
-//
-//   using testing::PrintToString;
-//
-//   MATCHER_P2(InClosedRange, low, hi,
-//       std::string(negation ? "is not" : "is") + " in range [" +
-//       PrintToString(low) + ", " + PrintToString(hi) + "]") {
-//     return low <= arg && arg <= hi;
-//   }
-//   ...
-//   EXPECT_THAT(3, InClosedRange(4, 6));
-//   EXPECT_THAT(3, Not(InClosedRange(2, 4)));
-//
-// would generate two failures that contain the text:
-//
-//   Expected: is in range [4, 6]
-//   ...
-//   Expected: is not in range [2, 4]
-//
-// If you specify "" as the description, the failure message will
-// contain the sequence of words in the matcher name followed by the
-// parameter values printed as a tuple.  For example,
-//
-//   MATCHER_P2(InClosedRange, low, hi, "") { ... }
-//   ...
-//   EXPECT_THAT(3, InClosedRange(4, 6));
-//   EXPECT_THAT(3, Not(InClosedRange(2, 4)));
-//
-// would generate two failures that contain the text:
-//
-//   Expected: in closed range (4, 6)
-//   ...
-//   Expected: not (in closed range (2, 4))
-//
-// Types of Matcher Parameters
-// ===========================
-//
-// For the purpose of typing, you can view
-//
-//   MATCHER_Pk(Foo, p1, ..., pk, description_string) { ... }
-//
-// as shorthand for
-//
-//   template <typename p1_type, ..., typename pk_type>
-//   FooMatcherPk<p1_type, ..., pk_type>
-//   Foo(p1_type p1, ..., pk_type pk) { ... }
-//
-// When you write Foo(v1, ..., vk), the compiler infers the types of
-// the parameters v1, ..., and vk for you.  If you are not happy with
-// the result of the type inference, you can specify the types by
-// explicitly instantiating the template, as in Foo<long, bool>(5,
-// false).  As said earlier, you don't get to (or need to) specify
-// 'arg_type' as that's determined by the context in which the matcher
-// is used.  You can assign the result of expression Foo(p1, ..., pk)
-// to a variable of type FooMatcherPk<p1_type, ..., pk_type>.  This
-// can be useful when composing matchers.
-//
-// While you can instantiate a matcher template with reference types,
-// passing the parameters by pointer usually makes your code more
-// readable.  If, however, you still want to pass a parameter by
-// reference, be aware that in the failure message generated by the
-// matcher you will see the value of the referenced object but not its
-// address.
-//
-// Explaining Match Results
-// ========================
-//
-// Sometimes the matcher description alone isn't enough to explain why
-// the match has failed or succeeded.  For example, when expecting a
-// long string, it can be very helpful to also print the diff between
-// the expected string and the actual one.  To achieve that, you can
-// optionally stream additional information to a special variable
-// named result_listener, whose type is a pointer to class
-// MatchResultListener:
-//
-//   MATCHER_P(EqualsLongString, str, "") {
-//     if (arg == str) return true;
-//
-//     *result_listener << "the difference: "
-///                     << DiffStrings(str, arg);
-//     return false;
-//   }
-//
-// Overloading Matchers
-// ====================
-//
-// You can overload matchers with different numbers of parameters:
-//
-//   MATCHER_P(Blah, a, description_string1) { ... }
-//   MATCHER_P2(Blah, a, b, description_string2) { ... }
-//
-// Caveats
-// =======
-//
-// When defining a new matcher, you should also consider implementing
-// MatcherInterface or using MakePolymorphicMatcher().  These
-// approaches require more work than the MATCHER* macros, but also
-// give you more control on the types of the value being matched and
-// the matcher parameters, which may leads to better compiler error
-// messages when the matcher is used wrong.  They also allow
-// overloading matchers based on parameter types (as opposed to just
-// based on the number of parameters).
-//
-// MATCHER*() can only be used in a namespace scope as templates cannot be
-// declared inside of a local class.
-//
-// More Information
-// ================
-//
-// To learn more about using these macros, please search for 'MATCHER'
-// on
-// https://github.com/google/googletest/blob/master/docs/gmock_cook_book.md
-//
-// This file also implements some commonly used argument matchers.  More
+// The MATCHER* family of macros can be used in a namespace scope to 
+// define custom matchers easily. 
+// 
+// Basic Usage 
+// =========== 
+// 
+// The syntax 
+// 
+//   MATCHER(name, description_string) { statements; } 
+// 
+// defines a matcher with the given name that executes the statements, 
+// which must return a bool to indicate if the match succeeds.  Inside 
+// the statements, you can refer to the value being matched by 'arg', 
+// and refer to its type by 'arg_type'. 
+// 
+// The description string documents what the matcher does, and is used 
+// to generate the failure message when the match fails.  Since a 
+// MATCHER() is usually defined in a header file shared by multiple 
+// C++ source files, we require the description to be a C-string 
+// literal to avoid possible side effects.  It can be empty, in which 
+// case we'll use the sequence of words in the matcher name as the 
+// description. 
+// 
+// For example: 
+// 
+//   MATCHER(IsEven, "") { return (arg % 2) == 0; } 
+// 
+// allows you to write 
+// 
+//   // Expects mock_foo.Bar(n) to be called where n is even. 
+//   EXPECT_CALL(mock_foo, Bar(IsEven())); 
+// 
+// or, 
+// 
+//   // Verifies that the value of some_expression is even. 
+//   EXPECT_THAT(some_expression, IsEven()); 
+// 
+// If the above assertion fails, it will print something like: 
+// 
+//   Value of: some_expression 
+//   Expected: is even 
+//     Actual: 7 
+// 
+// where the description "is even" is automatically calculated from the 
+// matcher name IsEven. 
+// 
+// Argument Type 
+// ============= 
+// 
+// Note that the type of the value being matched (arg_type) is 
+// determined by the context in which you use the matcher and is 
+// supplied to you by the compiler, so you don't need to worry about 
+// declaring it (nor can you).  This allows the matcher to be 
+// polymorphic.  For example, IsEven() can be used to match any type 
+// where the value of "(arg % 2) == 0" can be implicitly converted to 
+// a bool.  In the "Bar(IsEven())" example above, if method Bar() 
+// takes an int, 'arg_type' will be int; if it takes an unsigned long, 
+// 'arg_type' will be unsigned long; and so on. 
+// 
+// Parameterizing Matchers 
+// ======================= 
+// 
+// Sometimes you'll want to parameterize the matcher.  For that you 
+// can use another macro: 
+// 
+//   MATCHER_P(name, param_name, description_string) { statements; } 
+// 
+// For example: 
+// 
+//   MATCHER_P(HasAbsoluteValue, value, "") { return abs(arg) == value; } 
+// 
+// will allow you to write: 
+// 
+//   EXPECT_THAT(Blah("a"), HasAbsoluteValue(n)); 
+// 
+// which may lead to this message (assuming n is 10): 
+// 
+//   Value of: Blah("a") 
+//   Expected: has absolute value 10 
+//     Actual: -9 
+// 
+// Note that both the matcher description and its parameter are 
+// printed, making the message human-friendly. 
+// 
+// In the matcher definition body, you can write 'foo_type' to 
+// reference the type of a parameter named 'foo'.  For example, in the 
+// body of MATCHER_P(HasAbsoluteValue, value) above, you can write 
+// 'value_type' to refer to the type of 'value'. 
+// 
+// We also provide MATCHER_P2, MATCHER_P3, ..., up to MATCHER_P$n to 
+// support multi-parameter matchers. 
+// 
+// Describing Parameterized Matchers 
+// ================================= 
+// 
+// The last argument to MATCHER*() is a string-typed expression.  The 
+// expression can reference all of the matcher's parameters and a 
+// special bool-typed variable named 'negation'.  When 'negation' is 
+// false, the expression should evaluate to the matcher's description; 
+// otherwise it should evaluate to the description of the negation of 
+// the matcher.  For example, 
+// 
+//   using testing::PrintToString; 
+// 
+//   MATCHER_P2(InClosedRange, low, hi, 
+//       std::string(negation ? "is not" : "is") + " in range [" + 
+//       PrintToString(low) + ", " + PrintToString(hi) + "]") { 
+//     return low <= arg && arg <= hi; 
+//   } 
+//   ... 
+//   EXPECT_THAT(3, InClosedRange(4, 6)); 
+//   EXPECT_THAT(3, Not(InClosedRange(2, 4))); 
+// 
+// would generate two failures that contain the text: 
+// 
+//   Expected: is in range [4, 6] 
+//   ... 
+//   Expected: is not in range [2, 4] 
+// 
+// If you specify "" as the description, the failure message will 
+// contain the sequence of words in the matcher name followed by the 
+// parameter values printed as a tuple.  For example, 
+// 
+//   MATCHER_P2(InClosedRange, low, hi, "") { ... } 
+//   ... 
+//   EXPECT_THAT(3, InClosedRange(4, 6)); 
+//   EXPECT_THAT(3, Not(InClosedRange(2, 4))); 
+// 
+// would generate two failures that contain the text: 
+// 
+//   Expected: in closed range (4, 6) 
+//   ... 
+//   Expected: not (in closed range (2, 4)) 
+// 
+// Types of Matcher Parameters 
+// =========================== 
+// 
+// For the purpose of typing, you can view 
+// 
+//   MATCHER_Pk(Foo, p1, ..., pk, description_string) { ... } 
+// 
+// as shorthand for 
+// 
+//   template <typename p1_type, ..., typename pk_type> 
+//   FooMatcherPk<p1_type, ..., pk_type> 
+//   Foo(p1_type p1, ..., pk_type pk) { ... } 
+// 
+// When you write Foo(v1, ..., vk), the compiler infers the types of 
+// the parameters v1, ..., and vk for you.  If you are not happy with 
+// the result of the type inference, you can specify the types by 
+// explicitly instantiating the template, as in Foo<long, bool>(5, 
+// false).  As said earlier, you don't get to (or need to) specify 
+// 'arg_type' as that's determined by the context in which the matcher 
+// is used.  You can assign the result of expression Foo(p1, ..., pk) 
+// to a variable of type FooMatcherPk<p1_type, ..., pk_type>.  This 
+// can be useful when composing matchers. 
+// 
+// While you can instantiate a matcher template with reference types, 
+// passing the parameters by pointer usually makes your code more 
+// readable.  If, however, you still want to pass a parameter by 
+// reference, be aware that in the failure message generated by the 
+// matcher you will see the value of the referenced object but not its 
+// address. 
+// 
+// Explaining Match Results 
+// ======================== 
+// 
+// Sometimes the matcher description alone isn't enough to explain why 
+// the match has failed or succeeded.  For example, when expecting a 
+// long string, it can be very helpful to also print the diff between 
+// the expected string and the actual one.  To achieve that, you can 
+// optionally stream additional information to a special variable 
+// named result_listener, whose type is a pointer to class 
+// MatchResultListener: 
+// 
+//   MATCHER_P(EqualsLongString, str, "") { 
+//     if (arg == str) return true; 
+// 
+//     *result_listener << "the difference: " 
+///                     << DiffStrings(str, arg); 
+//     return false; 
+//   } 
+// 
+// Overloading Matchers 
+// ==================== 
+// 
+// You can overload matchers with different numbers of parameters: 
+// 
+//   MATCHER_P(Blah, a, description_string1) { ... } 
+//   MATCHER_P2(Blah, a, b, description_string2) { ... } 
+// 
+// Caveats 
+// ======= 
+// 
+// When defining a new matcher, you should also consider implementing 
+// MatcherInterface or using MakePolymorphicMatcher().  These 
+// approaches require more work than the MATCHER* macros, but also 
+// give you more control on the types of the value being matched and 
+// the matcher parameters, which may leads to better compiler error 
+// messages when the matcher is used wrong.  They also allow 
+// overloading matchers based on parameter types (as opposed to just 
+// based on the number of parameters). 
+// 
+// MATCHER*() can only be used in a namespace scope as templates cannot be 
+// declared inside of a local class. 
+// 
+// More Information 
+// ================ 
+// 
+// To learn more about using these macros, please search for 'MATCHER' 
+// on 
+// https://github.com/google/googletest/blob/master/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.
-//
-// See googletest/include/gtest/gtest-matchers.h for the definition of class
-// Matcher, class MatcherInterface, and others.
-
-// GOOGLETEST_CM0002 DO NOT DELETE
+// 
+// See googletest/include/gtest/gtest-matchers.h for the definition of class 
+// Matcher, class MatcherInterface, and others. 
 
-#ifndef GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_MATCHERS_H_
-#define GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_MATCHERS_H_
+// GOOGLETEST_CM0002 DO NOT DELETE 
+ 
+#ifndef GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_MATCHERS_H_ 
+#define GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_MATCHERS_H_ 
 
 #include <algorithm>
-#include <cmath>
-#include <initializer_list>
+#include <cmath> 
+#include <initializer_list> 
 #include <iterator>
 #include <limits>
-#include <memory>
+#include <memory> 
 #include <ostream>  // NOLINT
 #include <sstream>
 #include <string>
-#include <type_traits>
+#include <type_traits> 
 #include <utility>
 #include <vector>
-
+ 
 #include "gmock/internal/gmock-internal-utils.h"
 #include "gmock/internal/gmock-port.h"
-#include "gmock/internal/gmock-pp.h"
+#include "gmock/internal/gmock-pp.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_
+// 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
 
-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 */)
-
+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:
@@ -305,7 +305,7 @@ class StringMatchResultListener : public MatchResultListener {
   StringMatchResultListener() : MatchResultListener(&ss_) {}
 
   // Returns the explanation accumulated so far.
-  std::string str() const { return ss_.str(); }
+  std::string str() const { return ss_.str(); } 
 
   // Clears the explanation accumulated so far.
   void Clear() { ss_.str(""); }
@@ -334,7 +334,7 @@ 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
+    // 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.
     //
@@ -343,22 +343,22 @@ class MatcherCastImpl {
     // constructor from M (this usually happens when T has an implicit
     // constructor from any type).
     //
-    // It won't work to unconditionally implicit_cast
+    // 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).
-    return CastImpl(polymorphic_matcher_or_value,
-                    std::is_convertible<M, Matcher<T>>{},
-                    std::is_convertible<M, T>{});
+    return CastImpl(polymorphic_matcher_or_value, 
+                    std::is_convertible<M, Matcher<T>>{}, 
+                    std::is_convertible<M, T>{}); 
   }
 
  private:
-  template <bool Ignore>
+  template <bool Ignore> 
   static Matcher<T> CastImpl(const M& polymorphic_matcher_or_value,
-                             std::true_type /* convertible_to_matcher */,
-                             std::integral_constant<bool, Ignore>) {
+                             std::true_type /* convertible_to_matcher */, 
+                             std::integral_constant<bool, Ignore>) { 
     // M is implicitly convertible to Matcher<T>, which means that either
-    // M is a polymorphic matcher or Matcher<T> has an implicit constructor
+    // 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.
     //
@@ -367,29 +367,29 @@ class MatcherCastImpl {
     // (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
-  // initialization to create a matcher.
-  static Matcher<T> CastImpl(const M& value,
-                             std::false_type /* convertible_to_matcher */,
-                             std::true_type /* convertible_to_T */) {
-    return Matcher<T>(ImplicitCast_<T>(value));
-  }
-
-  // M can't be implicitly converted to either Matcher<T> or T. Attempt to use
-  // polymorphic matcher Eq(value) in this case.
-  //
-  // Note that we first attempt to perform an implicit cast on the value and
-  // only fall back to the polymorphic Eq() matcher afterwards because the
-  // latter calls bool operator==(const Lhs& lhs, const Rhs& rhs) in the end
-  // which might be undefined even when Rhs is implicitly convertible to Lhs
-  // (e.g. std::pair<const int, int> vs. std::pair<int, int>).
-  //
-  // We don't define this method inline as we need the declaration of Eq().
-  static Matcher<T> CastImpl(const M& value,
-                             std::false_type /* convertible_to_matcher */,
-                             std::false_type /* convertible_to_T */);
+ 
+  // 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 
+  // initialization to create a matcher. 
+  static Matcher<T> CastImpl(const M& value, 
+                             std::false_type /* convertible_to_matcher */, 
+                             std::true_type /* convertible_to_T */) { 
+    return Matcher<T>(ImplicitCast_<T>(value)); 
+  } 
+ 
+  // M can't be implicitly converted to either Matcher<T> or T. Attempt to use 
+  // polymorphic matcher Eq(value) in this case. 
+  // 
+  // Note that we first attempt to perform an implicit cast on the value and 
+  // only fall back to the polymorphic Eq() matcher afterwards because the 
+  // latter calls bool operator==(const Lhs& lhs, const Rhs& rhs) in the end 
+  // which might be undefined even when Rhs is implicitly convertible to Lhs 
+  // (e.g. std::pair<const int, int> vs. std::pair<int, int>). 
+  // 
+  // We don't define this method inline as we need the declaration of Eq(). 
+  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
@@ -409,36 +409,36 @@ class MatcherCastImpl<T, Matcher<U> > {
         : 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;
-      using ToType = typename std::remove_cv<typename std::remove_pointer<
-          typename std::remove_reference<U>::type>::type>::type;
-      // Do not allow implicitly converting base*/& to derived*/&.
-      static_assert(
-          // Do not trigger if only one of them is a pointer. That implies a
-          // regular conversion and not a down_cast.
-          (std::is_pointer<typename std::remove_reference<T>::type>::value !=
-           std::is_pointer<typename std::remove_reference<U>::type>::value) ||
-              std::is_same<FromType, ToType>::value ||
-              !std::is_base_of<FromType, ToType>::value,
-          "Can't implicitly convert from <base> to <derived>");
-
-      // Do the cast to `U` explicitly if necessary.
-      // Otherwise, let implicit conversions do the trick.
-      using CastType =
-          typename std::conditional<std::is_convertible<T&, const U&>::value,
-                                    T&, U>::type;
-
-      return source_matcher_.MatchAndExplain(static_cast<CastType>(x),
-                                             listener);
+    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; 
+      using ToType = typename std::remove_cv<typename std::remove_pointer< 
+          typename std::remove_reference<U>::type>::type>::type; 
+      // Do not allow implicitly converting base*/& to derived*/&. 
+      static_assert( 
+          // Do not trigger if only one of them is a pointer. That implies a 
+          // regular conversion and not a down_cast. 
+          (std::is_pointer<typename std::remove_reference<T>::type>::value != 
+           std::is_pointer<typename std::remove_reference<U>::type>::value) || 
+              std::is_same<FromType, ToType>::value || 
+              !std::is_base_of<FromType, ToType>::value, 
+          "Can't implicitly convert from <base> to <derived>"); 
+ 
+      // Do the cast to `U` explicitly if necessary. 
+      // Otherwise, let implicit conversions do the trick. 
+      using CastType = 
+          typename std::conditional<std::is_convertible<T&, const U&>::value, 
+                                    T&, U>::type; 
+ 
+      return source_matcher_.MatchAndExplain(static_cast<CastType>(x), 
+                                             listener); 
     }
 
-    void DescribeTo(::std::ostream* os) const override {
+    void DescribeTo(::std::ostream* os) const override { 
       source_matcher_.DescribeTo(os);
     }
 
-    void DescribeNegationTo(::std::ostream* os) const override {
+    void DescribeNegationTo(::std::ostream* os) const override { 
       source_matcher_.DescribeNegationTo(os);
     }
 
@@ -455,50 +455,50 @@ class MatcherCastImpl<T, Matcher<T> > {
   static Matcher<T> Cast(const Matcher<T>& matcher) { return matcher; }
 };
 
-// Template specialization for parameterless Matcher.
-template <typename Derived>
-class MatcherBaseImpl {
- public:
-  MatcherBaseImpl() = default;
-
-  template <typename T>
-  operator ::testing::Matcher<T>() const {  // NOLINT(runtime/explicit)
-    return ::testing::Matcher<T>(new
-                                 typename Derived::template gmock_Impl<T>());
-  }
-};
-
-// Template specialization for Matcher with parameters.
-template <template <typename...> class Derived, typename... Ts>
-class MatcherBaseImpl<Derived<Ts...>> {
- public:
-  // Mark the constructor explicit for single argument T to avoid implicit
-  // conversions.
-  template <typename E = std::enable_if<sizeof...(Ts) == 1>,
-            typename E::type* = nullptr>
-  explicit MatcherBaseImpl(Ts... params)
-      : params_(std::forward<Ts>(params)...) {}
-  template <typename E = std::enable_if<sizeof...(Ts) != 1>,
-            typename = typename E::type>
-  MatcherBaseImpl(Ts... params)  // NOLINT
-      : params_(std::forward<Ts>(params)...) {}
-
-  template <typename F>
-  operator ::testing::Matcher<F>() const {  // NOLINT(runtime/explicit)
-    return Apply<F>(MakeIndexSequence<sizeof...(Ts)>{});
-  }
-
- private:
-  template <typename F, std::size_t... tuple_ids>
-  ::testing::Matcher<F> Apply(IndexSequence<tuple_ids...>) const {
-    return ::testing::Matcher<F>(
-        new typename Derived<Ts...>::template gmock_Impl<F>(
-            std::get<tuple_ids>(params_)...));
-  }
-
-  const std::tuple<Ts...> params_;
-};
-
+// Template specialization for parameterless Matcher. 
+template <typename Derived> 
+class MatcherBaseImpl { 
+ public: 
+  MatcherBaseImpl() = default; 
+ 
+  template <typename T> 
+  operator ::testing::Matcher<T>() const {  // NOLINT(runtime/explicit) 
+    return ::testing::Matcher<T>(new 
+                                 typename Derived::template gmock_Impl<T>()); 
+  } 
+}; 
+ 
+// Template specialization for Matcher with parameters. 
+template <template <typename...> class Derived, typename... Ts> 
+class MatcherBaseImpl<Derived<Ts...>> { 
+ public: 
+  // Mark the constructor explicit for single argument T to avoid implicit 
+  // conversions. 
+  template <typename E = std::enable_if<sizeof...(Ts) == 1>, 
+            typename E::type* = nullptr> 
+  explicit MatcherBaseImpl(Ts... params) 
+      : params_(std::forward<Ts>(params)...) {} 
+  template <typename E = std::enable_if<sizeof...(Ts) != 1>, 
+            typename = typename E::type> 
+  MatcherBaseImpl(Ts... params)  // NOLINT 
+      : params_(std::forward<Ts>(params)...) {} 
+ 
+  template <typename F> 
+  operator ::testing::Matcher<F>() const {  // NOLINT(runtime/explicit) 
+    return Apply<F>(MakeIndexSequence<sizeof...(Ts)>{}); 
+  } 
+ 
+ private: 
+  template <typename F, std::size_t... tuple_ids> 
+  ::testing::Matcher<F> Apply(IndexSequence<tuple_ids...>) const { 
+    return ::testing::Matcher<F>( 
+        new typename Derived<Ts...>::template gmock_Impl<F>( 
+            std::get<tuple_ids>(params_)...)); 
+  } 
+ 
+  const std::tuple<Ts...> params_; 
+}; 
+ 
 }  // namespace internal
 
 // In order to be safe and clear, casting between different matcher
@@ -510,45 +510,45 @@ 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.
+// This overload handles polymorphic matchers and values only since 
+// monomorphic matchers are handled by the next one. 
 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
-// safely convert a Matcher<U> to a Matcher<T> (i.e. Matcher is
-// contravariant): just keep a copy of the original Matcher<U>, convert the
-// argument from type T to U, and then pass it to the underlying Matcher<U>.
-// The only exception is when U is a reference and T is not, as the
-// underlying Matcher<U> may be interested in the argument's address, which
-// is not preserved in the conversion from T to U.
-template <typename T, typename U>
-inline Matcher<T> SafeMatcherCast(const Matcher<U>& matcher) {
-  // Enforce that T can be implicitly converted to U.
-  static_assert(std::is_convertible<const T&, const U&>::value,
-                "T must be implicitly convertible to U");
-  // Enforce that we are not converting a non-reference type T to a reference
-  // type U.
-  GTEST_COMPILE_ASSERT_(
-      std::is_reference<T>::value || !std::is_reference<U>::value,
-      cannot_convert_non_reference_arg_to_reference);
-  // In case both T and U are arithmetic types, enforce that the
-  // conversion is not lossy.
-  typedef GTEST_REMOVE_REFERENCE_AND_CONST_(T) RawT;
-  typedef GTEST_REMOVE_REFERENCE_AND_CONST_(U) RawU;
-  constexpr bool kTIsOther = GMOCK_KIND_OF_(RawT) == internal::kOther;
-  constexpr bool kUIsOther = GMOCK_KIND_OF_(RawU) == internal::kOther;
-  GTEST_COMPILE_ASSERT_(
-      kTIsOther || kUIsOther ||
-      (internal::LosslessArithmeticConvertible<RawT, RawU>::value),
-      conversion_of_arithmetic_types_must_be_lossless);
-  return MatcherCast<T>(matcher);
-}
-
+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 
+// safely convert a Matcher<U> to a Matcher<T> (i.e. Matcher is 
+// contravariant): just keep a copy of the original Matcher<U>, convert the 
+// argument from type T to U, and then pass it to the underlying Matcher<U>. 
+// The only exception is when U is a reference and T is not, as the 
+// underlying Matcher<U> may be interested in the argument's address, which 
+// is not preserved in the conversion from T to U. 
+template <typename T, typename U> 
+inline Matcher<T> SafeMatcherCast(const Matcher<U>& matcher) { 
+  // Enforce that T can be implicitly converted to U. 
+  static_assert(std::is_convertible<const T&, const U&>::value, 
+                "T must be implicitly convertible to U"); 
+  // Enforce that we are not converting a non-reference type T to a reference 
+  // type U. 
+  GTEST_COMPILE_ASSERT_( 
+      std::is_reference<T>::value || !std::is_reference<U>::value, 
+      cannot_convert_non_reference_arg_to_reference); 
+  // In case both T and U are arithmetic types, enforce that the 
+  // conversion is not lossy. 
+  typedef GTEST_REMOVE_REFERENCE_AND_CONST_(T) RawT; 
+  typedef GTEST_REMOVE_REFERENCE_AND_CONST_(U) RawU; 
+  constexpr bool kTIsOther = GMOCK_KIND_OF_(RawT) == internal::kOther; 
+  constexpr bool kUIsOther = GMOCK_KIND_OF_(RawU) == internal::kOther; 
+  GTEST_COMPILE_ASSERT_( 
+      kTIsOther || kUIsOther || 
+      (internal::LosslessArithmeticConvertible<RawT, RawU>::value), 
+      conversion_of_arithmetic_types_must_be_lossless); 
+  return MatcherCast<T>(matcher); 
+} 
+ 
 // A<T>() returns a matcher that matches any value of type T.
 template <typename T>
 Matcher<T> A();
@@ -558,9 +558,9 @@ Matcher<T> A();
 namespace internal {
 
 // If the explanation is not empty, prints it to the ostream.
-inline void PrintIfNotEmpty(const std::string& explanation,
+inline void PrintIfNotEmpty(const std::string& explanation, 
                             ::std::ostream* os) {
-  if (explanation != "" && os != nullptr) {
+  if (explanation != "" && os != nullptr) { 
     *os << ", " << explanation;
   }
 }
@@ -568,11 +568,11 @@ inline void PrintIfNotEmpty(const std::string& 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) {
+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 ||
-          type_name.find_first_of("<(") == std::string::npos);
+          type_name.find_first_of("<(") == std::string::npos); 
 }
 
 // Matches the value against the given matcher, prints the value and explains
@@ -594,7 +594,7 @@ bool MatchPrintAndExplain(Value& value, const Matcher<T>& matcher,
 
   UniversalPrint(value, listener->stream());
 #if GTEST_HAS_RTTI
-  const std::string& type_name = GetTypeName<Value>();
+  const std::string& type_name = GetTypeName<Value>(); 
   if (IsReadableTypeName(type_name))
     *listener->stream() << " (of type " << type_name << ")";
 #endif
@@ -609,13 +609,13 @@ 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.
+  // 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) {
-    return TuplePrefix<N - 1>::Matches(matcher_tuple, value_tuple) &&
-           std::get<N - 1>(matcher_tuple).Matches(std::get<N - 1>(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)
@@ -631,14 +631,14 @@ class TuplePrefix {
 
     // 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);
+    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 << ": ";
-      std::get<N - 1>(matchers).DescribeTo(os);
+      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
@@ -668,8 +668,8 @@ class TuplePrefix<0> {
                                      ::std::ostream* /* os */) {}
 };
 
-// TupleMatches(matcher_tuple, value_tuple) returns true if and only if
-// all matchers in matcher_tuple match the corresponding fields in
+// 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.
@@ -678,11 +678,11 @@ 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,
+  GTEST_COMPILE_ASSERT_(std::tuple_size<MatcherTuple>::value == 
+                            std::tuple_size<ValueTuple>::value, 
                         matcher_and_value_have_different_numbers_of_fields);
-  return TuplePrefix<std::tuple_size<ValueTuple>::value>::Matches(matcher_tuple,
-                                                                  value_tuple);
+  return TuplePrefix<std::tuple_size<ValueTuple>::value>::Matches(matcher_tuple, 
+                                                                  value_tuple); 
 }
 
 // Describes failures in matching matchers against values.  If there
@@ -691,7 +691,7 @@ template <typename MatcherTuple, typename ValueTuple>
 void ExplainMatchFailureTupleTo(const MatcherTuple& matchers,
                                 const ValueTuple& values,
                                 ::std::ostream* os) {
-  TuplePrefix<std::tuple_size<MatcherTuple>::value>::ExplainMatchFailuresTo(
+  TuplePrefix<std::tuple_size<MatcherTuple>::value>::ExplainMatchFailuresTo( 
       matchers, values, os);
 }
 
@@ -702,7 +702,7 @@ void ExplainMatchFailureTupleTo(const MatcherTuple& matchers,
 template <typename Tuple, typename Func, typename OutIter>
 class TransformTupleValuesHelper {
  private:
-  typedef ::std::tuple_size<Tuple> TupleSize;
+  typedef ::std::tuple_size<Tuple> TupleSize; 
 
  public:
   // For each member of tuple 't', taken in order, evaluates '*out++ = f(t)'.
@@ -715,7 +715,7 @@ class TransformTupleValuesHelper {
   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));
+      *out++ = f(::std::get<TupleSize::value - kRemainingSize>(t)); 
       return IterateOverTuple<Tup, kRemainingSize - 1>()(f, t, out);
     }
   };
@@ -735,21 +735,21 @@ 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 {
+// 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:
-  using is_gtest_matcher = void;
-
-  template <typename T>
-  bool MatchAndExplain(const T& /* x */, std::ostream* /* listener */) const {
-    return true;
-  }
-  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
+  using is_gtest_matcher = void; 
+ 
+  template <typename T> 
+  bool MatchAndExplain(const T& /* x */, std::ostream* /* listener */) const { 
+    return true; 
+  } 
+  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";
@@ -835,18 +835,18 @@ class RefMatcher<T&> {
 
     // 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 {
+    bool MatchAndExplain(Super& x, 
+                         MatchResultListener* listener) const override { 
       *listener << "which is located @" << static_cast<const void*>(&x);
       return &x == &object_;
     }
 
-    void DescribeTo(::std::ostream* os) const override {
+    void DescribeTo(::std::ostream* os) const override { 
       *os << "references the variable ";
       UniversalPrinter<Super&>::Print(object_, os);
     }
 
-    void DescribeNegationTo(::std::ostream* os) const override {
+    void DescribeNegationTo(::std::ostream* os) const override { 
       *os << "does not reference the variable ";
       UniversalPrinter<Super&>::Print(object_, os);
     }
@@ -897,21 +897,21 @@ bool CaseInsensitiveStringEquals(const StringType& s1,
 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 {
-    // This should fail to compile if StringView is used with wide
-    // strings.
-    const StringType& str = std::string(s);
-    return MatchAndExplain(str, listener);
-  }
-#endif  // GTEST_INTERNAL_HAS_STRING_VIEW
-
+  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 { 
+    // This should fail to compile if StringView is used with wide 
+    // strings. 
+    const StringType& str = std::string(s); 
+    return MatchAndExplain(str, listener); 
+  } 
+#endif  // GTEST_INTERNAL_HAS_STRING_VIEW 
+ 
   // Accepts pointer types, particularly:
   //   const char*
   //   char*
@@ -919,7 +919,7 @@ class StrEqualityMatcher {
   //   wchar_t*
   template <typename CharType>
   bool MatchAndExplain(CharType* s, MatchResultListener* listener) const {
-    if (s == nullptr) {
+    if (s == nullptr) { 
       return !expect_eq_;
     }
     return MatchAndExplain(StringType(s), listener);
@@ -928,11 +928,11 @@ class StrEqualityMatcher {
   // 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.
+  // because StringView has some interfering non-explicit constructors. 
   template <typename MatcheeStringType>
   bool MatchAndExplain(const MatcheeStringType& s,
                        MatchResultListener* /* listener */) const {
-    const StringType s2(s);
+    const StringType s2(s); 
     const bool eq = case_sensitive_ ? s2 == string_ :
         CaseInsensitiveStringEquals(s2, string_);
     return expect_eq_ == eq;
@@ -970,16 +970,16 @@ class HasSubstrMatcher {
   explicit HasSubstrMatcher(const StringType& substring)
       : substring_(substring) {}
 
-#if GTEST_INTERNAL_HAS_STRING_VIEW
-  bool MatchAndExplain(const internal::StringView& s,
-                       MatchResultListener* listener) const {
-    // This should fail to compile if StringView is used with wide
-    // strings.
-    const StringType& str = std::string(s);
-    return MatchAndExplain(str, listener);
-  }
-#endif  // GTEST_INTERNAL_HAS_STRING_VIEW
-
+#if GTEST_INTERNAL_HAS_STRING_VIEW 
+  bool MatchAndExplain(const internal::StringView& s, 
+                       MatchResultListener* listener) const { 
+    // This should fail to compile if StringView is used with wide 
+    // strings. 
+    const StringType& str = std::string(s); 
+    return MatchAndExplain(str, listener); 
+  } 
+#endif  // GTEST_INTERNAL_HAS_STRING_VIEW 
+ 
   // Accepts pointer types, particularly:
   //   const char*
   //   char*
@@ -987,17 +987,17 @@ class HasSubstrMatcher {
   //   wchar_t*
   template <typename CharType>
   bool MatchAndExplain(CharType* s, MatchResultListener* listener) const {
-    return s != nullptr && MatchAndExplain(StringType(s), listener);
+    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&,
-  // because StringView has some interfering non-explicit constructors.
+  // because StringView has some interfering non-explicit constructors. 
   template <typename MatcheeStringType>
   bool MatchAndExplain(const MatcheeStringType& s,
                        MatchResultListener* /* listener */) const {
-    return StringType(s).find(substring_) != StringType::npos;
+    return StringType(s).find(substring_) != StringType::npos; 
   }
 
   // Describes what this matcher matches.
@@ -1024,16 +1024,16 @@ class StartsWithMatcher {
   explicit StartsWithMatcher(const StringType& prefix) : prefix_(prefix) {
   }
 
-#if GTEST_INTERNAL_HAS_STRING_VIEW
-  bool MatchAndExplain(const internal::StringView& s,
-                       MatchResultListener* listener) const {
-    // This should fail to compile if StringView is used with wide
-    // strings.
-    const StringType& str = std::string(s);
-    return MatchAndExplain(str, listener);
-  }
-#endif  // GTEST_INTERNAL_HAS_STRING_VIEW
-
+#if GTEST_INTERNAL_HAS_STRING_VIEW 
+  bool MatchAndExplain(const internal::StringView& s, 
+                       MatchResultListener* listener) const { 
+    // This should fail to compile if StringView is used with wide 
+    // strings. 
+    const StringType& str = std::string(s); 
+    return MatchAndExplain(str, listener); 
+  } 
+#endif  // GTEST_INTERNAL_HAS_STRING_VIEW 
+ 
   // Accepts pointer types, particularly:
   //   const char*
   //   char*
@@ -1041,13 +1041,13 @@ class StartsWithMatcher {
   //   wchar_t*
   template <typename CharType>
   bool MatchAndExplain(CharType* s, MatchResultListener* listener) const {
-    return s != nullptr && MatchAndExplain(StringType(s), listener);
+    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&,
-  // because StringView has some interfering non-explicit constructors.
+  // because StringView has some interfering non-explicit constructors. 
   template <typename MatcheeStringType>
   bool MatchAndExplain(const MatcheeStringType& s,
                        MatchResultListener* /* listener */) const {
@@ -1078,16 +1078,16 @@ 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 {
-    // This should fail to compile if StringView is used with wide
-    // strings.
-    const StringType& str = std::string(s);
-    return MatchAndExplain(str, listener);
-  }
-#endif  // GTEST_INTERNAL_HAS_STRING_VIEW
-
+#if GTEST_INTERNAL_HAS_STRING_VIEW 
+  bool MatchAndExplain(const internal::StringView& s, 
+                       MatchResultListener* listener) const { 
+    // This should fail to compile if StringView is used with wide 
+    // strings. 
+    const StringType& str = std::string(s); 
+    return MatchAndExplain(str, listener); 
+  } 
+#endif  // GTEST_INTERNAL_HAS_STRING_VIEW 
+ 
   // Accepts pointer types, particularly:
   //   const char*
   //   char*
@@ -1095,13 +1095,13 @@ class EndsWithMatcher {
   //   wchar_t*
   template <typename CharType>
   bool MatchAndExplain(CharType* s, MatchResultListener* listener) const {
-    return s != nullptr && MatchAndExplain(StringType(s), listener);
+    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&,
-  // because StringView has some interfering non-explicit constructors.
+  // because StringView has some interfering non-explicit constructors. 
   template <typename MatcheeStringType>
   bool MatchAndExplain(const MatcheeStringType& s,
                        MatchResultListener* /* listener */) const {
@@ -1129,19 +1129,19 @@ class EndsWithMatcher {
 // 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>,
+// 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>
-  operator Matcher<::std::tuple<T1, T2>>() const {
-    return Matcher<::std::tuple<T1, T2>>(new Impl<const ::std::tuple<T1, 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>
-  operator Matcher<const ::std::tuple<T1, T2>&>() const {
-    return MakeMatcher(new Impl<const ::std::tuple<T1, T2>&>);
+  operator Matcher<const ::std::tuple<T1, T2>&>() const { 
+    return MakeMatcher(new Impl<const ::std::tuple<T1, T2>&>); 
   }
 
  private:
@@ -1152,14 +1152,14 @@ class PairMatchBase {
   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));
+    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 {
+    void DescribeTo(::std::ostream* os) const override { 
       *os << "are " << GetDesc;
     }
-    void DescribeNegationTo(::std::ostream* os) const override {
+    void DescribeNegationTo(::std::ostream* os) const override { 
       *os << "aren't " << GetDesc;
     }
   };
@@ -1195,21 +1195,21 @@ class Ge2Matcher : public PairMatchBase<Ge2Matcher, AnyGe> {
 // will prevent different instantiations of NotMatcher from sharing
 // the same NotMatcherImpl<T> class.
 template <typename T>
-class NotMatcherImpl : public MatcherInterface<const T&> {
+class NotMatcherImpl : public MatcherInterface<const T&> { 
  public:
   explicit NotMatcherImpl(const Matcher<T>& matcher)
       : matcher_(matcher) {}
 
-  bool MatchAndExplain(const T& x,
-                       MatchResultListener* listener) const override {
+  bool MatchAndExplain(const T& x, 
+                       MatchResultListener* listener) const override { 
     return !matcher_.MatchAndExplain(x, listener);
   }
 
-  void DescribeTo(::std::ostream* os) const override {
+  void DescribeTo(::std::ostream* os) const override { 
     matcher_.DescribeNegationTo(os);
   }
 
-  void DescribeNegationTo(::std::ostream* os) const override {
+  void DescribeNegationTo(::std::ostream* os) const override { 
     matcher_.DescribeTo(os);
   }
 
@@ -1240,60 +1240,60 @@ class NotMatcher {
 // that will prevent different instantiations of BothOfMatcher from
 // sharing the same BothOfMatcherImpl<T> class.
 template <typename T>
-class AllOfMatcherImpl : public MatcherInterface<const T&> {
+class AllOfMatcherImpl : public MatcherInterface<const T&> { 
  public:
-  explicit AllOfMatcherImpl(std::vector<Matcher<T> > matchers)
-      : matchers_(std::move(matchers)) {}
+  explicit AllOfMatcherImpl(std::vector<Matcher<T> > matchers) 
+      : matchers_(std::move(matchers)) {} 
 
-  void DescribeTo(::std::ostream* os) const override {
+  void DescribeTo(::std::ostream* os) const override { 
     *os << "(";
-    for (size_t i = 0; i < matchers_.size(); ++i) {
-      if (i != 0) *os << ") and (";
-      matchers_[i].DescribeTo(os);
-    }
+    for (size_t i = 0; i < matchers_.size(); ++i) { 
+      if (i != 0) *os << ") and ("; 
+      matchers_[i].DescribeTo(os); 
+    } 
     *os << ")";
   }
 
-  void DescribeNegationTo(::std::ostream* os) const override {
+  void DescribeNegationTo(::std::ostream* os) const override { 
     *os << "(";
-    for (size_t i = 0; i < matchers_.size(); ++i) {
-      if (i != 0) *os << ") or (";
-      matchers_[i].DescribeNegationTo(os);
-    }
+    for (size_t i = 0; i < matchers_.size(); ++i) { 
+      if (i != 0) *os << ") or ("; 
+      matchers_[i].DescribeNegationTo(os); 
+    } 
     *os << ")";
   }
 
-  bool MatchAndExplain(const T& x,
-                       MatchResultListener* listener) const override {
+  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.
-    std::string all_match_result;
-
-    for (size_t i = 0; i < matchers_.size(); ++i) {
-      StringMatchResultListener slistener;
-      if (matchers_[i].MatchAndExplain(x, &slistener)) {
-        if (all_match_result.empty()) {
-          all_match_result = slistener.str();
-        } else {
-          std::string result = slistener.str();
-          if (!result.empty()) {
-            all_match_result += ", and ";
-            all_match_result += result;
-          }
-        }
-      } else {
-        *listener << slistener.str();
-        return false;
-      }
+    std::string all_match_result; 
+
+    for (size_t i = 0; i < matchers_.size(); ++i) { 
+      StringMatchResultListener slistener; 
+      if (matchers_[i].MatchAndExplain(x, &slistener)) { 
+        if (all_match_result.empty()) { 
+          all_match_result = slistener.str(); 
+        } else { 
+          std::string result = slistener.str(); 
+          if (!result.empty()) { 
+            all_match_result += ", and "; 
+            all_match_result += result; 
+          } 
+        } 
+      } else { 
+        *listener << slistener.str(); 
+        return false; 
+      } 
     }
 
     // Otherwise we need to explain why *both* of them match.
-    *listener << all_match_result;
+    *listener << all_match_result; 
     return true;
   }
 
  private:
-  const std::vector<Matcher<T> > matchers_;
+  const std::vector<Matcher<T> > matchers_; 
 };
 
 // VariadicMatcher is used for the variadic implementation of
@@ -1304,136 +1304,136 @@ 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;
+      : 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 {
-    std::vector<Matcher<T> > values;
-    CreateVariadicMatcher<T>(&values, std::integral_constant<size_t, 0>());
-    return Matcher<T>(new CombiningMatcher<T>(std::move(values)));
+    std::vector<Matcher<T> > values; 
+    CreateVariadicMatcher<T>(&values, std::integral_constant<size_t, 0>()); 
+    return Matcher<T>(new CombiningMatcher<T>(std::move(values))); 
   }
 
  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 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>
-using AllOfMatcher = VariadicMatcher<AllOfMatcherImpl, 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>
-class AnyOfMatcherImpl : public MatcherInterface<const T&> {
+class AnyOfMatcherImpl : public MatcherInterface<const T&> { 
  public:
-  explicit AnyOfMatcherImpl(std::vector<Matcher<T> > matchers)
-      : matchers_(std::move(matchers)) {}
+  explicit AnyOfMatcherImpl(std::vector<Matcher<T> > matchers) 
+      : matchers_(std::move(matchers)) {} 
 
-  void DescribeTo(::std::ostream* os) const override {
+  void DescribeTo(::std::ostream* os) const override { 
     *os << "(";
-    for (size_t i = 0; i < matchers_.size(); ++i) {
-      if (i != 0) *os << ") or (";
-      matchers_[i].DescribeTo(os);
-    }
+    for (size_t i = 0; i < matchers_.size(); ++i) { 
+      if (i != 0) *os << ") or ("; 
+      matchers_[i].DescribeTo(os); 
+    } 
     *os << ")";
   }
 
-  void DescribeNegationTo(::std::ostream* os) const override {
+  void DescribeNegationTo(::std::ostream* os) const override { 
     *os << "(";
-    for (size_t i = 0; i < matchers_.size(); ++i) {
-      if (i != 0) *os << ") and (";
-      matchers_[i].DescribeNegationTo(os);
-    }
+    for (size_t i = 0; i < matchers_.size(); ++i) { 
+      if (i != 0) *os << ") and ("; 
+      matchers_[i].DescribeNegationTo(os); 
+    } 
     *os << ")";
   }
 
-  bool MatchAndExplain(const T& x,
-                       MatchResultListener* listener) const override {
-    std::string no_match_result;
-
+  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.
-    for (size_t i = 0; i < matchers_.size(); ++i) {
-      StringMatchResultListener slistener;
-      if (matchers_[i].MatchAndExplain(x, &slistener)) {
-        *listener << slistener.str();
-        return true;
-      } else {
-        if (no_match_result.empty()) {
-          no_match_result = slistener.str();
-        } else {
-          std::string result = slistener.str();
-          if (!result.empty()) {
-            no_match_result += ", and ";
-            no_match_result += result;
-          }
-        }
-      }
+    for (size_t i = 0; i < matchers_.size(); ++i) { 
+      StringMatchResultListener slistener; 
+      if (matchers_[i].MatchAndExplain(x, &slistener)) { 
+        *listener << slistener.str(); 
+        return true; 
+      } else { 
+        if (no_match_result.empty()) { 
+          no_match_result = slistener.str(); 
+        } else { 
+          std::string result = slistener.str(); 
+          if (!result.empty()) { 
+            no_match_result += ", and "; 
+            no_match_result += result; 
+          } 
+        } 
+      } 
     }
 
     // Otherwise we need to explain why *both* of them fail.
-    *listener << no_match_result;
+    *listener << no_match_result; 
     return false;
   }
 
  private:
-  const std::vector<Matcher<T> > matchers_;
+  const std::vector<Matcher<T> > matchers_; 
 };
 
 // AnyOfMatcher is used for the variadic implementation of AnyOf(m_1, m_2, ...).
 template <typename... Args>
-using AnyOfMatcher = VariadicMatcher<AnyOfMatcherImpl, Args...>;
+using AnyOfMatcher = VariadicMatcher<AnyOfMatcherImpl, Args...>; 
 
-// Wrapper for implementation of Any/AllOfArray().
-template <template <class> class MatcherImpl, typename T>
-class SomeOfArrayMatcher {
+// Wrapper for implementation of Any/AllOfArray(). 
+template <template <class> class MatcherImpl, typename T> 
+class SomeOfArrayMatcher { 
  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;
-    std::vector<Matcher<RawU>> matchers;
-    for (const auto& matcher : matchers_) {
-      matchers.push_back(MatcherCast<RawU>(matcher));
-    }
-    return Matcher<U>(new MatcherImpl<RawU>(std::move(matchers)));
+  // 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; 
+    std::vector<Matcher<RawU>> matchers; 
+    for (const auto& matcher : matchers_) { 
+      matchers.push_back(MatcherCast<RawU>(matcher)); 
+    } 
+    return Matcher<U>(new MatcherImpl<RawU>(std::move(matchers))); 
   }
 
  private:
-  const ::std::vector<T> matchers_;
+  const ::std::vector<T> matchers_; 
 };
 
-template <typename T>
-using AllOfArrayMatcher = SomeOfArrayMatcher<AllOfMatcherImpl, T>;
-
-template <typename T>
-using AnyOfArrayMatcher = SomeOfArrayMatcher<AnyOfMatcherImpl, T>;
-
+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>
@@ -1447,7 +1447,7 @@ class TrulyMatcher {
   // interested in the address of the argument.
   template <typename T>
   bool MatchAndExplain(T& x,  // NOLINT
-                       MatchResultListener* listener) const {
+                       MatchResultListener* listener) const { 
     // Without the if-statement, MSVC sometimes warns about converting
     // a value to bool (warning 4800).
     //
@@ -1456,7 +1456,7 @@ class TrulyMatcher {
     // having no operator!().
     if (predicate_(x))
       return true;
-    *listener << "didn't satisfy the given predicate";
+    *listener << "didn't satisfy the given predicate"; 
     return false;
   }
 
@@ -1513,7 +1513,7 @@ class MatcherAsPredicate {
 template <typename M>
 class PredicateFormatterFromMatcher {
  public:
-  explicit PredicateFormatterFromMatcher(M m) : matcher_(std::move(m)) {}
+  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
@@ -1532,24 +1532,24 @@ class PredicateFormatterFromMatcher {
     // 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)) {
+ 
+    // 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();
-    }
+    } 
 
     ::std::stringstream ss;
     ss << "Value of: " << value_text << "\n"
        << "Expected: ";
     matcher.DescribeTo(&ss);
-
-    // Rerun the matcher to "PrintAndExplain" the failure.
-    StringMatchResultListener listener;
-    if (MatchPrintAndExplain(x, matcher, &listener)) {
-      ss << "\n  The matcher failed on the initial attempt; but passed when "
-            "rerun to generate the explanation.";
-    }
+ 
+    // Rerun the matcher to "PrintAndExplain" the failure. 
+    StringMatchResultListener listener; 
+    if (MatchPrintAndExplain(x, matcher, &listener)) { 
+      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();
   }
@@ -1565,25 +1565,25 @@ class PredicateFormatterFromMatcher {
 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 {
- public:
-  template <typename FloatType>
-  bool MatchAndExplain(const FloatType& f,
-                       MatchResultListener* /* listener */) const {
-    return (::std::isnan)(f);
-  }
-
-  void DescribeTo(::std::ostream* os) const { *os << "is NaN"; }
-  void DescribeNegationTo(::std::ostream* os) const {
-    *os << "isn't NaN";
-  }
-};
-
+  return PredicateFormatterFromMatcher<M>(std::move(matcher)); 
+}
+
+// Implements the polymorphic IsNan() matcher, which matches any floating type 
+// value that is Nan. 
+class IsNanMatcher { 
+ public: 
+  template <typename FloatType> 
+  bool MatchAndExplain(const FloatType& f, 
+                       MatchResultListener* /* listener */) const { 
+    return (::std::isnan)(f); 
+  } 
+ 
+  void DescribeTo(::std::ostream* os) const { *os << "is NaN"; } 
+  void DescribeNegationTo(::std::ostream* os) const { 
+    *os << "isn't NaN"; 
+  } 
+}; 
+ 
 // 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
@@ -1622,8 +1622,8 @@ class FloatingEqMatcher {
           nan_eq_nan_(nan_eq_nan),
           max_abs_error_(max_abs_error) {}
 
-    bool MatchAndExplain(T value,
-                         MatchResultListener* listener) const override {
+    bool MatchAndExplain(T value, 
+                         MatchResultListener* listener) const override { 
       const FloatingPoint<FloatType> actual(value), expected(expected_);
 
       // Compares NaNs first, if nan_eq_nan_ is true.
@@ -1644,7 +1644,7 @@ class FloatingEqMatcher {
         }
 
         const FloatType diff = value - expected_;
-        if (::std::fabs(diff) <= max_abs_error_) {
+        if (::std::fabs(diff) <= max_abs_error_) { 
           return true;
         }
 
@@ -1657,7 +1657,7 @@ class FloatingEqMatcher {
       }
     }
 
-    void DescribeTo(::std::ostream* os) const override {
+    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.
@@ -1678,7 +1678,7 @@ class FloatingEqMatcher {
       os->precision(old_precision);
     }
 
-    void DescribeNegationTo(::std::ostream* os) const override {
+    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);
@@ -1734,82 +1734,82 @@ class FloatingEqMatcher {
   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)
-// against y. The former implements "Eq", the latter "Near". At present, there
-// is no version that compares NaNs as equal.
-template <typename FloatType>
-class FloatingEq2Matcher {
- public:
-  FloatingEq2Matcher() { Init(-1, false); }
-
-  explicit FloatingEq2Matcher(bool nan_eq_nan) { Init(-1, nan_eq_nan); }
-
-  explicit FloatingEq2Matcher(FloatType max_abs_error) {
-    Init(max_abs_error, false);
-  }
-
-  FloatingEq2Matcher(FloatType max_abs_error, bool nan_eq_nan) {
-    Init(max_abs_error, nan_eq_nan);
-  }
-
-  template <typename T1, typename T2>
-  operator Matcher<::std::tuple<T1, T2>>() const {
-    return MakeMatcher(
-        new Impl<::std::tuple<T1, T2>>(max_abs_error_, nan_eq_nan_));
-  }
-  template <typename T1, typename T2>
-  operator Matcher<const ::std::tuple<T1, T2>&>() const {
-    return MakeMatcher(
-        new Impl<const ::std::tuple<T1, T2>&>(max_abs_error_, nan_eq_nan_));
-  }
-
- private:
-  static ::std::ostream& GetDesc(::std::ostream& os) {  // NOLINT
-    return os << "an almost-equal pair";
-  }
-
-  template <typename Tuple>
-  class Impl : public MatcherInterface<Tuple> {
-   public:
-    Impl(FloatType max_abs_error, bool nan_eq_nan) :
-        max_abs_error_(max_abs_error),
-        nan_eq_nan_(nan_eq_nan) {}
-
-    bool MatchAndExplain(Tuple args,
-                         MatchResultListener* listener) const override {
-      if (max_abs_error_ == -1) {
-        FloatingEqMatcher<FloatType> fm(::std::get<0>(args), nan_eq_nan_);
-        return static_cast<Matcher<FloatType>>(fm).MatchAndExplain(
-            ::std::get<1>(args), listener);
-      } else {
-        FloatingEqMatcher<FloatType> fm(::std::get<0>(args), nan_eq_nan_,
-                                        max_abs_error_);
-        return static_cast<Matcher<FloatType>>(fm).MatchAndExplain(
-            ::std::get<1>(args), listener);
-      }
-    }
-    void DescribeTo(::std::ostream* os) const override {
-      *os << "are " << GetDesc;
-    }
-    void DescribeNegationTo(::std::ostream* os) const override {
-      *os << "aren't " << GetDesc;
-    }
-
-   private:
-    FloatType max_abs_error_;
-    const bool nan_eq_nan_;
-  };
-
-  void Init(FloatType max_abs_error_val, bool nan_eq_nan_val) {
-    max_abs_error_ = max_abs_error_val;
-    nan_eq_nan_ = nan_eq_nan_val;
-  }
-  FloatType max_abs_error_;
-  bool nan_eq_nan_;
-};
-
+// 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) 
+// against y. The former implements "Eq", the latter "Near". At present, there 
+// is no version that compares NaNs as equal. 
+template <typename FloatType> 
+class FloatingEq2Matcher { 
+ public: 
+  FloatingEq2Matcher() { Init(-1, false); } 
+ 
+  explicit FloatingEq2Matcher(bool nan_eq_nan) { Init(-1, nan_eq_nan); } 
+ 
+  explicit FloatingEq2Matcher(FloatType max_abs_error) { 
+    Init(max_abs_error, false); 
+  } 
+ 
+  FloatingEq2Matcher(FloatType max_abs_error, bool nan_eq_nan) { 
+    Init(max_abs_error, nan_eq_nan); 
+  } 
+ 
+  template <typename T1, typename T2> 
+  operator Matcher<::std::tuple<T1, T2>>() const { 
+    return MakeMatcher( 
+        new Impl<::std::tuple<T1, T2>>(max_abs_error_, nan_eq_nan_)); 
+  } 
+  template <typename T1, typename T2> 
+  operator Matcher<const ::std::tuple<T1, T2>&>() const { 
+    return MakeMatcher( 
+        new Impl<const ::std::tuple<T1, T2>&>(max_abs_error_, nan_eq_nan_)); 
+  } 
+ 
+ private: 
+  static ::std::ostream& GetDesc(::std::ostream& os) {  // NOLINT 
+    return os << "an almost-equal pair"; 
+  } 
+ 
+  template <typename Tuple> 
+  class Impl : public MatcherInterface<Tuple> { 
+   public: 
+    Impl(FloatType max_abs_error, bool nan_eq_nan) : 
+        max_abs_error_(max_abs_error), 
+        nan_eq_nan_(nan_eq_nan) {} 
+ 
+    bool MatchAndExplain(Tuple args, 
+                         MatchResultListener* listener) const override { 
+      if (max_abs_error_ == -1) { 
+        FloatingEqMatcher<FloatType> fm(::std::get<0>(args), nan_eq_nan_); 
+        return static_cast<Matcher<FloatType>>(fm).MatchAndExplain( 
+            ::std::get<1>(args), listener); 
+      } else { 
+        FloatingEqMatcher<FloatType> fm(::std::get<0>(args), nan_eq_nan_, 
+                                        max_abs_error_); 
+        return static_cast<Matcher<FloatType>>(fm).MatchAndExplain( 
+            ::std::get<1>(args), listener); 
+      } 
+    } 
+    void DescribeTo(::std::ostream* os) const override { 
+      *os << "are " << GetDesc; 
+    } 
+    void DescribeNegationTo(::std::ostream* os) const override { 
+      *os << "aren't " << GetDesc; 
+    } 
+ 
+   private: 
+    FloatType max_abs_error_; 
+    const bool nan_eq_nan_; 
+  }; 
+ 
+  void Init(FloatType max_abs_error_val, bool nan_eq_nan_val) { 
+    max_abs_error_ = max_abs_error_val; 
+    nan_eq_nan_ = nan_eq_nan_val; 
+  } 
+  FloatType max_abs_error_; 
+  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>
@@ -1827,7 +1827,7 @@ class PointeeMatcher {
   // enough for implementing the DescribeTo() method of Pointee().
   template <typename Pointer>
   operator Matcher<Pointer>() const {
-    return Matcher<Pointer>(new Impl<const Pointer&>(matcher_));
+    return Matcher<Pointer>(new Impl<const Pointer&>(matcher_)); 
   }
 
  private:
@@ -1835,26 +1835,26 @@ class PointeeMatcher {
   template <typename Pointer>
   class Impl : public MatcherInterface<Pointer> {
    public:
-    using Pointee =
-        typename std::pointer_traits<GTEST_REMOVE_REFERENCE_AND_CONST_(
-            Pointer)>::element_type;
+    using Pointee = 
+        typename std::pointer_traits<GTEST_REMOVE_REFERENCE_AND_CONST_( 
+            Pointer)>::element_type; 
 
     explicit Impl(const InnerMatcher& matcher)
         : matcher_(MatcherCast<const Pointee&>(matcher)) {}
 
-    void DescribeTo(::std::ostream* os) const override {
+    void DescribeTo(::std::ostream* os) const override { 
       *os << "points to a value that ";
       matcher_.DescribeTo(os);
     }
 
-    void DescribeNegationTo(::std::ostream* os) const override {
+    void DescribeNegationTo(::std::ostream* os) const override { 
       *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;
+    bool MatchAndExplain(Pointer pointer, 
+                         MatchResultListener* listener) const override { 
+      if (GetRawPointer(pointer) == nullptr) return false; 
 
       *listener << "which points to ";
       return MatchPrintAndExplain(*pointer, matcher_, listener);
@@ -1867,65 +1867,65 @@ class PointeeMatcher {
   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
-// raw pointer.
-template <typename InnerMatcher>
-class PointerMatcher {
- public:
-  explicit PointerMatcher(const InnerMatcher& matcher) : matcher_(matcher) {}
-
-  // This type conversion operator template allows Pointer(m) to be
-  // used as a matcher for any pointer type whose pointer type is
-  // compatible with the inner matcher, where type PointerType 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 Pointer().
-  template <typename PointerType>
-  operator Matcher<PointerType>() const {  // NOLINT
-    return Matcher<PointerType>(new Impl<const PointerType&>(matcher_));
-  }
-
- private:
-  // The monomorphic implementation that works for a particular pointer type.
-  template <typename PointerType>
-  class Impl : public MatcherInterface<PointerType> {
-   public:
-    using Pointer =
-        const typename std::pointer_traits<GTEST_REMOVE_REFERENCE_AND_CONST_(
-            PointerType)>::element_type*;
-
-    explicit Impl(const InnerMatcher& matcher)
-        : matcher_(MatcherCast<Pointer>(matcher)) {}
-
-    void DescribeTo(::std::ostream* os) const override {
-      *os << "is a pointer that ";
-      matcher_.DescribeTo(os);
-    }
-
-    void DescribeNegationTo(::std::ostream* os) const override {
-      *os << "is not a pointer that ";
-      matcher_.DescribeTo(os);
-    }
-
-    bool MatchAndExplain(PointerType pointer,
-                         MatchResultListener* listener) const override {
-      *listener << "which is a pointer that ";
-      Pointer p = GetRawPointer(pointer);
-      return MatchPrintAndExplain(p, matcher_, listener);
-    }
-
-   private:
-    Matcher<Pointer> matcher_;
-  };
-
-  const InnerMatcher matcher_;
-};
-
-#if GTEST_HAS_RTTI
+// 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 
+// raw pointer. 
+template <typename InnerMatcher> 
+class PointerMatcher { 
+ public: 
+  explicit PointerMatcher(const InnerMatcher& matcher) : matcher_(matcher) {} 
+ 
+  // This type conversion operator template allows Pointer(m) to be 
+  // used as a matcher for any pointer type whose pointer type is 
+  // compatible with the inner matcher, where type PointerType 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 Pointer(). 
+  template <typename PointerType> 
+  operator Matcher<PointerType>() const {  // NOLINT 
+    return Matcher<PointerType>(new Impl<const PointerType&>(matcher_)); 
+  } 
+ 
+ private: 
+  // The monomorphic implementation that works for a particular pointer type. 
+  template <typename PointerType> 
+  class Impl : public MatcherInterface<PointerType> { 
+   public: 
+    using Pointer = 
+        const typename std::pointer_traits<GTEST_REMOVE_REFERENCE_AND_CONST_( 
+            PointerType)>::element_type*; 
+ 
+    explicit Impl(const InnerMatcher& matcher) 
+        : matcher_(MatcherCast<Pointer>(matcher)) {} 
+ 
+    void DescribeTo(::std::ostream* os) const override { 
+      *os << "is a pointer that "; 
+      matcher_.DescribeTo(os); 
+    } 
+ 
+    void DescribeNegationTo(::std::ostream* os) const override { 
+      *os << "is not a pointer that "; 
+      matcher_.DescribeTo(os); 
+    } 
+ 
+    bool MatchAndExplain(PointerType pointer, 
+                         MatchResultListener* listener) const override { 
+      *listener << "which is a pointer that "; 
+      Pointer p = GetRawPointer(pointer); 
+      return MatchPrintAndExplain(p, matcher_, listener); 
+    } 
+ 
+   private: 
+    Matcher<Pointer> matcher_; 
+  }; 
+ 
+  const InnerMatcher matcher_; 
+}; 
+ 
+#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.
@@ -1951,7 +1951,7 @@ class WhenDynamicCastToMatcherBase {
  protected:
   const Matcher<To> matcher_;
 
-  static std::string GetToName() {
+  static std::string GetToName() { 
     return GetTypeName<To>();
   }
 
@@ -1988,14 +1988,14 @@ class WhenDynamicCastToMatcher<To&> : public WhenDynamicCastToMatcherBase<To&> {
   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) {
+    if (to == nullptr) { 
       *listener << "which cannot be dynamic_cast to " << this->GetToName();
       return false;
     }
     return MatchPrintAndExplain(*to, this->matcher_, listener);
   }
 };
-#endif  // GTEST_HAS_RTTI
+#endif  // GTEST_HAS_RTTI 
 
 // Implements the Field() matcher for matching a field (i.e. member
 // variable) of an object.
@@ -2004,126 +2004,126 @@ 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 + "` ") {}
-
+      : 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 {
-    *os << "is an object " << whose_field_;
+    *os << "is an object " << whose_field_; 
     matcher_.DescribeTo(os);
   }
 
   void DescribeNegationTo(::std::ostream* os) const {
-    *os << "is an object " << whose_field_;
+    *os << "is an object " << whose_field_; 
     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.
+    // FIXME: The dispatch on std::is_pointer was introduced as a workaround for 
+    // a compiler bug, and can now be removed. 
     return MatchAndExplainImpl(
-        typename std::is_pointer<typename std::remove_const<T>::type>::type(),
+        typename std::is_pointer<typename std::remove_const<T>::type>::type(), 
         value, listener);
   }
 
  private:
-  bool MatchAndExplainImpl(std::false_type /* is_not_pointer */,
-                           const Class& obj,
+  bool MatchAndExplainImpl(std::false_type /* is_not_pointer */, 
+                           const Class& obj, 
                            MatchResultListener* listener) const {
-    *listener << whose_field_ << "is ";
+    *listener << whose_field_ << "is "; 
     return MatchPrintAndExplain(obj.*field_, matcher_, listener);
   }
 
-  bool MatchAndExplainImpl(std::true_type /* is_pointer */, const Class* p,
+  bool MatchAndExplainImpl(std::true_type /* is_pointer */, const Class* p, 
                            MatchResultListener* listener) const {
-    if (p == nullptr) return false;
+    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.
-    return MatchAndExplainImpl(std::false_type(), *p, listener);
+    return MatchAndExplainImpl(std::false_type(), *p, listener); 
   }
 
   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_;
+  // 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.
-//
-// Property is a const-qualified member function of Class returning
-// PropertyType.
-template <typename Class, typename PropertyType, typename Property>
+// 
+// Property is a const-qualified member function of Class returning 
+// PropertyType. 
+template <typename Class, typename PropertyType, typename Property> 
 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,
+  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)
-      : property_(property),
-        matcher_(matcher),
-        whose_property_("whose property `" + property_name + "` ") {}
+      : property_(property), 
+        matcher_(matcher), 
+        whose_property_("whose property `" + property_name + "` ") {} 
 
   void DescribeTo(::std::ostream* os) const {
-    *os << "is an object " << whose_property_;
+    *os << "is an object " << whose_property_; 
     matcher_.DescribeTo(os);
   }
 
   void DescribeNegationTo(::std::ostream* os) const {
-    *os << "is an object " << whose_property_;
+    *os << "is an object " << whose_property_; 
     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(),
+        typename std::is_pointer<typename std::remove_const<T>::type>::type(), 
         value, listener);
   }
 
  private:
-  bool MatchAndExplainImpl(std::false_type /* is_not_pointer */,
-                           const Class& obj,
+  bool MatchAndExplainImpl(std::false_type /* is_not_pointer */, 
+                           const Class& obj, 
                            MatchResultListener* listener) const {
-    *listener << whose_property_ << "is ";
+    *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);
   }
 
-  bool MatchAndExplainImpl(std::true_type /* is_pointer */, const Class* p,
+  bool MatchAndExplainImpl(std::true_type /* is_pointer */, const Class* p, 
                            MatchResultListener* listener) const {
-    if (p == nullptr) return false;
+    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.
-    return MatchAndExplainImpl(std::false_type(), *p, listener);
+    return MatchAndExplainImpl(std::false_type(), *p, listener); 
   }
 
-  Property property_;
+  Property property_; 
   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_;
+  // 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.
@@ -2133,11 +2133,11 @@ 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);
-  }
+  static auto Invoke(Functor f, const T& arg) -> decltype(f(arg)) { 
+    return f(arg); 
+  } 
 };
 
 // Specialization for function pointers.
@@ -2147,7 +2147,7 @@ struct CallableTraits<ResType(*)(ArgType)> {
   typedef ResType(*StorageType)(ArgType);
 
   static void CheckIsValid(ResType(*f)(ArgType)) {
-    GTEST_CHECK_(f != nullptr)
+    GTEST_CHECK_(f != nullptr) 
         << "NULL function pointer is passed into ResultOf().";
   }
   template <typename T>
@@ -2158,17 +2158,17 @@ struct CallableTraits<ResType(*)(ArgType)> {
 
 // Implements the ResultOf() matcher for matching a return value of a
 // unary function of an object.
-template <typename Callable, typename InnerMatcher>
+template <typename Callable, typename InnerMatcher> 
 class ResultOfMatcher {
  public:
-  ResultOfMatcher(Callable callable, InnerMatcher matcher)
-      : callable_(std::move(callable)), matcher_(std::move(matcher)) {
+  ResultOfMatcher(Callable callable, InnerMatcher matcher) 
+      : callable_(std::move(callable)), matcher_(std::move(matcher)) { 
     CallableTraits<Callable>::CheckIsValid(callable_);
   }
 
   template <typename T>
   operator Matcher<T>() const {
-    return Matcher<T>(new Impl<const T&>(callable_, matcher_));
+    return Matcher<T>(new Impl<const T&>(callable_, matcher_)); 
   }
 
  private:
@@ -2176,30 +2176,30 @@ class ResultOfMatcher {
 
   template <typename T>
   class Impl : public MatcherInterface<T> {
-    using ResultType = decltype(CallableTraits<Callable>::template Invoke<T>(
-        std::declval<CallableStorageType>(), std::declval<T>()));
-
+    using ResultType = decltype(CallableTraits<Callable>::template Invoke<T>( 
+        std::declval<CallableStorageType>(), std::declval<T>())); 
+ 
    public:
-    template <typename M>
-    Impl(const CallableStorageType& callable, const M& matcher)
-        : callable_(callable), matcher_(MatcherCast<ResultType>(matcher)) {}
+    template <typename M> 
+    Impl(const CallableStorageType& callable, const M& matcher) 
+        : callable_(callable), matcher_(MatcherCast<ResultType>(matcher)) {} 
 
-    void DescribeTo(::std::ostream* os) const override {
+    void DescribeTo(::std::ostream* os) const override { 
       *os << "is mapped by the given callable to a value that ";
       matcher_.DescribeTo(os);
     }
 
-    void DescribeNegationTo(::std::ostream* os) const override {
+    void DescribeNegationTo(::std::ostream* os) const override { 
       *os << "is mapped by the given callable to a value that ";
       matcher_.DescribeNegationTo(os);
     }
 
-    bool MatchAndExplain(T obj, MatchResultListener* listener) const override {
+    bool MatchAndExplain(T obj, MatchResultListener* listener) const override { 
       *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&>).
+      // 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);
@@ -2207,16 +2207,16 @@ class ResultOfMatcher {
 
    private:
     // Functors often define operator() as non-const method even though
-    // they are actually stateless. But we need to use them even when
+    // 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
-    // use stateful callables with ResultOf(), which doesn't guarantee
+    // 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_;
-  const InnerMatcher matcher_;
+  const InnerMatcher matcher_; 
 };
 
 // Implements a matcher that checks the size of an STL-style container.
@@ -2229,27 +2229,27 @@ class SizeIsMatcher {
 
   template <typename Container>
   operator Matcher<Container>() const {
-    return Matcher<Container>(new Impl<const Container&>(size_matcher_));
+    return Matcher<Container>(new Impl<const Container&>(size_matcher_)); 
   }
 
   template <typename Container>
   class Impl : public MatcherInterface<Container> {
    public:
-    using SizeType = decltype(std::declval<Container>().size());
+    using SizeType = decltype(std::declval<Container>().size()); 
     explicit Impl(const SizeMatcher& size_matcher)
         : size_matcher_(MatcherCast<SizeType>(size_matcher)) {}
 
-    void DescribeTo(::std::ostream* os) const override {
+    void DescribeTo(::std::ostream* os) const override { 
       *os << "size ";
       size_matcher_.DescribeTo(os);
     }
-    void DescribeNegationTo(::std::ostream* os) const override {
+    void DescribeNegationTo(::std::ostream* os) const override { 
       *os << "size ";
       size_matcher_.DescribeNegationTo(os);
     }
 
-    bool MatchAndExplain(Container container,
-                         MatchResultListener* listener) const override {
+    bool MatchAndExplain(Container container, 
+                         MatchResultListener* listener) const override { 
       SizeType size = container.size();
       StringMatchResultListener size_listener;
       const bool result = size_matcher_.MatchAndExplain(size, &size_listener);
@@ -2277,7 +2277,7 @@ class BeginEndDistanceIsMatcher {
 
   template <typename Container>
   operator Matcher<Container>() const {
-    return Matcher<Container>(new Impl<const Container&>(distance_matcher_));
+    return Matcher<Container>(new Impl<const Container&>(distance_matcher_)); 
   }
 
   template <typename Container>
@@ -2291,17 +2291,17 @@ class BeginEndDistanceIsMatcher {
     explicit Impl(const DistanceMatcher& distance_matcher)
         : distance_matcher_(MatcherCast<DistanceType>(distance_matcher)) {}
 
-    void DescribeTo(::std::ostream* os) const override {
+    void DescribeTo(::std::ostream* os) const override { 
       *os << "distance between begin() and end() ";
       distance_matcher_.DescribeTo(os);
     }
-    void DescribeNegationTo(::std::ostream* os) const override {
+    void DescribeNegationTo(::std::ostream* os) const override { 
       *os << "distance between begin() and end() ";
       distance_matcher_.DescribeNegationTo(os);
     }
 
-    bool MatchAndExplain(Container container,
-                         MatchResultListener* listener) const override {
+    bool MatchAndExplain(Container container, 
+                         MatchResultListener* listener) const override { 
       using std::begin;
       using std::end;
       DistanceType distance = std::distance(begin(container), end(container));
@@ -2339,15 +2339,15 @@ class ContainerEqMatcher {
   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");
-
+  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)
-      : expected_(View::Copy(expected)) {}
+      : expected_(View::Copy(expected)) {} 
 
   void DescribeTo(::std::ostream* os) const {
     *os << "equals ";
@@ -2361,8 +2361,8 @@ class ContainerEqMatcher {
   template <typename LhsContainer>
   bool MatchAndExplain(const LhsContainer& lhs,
                        MatchResultListener* listener) const {
-    typedef internal::StlContainerView<
-        typename std::remove_const<LhsContainer>::type>
+    typedef internal::StlContainerView< 
+        typename std::remove_const<LhsContainer>::type> 
         LhsView;
     typedef typename LhsView::type LhsStlContainer;
     StlContainerReference lhs_stl_container = LhsView::ConstReference(lhs);
@@ -2370,7 +2370,7 @@ class ContainerEqMatcher {
       return true;
 
     ::std::ostream* const os = listener->stream();
-    if (os != nullptr) {
+    if (os != nullptr) { 
       // Something is different. Check for extra values first.
       bool printed_header = false;
       for (typename LhsStlContainer::const_iterator it =
@@ -2448,18 +2448,18 @@ class WhenSortedByMatcher {
     Impl(const Comparator& comparator, const ContainerMatcher& matcher)
         : comparator_(comparator), matcher_(matcher) {}
 
-    void DescribeTo(::std::ostream* os) const override {
+    void DescribeTo(::std::ostream* os) const override { 
       *os << "(when sorted) ";
       matcher_.DescribeTo(os);
     }
 
-    void DescribeNegationTo(::std::ostream* os) const override {
+    void DescribeNegationTo(::std::ostream* os) const override { 
       *os << "(when sorted) ";
       matcher_.DescribeNegationTo(os);
     }
 
-    bool MatchAndExplain(LhsContainer lhs,
-                         MatchResultListener* listener) const override {
+    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());
@@ -2496,38 +2496,38 @@ class WhenSortedByMatcher {
 };
 
 // Implements Pointwise(tuple_matcher, rhs_container).  tuple_matcher
-// must be able to be safely cast to Matcher<std::tuple<const T1&, const
+// 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 {
-  GTEST_COMPILE_ASSERT_(
-      !IsHashTable<GTEST_REMOVE_REFERENCE_AND_CONST_(RhsContainer)>::value,
-      use_UnorderedPointwise_with_hash_tables);
-
+  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;
 
-  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");
-
+  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)
-      : tuple_matcher_(tuple_matcher), rhs_(RhsView::Copy(rhs)) {}
+      : tuple_matcher_(tuple_matcher), rhs_(RhsView::Copy(rhs)) {} 
 
   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_));
+    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>
@@ -2542,21 +2542,21 @@ class PointwiseMatcher {
     // 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;
+    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) {}
 
-    void DescribeTo(::std::ostream* os) const override {
+    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);
     }
-    void DescribeNegationTo(::std::ostream* os) const override {
+    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 ";
@@ -2565,8 +2565,8 @@ class PointwiseMatcher {
       mono_tuple_matcher_.DescribeNegationTo(os);
     }
 
-    bool MatchAndExplain(LhsContainer lhs,
-                         MatchResultListener* listener) const override {
+    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()) {
@@ -2579,13 +2579,13 @@ class PointwiseMatcher {
       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>.
+          // 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(
-                  InnerMatcherArg(ImplicitCast_<const LhsValue&>(*left),
-                                  ImplicitCast_<const RhsValue&>(*right)),
-                  &inner_listener)) {
+                  InnerMatcherArg(ImplicitCast_<const LhsValue&>(*left), 
+                                  ImplicitCast_<const RhsValue&>(*right)), 
+                  &inner_listener)) { 
             *listener << "where the value pair (";
             UniversalPrint(*left, listener->stream());
             *listener << ", ";
@@ -2595,9 +2595,9 @@ class PointwiseMatcher {
             return false;
           }
         } else {
-          if (!mono_tuple_matcher_.Matches(
-                  InnerMatcherArg(ImplicitCast_<const LhsValue&>(*left),
-                                  ImplicitCast_<const RhsValue&>(*right))))
+          if (!mono_tuple_matcher_.Matches( 
+                  InnerMatcherArg(ImplicitCast_<const LhsValue&>(*left), 
+                                  ImplicitCast_<const RhsValue&>(*right)))) 
             return false;
         }
       }
@@ -2667,18 +2667,18 @@ class ContainsMatcherImpl : public QuantifierMatcherImpl<Container> {
       : QuantifierMatcherImpl<Container>(inner_matcher) {}
 
   // Describes what this matcher does.
-  void DescribeTo(::std::ostream* os) const override {
+  void DescribeTo(::std::ostream* os) const override { 
     *os << "contains at least one element that ";
     this->inner_matcher_.DescribeTo(os);
   }
 
-  void DescribeNegationTo(::std::ostream* os) const override {
+  void DescribeNegationTo(::std::ostream* os) const override { 
     *os << "doesn't contain any element that ";
     this->inner_matcher_.DescribeTo(os);
   }
 
-  bool MatchAndExplain(Container container,
-                       MatchResultListener* listener) const override {
+  bool MatchAndExplain(Container container, 
+                       MatchResultListener* listener) const override { 
     return this->MatchAndExplainImpl(false, container, listener);
   }
 };
@@ -2693,18 +2693,18 @@ class EachMatcherImpl : public QuantifierMatcherImpl<Container> {
       : QuantifierMatcherImpl<Container>(inner_matcher) {}
 
   // Describes what this matcher does.
-  void DescribeTo(::std::ostream* os) const override {
+  void DescribeTo(::std::ostream* os) const override { 
     *os << "only contains elements that ";
     this->inner_matcher_.DescribeTo(os);
   }
 
-  void DescribeNegationTo(::std::ostream* os) const override {
+  void DescribeNegationTo(::std::ostream* os) const override { 
     *os << "contains some element that ";
     this->inner_matcher_.DescribeNegationTo(os);
   }
 
-  bool MatchAndExplain(Container container,
-                       MatchResultListener* listener) const override {
+  bool MatchAndExplain(Container container, 
+                       MatchResultListener* listener) const override { 
     return this->MatchAndExplainImpl(true, container, listener);
   }
 };
@@ -2717,8 +2717,8 @@ class ContainsMatcher {
 
   template <typename Container>
   operator Matcher<Container>() const {
-    return Matcher<Container>(
-        new ContainsMatcherImpl<const Container&>(inner_matcher_));
+    return Matcher<Container>( 
+        new ContainsMatcherImpl<const Container&>(inner_matcher_)); 
   }
 
  private:
@@ -2733,38 +2733,38 @@ class EachMatcher {
 
   template <typename Container>
   operator Matcher<Container>() const {
-    return Matcher<Container>(
-        new EachMatcherImpl<const Container&>(inner_matcher_));
+    return Matcher<Container>( 
+        new EachMatcherImpl<const Container&>(inner_matcher_)); 
   }
 
  private:
   const M inner_matcher_;
 };
 
-struct Rank1 {};
-struct Rank0 : Rank1 {};
-
-namespace pair_getters {
-using std::get;
-template <typename T>
-auto First(T& x, Rank1) -> decltype(get<0>(x)) {  // NOLINT
-  return get<0>(x);
-}
-template <typename T>
-auto First(T& x, Rank0) -> decltype((x.first)) {  // NOLINT
-  return x.first;
-}
-
-template <typename T>
-auto Second(T& x, Rank1) -> decltype(get<1>(x)) {  // NOLINT
-  return get<1>(x);
-}
-template <typename T>
-auto Second(T& x, Rank0) -> decltype((x.second)) {  // NOLINT
-  return x.second;
-}
-}  // namespace pair_getters
-
+struct Rank1 {}; 
+struct Rank0 : Rank1 {}; 
+ 
+namespace pair_getters { 
+using std::get; 
+template <typename T> 
+auto First(T& x, Rank1) -> decltype(get<0>(x)) {  // NOLINT 
+  return get<0>(x); 
+} 
+template <typename T> 
+auto First(T& x, Rank0) -> decltype((x.first)) {  // NOLINT 
+  return x.first; 
+} 
+ 
+template <typename T> 
+auto Second(T& x, Rank1) -> decltype(get<1>(x)) {  // NOLINT 
+  return get<1>(x); 
+} 
+template <typename T> 
+auto Second(T& x, Rank0) -> decltype((x.second)) {  // NOLINT 
+  return x.second; 
+} 
+}  // 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
@@ -2781,14 +2781,14 @@ class KeyMatcherImpl : public MatcherInterface<PairType> {
           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 {
+  // 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;
-    const bool match = inner_matcher_.MatchAndExplain(
-        pair_getters::First(key_value, Rank0()), &inner_listener);
-    const std::string explanation = inner_listener.str();
+    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;
     }
@@ -2796,13 +2796,13 @@ class KeyMatcherImpl : public MatcherInterface<PairType> {
   }
 
   // Describes what this matcher does.
-  void DescribeTo(::std::ostream* os) const override {
+  void DescribeTo(::std::ostream* os) const override { 
     *os << "has a key that ";
     inner_matcher_.DescribeTo(os);
   }
 
   // Describes what the negation of this matcher does.
-  void DescribeNegationTo(::std::ostream* os) const override {
+  void DescribeNegationTo(::std::ostream* os) const override { 
     *os << "doesn't have a key that ";
     inner_matcher_.DescribeTo(os);
   }
@@ -2819,57 +2819,57 @@ class KeyMatcher {
 
   template <typename PairType>
   operator Matcher<PairType>() const {
-    return Matcher<PairType>(
-        new KeyMatcherImpl<const PairType&>(matcher_for_key_));
+    return Matcher<PairType>( 
+        new KeyMatcherImpl<const PairType&>(matcher_for_key_)); 
   }
 
  private:
   const M matcher_for_key_;
 };
 
-// Implements polymorphic Address(matcher_for_address).
-template <typename InnerMatcher>
-class AddressMatcher {
- public:
-  explicit AddressMatcher(InnerMatcher m) : matcher_(m) {}
-
-  template <typename Type>
-  operator Matcher<Type>() const {  // NOLINT
-    return Matcher<Type>(new Impl<const Type&>(matcher_));
-  }
-
- private:
-  // The monomorphic implementation that works for a particular object type.
-  template <typename Type>
-  class Impl : public MatcherInterface<Type> {
-   public:
-    using Address = const GTEST_REMOVE_REFERENCE_AND_CONST_(Type) *;
-    explicit Impl(const InnerMatcher& matcher)
-        : matcher_(MatcherCast<Address>(matcher)) {}
-
-    void DescribeTo(::std::ostream* os) const override {
-      *os << "has address that ";
-      matcher_.DescribeTo(os);
-    }
-
-    void DescribeNegationTo(::std::ostream* os) const override {
-      *os << "does not have address that ";
-      matcher_.DescribeTo(os);
-    }
-
-    bool MatchAndExplain(Type object,
-                         MatchResultListener* listener) const override {
-      *listener << "which has address ";
-      Address address = std::addressof(object);
-      return MatchPrintAndExplain(address, matcher_, listener);
-    }
-
-   private:
-    const Matcher<Address> matcher_;
-  };
-  const InnerMatcher matcher_;
-};
-
+// Implements polymorphic Address(matcher_for_address). 
+template <typename InnerMatcher> 
+class AddressMatcher { 
+ public: 
+  explicit AddressMatcher(InnerMatcher m) : matcher_(m) {} 
+ 
+  template <typename Type> 
+  operator Matcher<Type>() const {  // NOLINT 
+    return Matcher<Type>(new Impl<const Type&>(matcher_)); 
+  } 
+ 
+ private: 
+  // The monomorphic implementation that works for a particular object type. 
+  template <typename Type> 
+  class Impl : public MatcherInterface<Type> { 
+   public: 
+    using Address = const GTEST_REMOVE_REFERENCE_AND_CONST_(Type) *; 
+    explicit Impl(const InnerMatcher& matcher) 
+        : matcher_(MatcherCast<Address>(matcher)) {} 
+ 
+    void DescribeTo(::std::ostream* os) const override { 
+      *os << "has address that "; 
+      matcher_.DescribeTo(os); 
+    } 
+ 
+    void DescribeNegationTo(::std::ostream* os) const override { 
+      *os << "does not have address that "; 
+      matcher_.DescribeTo(os); 
+    } 
+ 
+    bool MatchAndExplain(Type object, 
+                         MatchResultListener* listener) const override { 
+      *listener << "which has address "; 
+      Address address = std::addressof(object); 
+      return MatchPrintAndExplain(address, matcher_, listener); 
+    } 
+ 
+   private: 
+    const Matcher<Address> matcher_; 
+  }; 
+  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>
@@ -2888,7 +2888,7 @@ class PairMatcherImpl : public MatcherInterface<PairType> {
   }
 
   // Describes what this matcher does.
-  void DescribeTo(::std::ostream* os) const override {
+  void DescribeTo(::std::ostream* os) const override { 
     *os << "has a first field that ";
     first_matcher_.DescribeTo(os);
     *os << ", and has a second field that ";
@@ -2896,32 +2896,32 @@ class PairMatcherImpl : public MatcherInterface<PairType> {
   }
 
   // Describes what the negation of this matcher does.
-  void DescribeNegationTo(::std::ostream* os) const override {
+  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);
   }
 
-  // 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 {
+  // 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.
-      return first_matcher_.Matches(pair_getters::First(a_pair, Rank0())) &&
-             second_matcher_.Matches(pair_getters::Second(a_pair, Rank0()));
+      return first_matcher_.Matches(pair_getters::First(a_pair, Rank0())) && 
+             second_matcher_.Matches(pair_getters::Second(a_pair, Rank0())); 
     }
     StringMatchResultListener first_inner_listener;
-    if (!first_matcher_.MatchAndExplain(pair_getters::First(a_pair, Rank0()),
+    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;
-    if (!second_matcher_.MatchAndExplain(pair_getters::Second(a_pair, Rank0()),
+    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());
@@ -2933,8 +2933,8 @@ class PairMatcherImpl : public MatcherInterface<PairType> {
   }
 
  private:
-  void ExplainSuccess(const std::string& first_explanation,
-                      const std::string& second_explanation,
+  void ExplainSuccess(const std::string& first_explanation, 
+                      const std::string& second_explanation, 
                       MatchResultListener* listener) const {
     *listener << "whose both fields match";
     if (first_explanation != "") {
@@ -2964,8 +2964,8 @@ class PairMatcher {
 
   template <typename PairType>
   operator Matcher<PairType> () const {
-    return Matcher<PairType>(
-        new PairMatcherImpl<const PairType&>(first_matcher_, second_matcher_));
+    return Matcher<PairType>( 
+        new PairMatcherImpl<const PairType&>(first_matcher_, second_matcher_)); 
   }
 
  private:
@@ -2973,203 +2973,203 @@ class PairMatcher {
   const SecondMatcher second_matcher_;
 };
 
-template <typename T, size_t... I>
-auto UnpackStructImpl(const T& t, IndexSequence<I...>, int)
-    -> decltype(std::tie(get<I>(t)...)) {
-  static_assert(std::tuple_size<T>::value == sizeof...(I),
-                "Number of arguments doesn't match the number of fields.");
-  return std::tie(get<I>(t)...);
-}
-
-#if defined(__cpp_structured_bindings) && __cpp_structured_bindings >= 201606
-template <typename T>
-auto UnpackStructImpl(const T& t, MakeIndexSequence<1>, char) {
-  const auto& [a] = t;
-  return std::tie(a);
-}
-template <typename T>
-auto UnpackStructImpl(const T& t, MakeIndexSequence<2>, char) {
-  const auto& [a, b] = t;
-  return std::tie(a, b);
-}
-template <typename T>
-auto UnpackStructImpl(const T& t, MakeIndexSequence<3>, char) {
-  const auto& [a, b, c] = t;
-  return std::tie(a, b, c);
-}
-template <typename T>
-auto UnpackStructImpl(const T& t, MakeIndexSequence<4>, char) {
-  const auto& [a, b, c, d] = t;
-  return std::tie(a, b, c, d);
-}
-template <typename T>
-auto UnpackStructImpl(const T& t, MakeIndexSequence<5>, char) {
-  const auto& [a, b, c, d, e] = t;
-  return std::tie(a, b, c, d, e);
-}
-template <typename T>
-auto UnpackStructImpl(const T& t, MakeIndexSequence<6>, char) {
-  const auto& [a, b, c, d, e, f] = t;
-  return std::tie(a, b, c, d, e, f);
-}
-template <typename T>
-auto UnpackStructImpl(const T& t, MakeIndexSequence<7>, char) {
-  const auto& [a, b, c, d, e, f, g] = t;
-  return std::tie(a, b, c, d, e, f, g);
-}
-template <typename T>
-auto UnpackStructImpl(const T& t, MakeIndexSequence<8>, char) {
-  const auto& [a, b, c, d, e, f, g, h] = t;
-  return std::tie(a, b, c, d, e, f, g, h);
-}
-template <typename T>
-auto UnpackStructImpl(const T& t, MakeIndexSequence<9>, char) {
-  const auto& [a, b, c, d, e, f, g, h, i] = t;
-  return std::tie(a, b, c, d, e, f, g, h, i);
-}
-template <typename T>
-auto UnpackStructImpl(const T& t, MakeIndexSequence<10>, char) {
-  const auto& [a, b, c, d, e, f, g, h, i, j] = t;
-  return std::tie(a, b, c, d, e, f, g, h, i, j);
-}
-template <typename T>
-auto UnpackStructImpl(const T& t, MakeIndexSequence<11>, char) {
-  const auto& [a, b, c, d, e, f, g, h, i, j, k] = t;
-  return std::tie(a, b, c, d, e, f, g, h, i, j, k);
-}
-template <typename T>
-auto UnpackStructImpl(const T& t, MakeIndexSequence<12>, char) {
-  const auto& [a, b, c, d, e, f, g, h, i, j, k, l] = t;
-  return std::tie(a, b, c, d, e, f, g, h, i, j, k, l);
-}
-template <typename T>
-auto UnpackStructImpl(const T& t, MakeIndexSequence<13>, char) {
-  const auto& [a, b, c, d, e, f, g, h, i, j, k, l, m] = t;
-  return std::tie(a, b, c, d, e, f, g, h, i, j, k, l, m);
-}
-template <typename T>
-auto UnpackStructImpl(const T& t, MakeIndexSequence<14>, char) {
-  const auto& [a, b, c, d, e, f, g, h, i, j, k, l, m, n] = t;
-  return std::tie(a, b, c, d, e, f, g, h, i, j, k, l, m, n);
-}
-template <typename T>
-auto UnpackStructImpl(const T& t, MakeIndexSequence<15>, char) {
-  const auto& [a, b, c, d, e, f, g, h, i, j, k, l, m, n, o] = t;
-  return std::tie(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o);
-}
-template <typename T>
-auto UnpackStructImpl(const T& t, MakeIndexSequence<16>, char) {
-  const auto& [a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p] = t;
-  return std::tie(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p);
-}
-#endif  // defined(__cpp_structured_bindings)
-
-template <size_t I, typename T>
-auto UnpackStruct(const T& t)
-    -> decltype((UnpackStructImpl)(t, MakeIndexSequence<I>{}, 0)) {
-  return (UnpackStructImpl)(t, MakeIndexSequence<I>{}, 0);
-}
-
-// Helper function to do comma folding in C++11.
-// The array ensures left-to-right order of evaluation.
-// Usage: VariadicExpand({expr...});
-template <typename T, size_t N>
-void VariadicExpand(const T (&)[N]) {}
-
-template <typename Struct, typename StructSize>
-class FieldsAreMatcherImpl;
-
-template <typename Struct, size_t... I>
-class FieldsAreMatcherImpl<Struct, IndexSequence<I...>>
-    : public MatcherInterface<Struct> {
-  using UnpackedType =
-      decltype(UnpackStruct<sizeof...(I)>(std::declval<const Struct&>()));
-  using MatchersType = std::tuple<
-      Matcher<const typename std::tuple_element<I, UnpackedType>::type&>...>;
-
- public:
-  template <typename Inner>
-  explicit FieldsAreMatcherImpl(const Inner& matchers)
-      : matchers_(testing::SafeMatcherCast<
-                  const typename std::tuple_element<I, UnpackedType>::type&>(
-            std::get<I>(matchers))...) {}
-
-  void DescribeTo(::std::ostream* os) const override {
-    const char* separator = "";
-    VariadicExpand(
-        {(*os << separator << "has field #" << I << " that ",
-          std::get<I>(matchers_).DescribeTo(os), separator = ", and ")...});
-  }
-
-  void DescribeNegationTo(::std::ostream* os) const override {
-    const char* separator = "";
-    VariadicExpand({(*os << separator << "has field #" << I << " that ",
-                     std::get<I>(matchers_).DescribeNegationTo(os),
-                     separator = ", or ")...});
-  }
-
-  bool MatchAndExplain(Struct t, MatchResultListener* listener) const override {
-    return MatchInternal((UnpackStruct<sizeof...(I)>)(t), listener);
-  }
-
- private:
-  bool MatchInternal(UnpackedType tuple, MatchResultListener* listener) const {
-    if (!listener->IsInterested()) {
-      // If the listener is not interested, we don't need to construct the
-      // explanation.
-      bool good = true;
-      VariadicExpand({good = good && std::get<I>(matchers_).Matches(
-                                         std::get<I>(tuple))...});
-      return good;
-    }
-
-    size_t failed_pos = ~size_t{};
-
-    std::vector<StringMatchResultListener> inner_listener(sizeof...(I));
-
-    VariadicExpand(
-        {failed_pos == ~size_t{} && !std::get<I>(matchers_).MatchAndExplain(
-                                        std::get<I>(tuple), &inner_listener[I])
-             ? failed_pos = I
-             : 0 ...});
-    if (failed_pos != ~size_t{}) {
-      *listener << "whose field #" << failed_pos << " does not match";
-      PrintIfNotEmpty(inner_listener[failed_pos].str(), listener->stream());
-      return false;
-    }
-
-    *listener << "whose all elements match";
-    const char* separator = ", where";
-    for (size_t index = 0; index < sizeof...(I); ++index) {
-      const std::string str = inner_listener[index].str();
-      if (!str.empty()) {
-        *listener << separator << " field #" << index << " is a value " << str;
-        separator = ", and";
-      }
-    }
-
-    return true;
-  }
-
-  MatchersType matchers_;
-};
-
-template <typename... Inner>
-class FieldsAreMatcher {
- public:
-  explicit FieldsAreMatcher(Inner... inner) : matchers_(std::move(inner)...) {}
-
-  template <typename Struct>
-  operator Matcher<Struct>() const {  // NOLINT
-    return Matcher<Struct>(
-        new FieldsAreMatcherImpl<const Struct&, IndexSequenceFor<Inner...>>(
-            matchers_));
-  }
-
- private:
-  std::tuple<Inner...> matchers_;
-};
-
+template <typename T, size_t... I> 
+auto UnpackStructImpl(const T& t, IndexSequence<I...>, int) 
+    -> decltype(std::tie(get<I>(t)...)) { 
+  static_assert(std::tuple_size<T>::value == sizeof...(I), 
+                "Number of arguments doesn't match the number of fields."); 
+  return std::tie(get<I>(t)...); 
+} 
+ 
+#if defined(__cpp_structured_bindings) && __cpp_structured_bindings >= 201606 
+template <typename T> 
+auto UnpackStructImpl(const T& t, MakeIndexSequence<1>, char) { 
+  const auto& [a] = t; 
+  return std::tie(a); 
+} 
+template <typename T> 
+auto UnpackStructImpl(const T& t, MakeIndexSequence<2>, char) { 
+  const auto& [a, b] = t; 
+  return std::tie(a, b); 
+} 
+template <typename T> 
+auto UnpackStructImpl(const T& t, MakeIndexSequence<3>, char) { 
+  const auto& [a, b, c] = t; 
+  return std::tie(a, b, c); 
+} 
+template <typename T> 
+auto UnpackStructImpl(const T& t, MakeIndexSequence<4>, char) { 
+  const auto& [a, b, c, d] = t; 
+  return std::tie(a, b, c, d); 
+} 
+template <typename T> 
+auto UnpackStructImpl(const T& t, MakeIndexSequence<5>, char) { 
+  const auto& [a, b, c, d, e] = t; 
+  return std::tie(a, b, c, d, e); 
+} 
+template <typename T> 
+auto UnpackStructImpl(const T& t, MakeIndexSequence<6>, char) { 
+  const auto& [a, b, c, d, e, f] = t; 
+  return std::tie(a, b, c, d, e, f); 
+} 
+template <typename T> 
+auto UnpackStructImpl(const T& t, MakeIndexSequence<7>, char) { 
+  const auto& [a, b, c, d, e, f, g] = t; 
+  return std::tie(a, b, c, d, e, f, g); 
+} 
+template <typename T> 
+auto UnpackStructImpl(const T& t, MakeIndexSequence<8>, char) { 
+  const auto& [a, b, c, d, e, f, g, h] = t; 
+  return std::tie(a, b, c, d, e, f, g, h); 
+} 
+template <typename T> 
+auto UnpackStructImpl(const T& t, MakeIndexSequence<9>, char) { 
+  const auto& [a, b, c, d, e, f, g, h, i] = t; 
+  return std::tie(a, b, c, d, e, f, g, h, i); 
+} 
+template <typename T> 
+auto UnpackStructImpl(const T& t, MakeIndexSequence<10>, char) { 
+  const auto& [a, b, c, d, e, f, g, h, i, j] = t; 
+  return std::tie(a, b, c, d, e, f, g, h, i, j); 
+} 
+template <typename T> 
+auto UnpackStructImpl(const T& t, MakeIndexSequence<11>, char) { 
+  const auto& [a, b, c, d, e, f, g, h, i, j, k] = t; 
+  return std::tie(a, b, c, d, e, f, g, h, i, j, k); 
+} 
+template <typename T> 
+auto UnpackStructImpl(const T& t, MakeIndexSequence<12>, char) { 
+  const auto& [a, b, c, d, e, f, g, h, i, j, k, l] = t; 
+  return std::tie(a, b, c, d, e, f, g, h, i, j, k, l); 
+} 
+template <typename T> 
+auto UnpackStructImpl(const T& t, MakeIndexSequence<13>, char) { 
+  const auto& [a, b, c, d, e, f, g, h, i, j, k, l, m] = t; 
+  return std::tie(a, b, c, d, e, f, g, h, i, j, k, l, m); 
+} 
+template <typename T> 
+auto UnpackStructImpl(const T& t, MakeIndexSequence<14>, char) { 
+  const auto& [a, b, c, d, e, f, g, h, i, j, k, l, m, n] = t; 
+  return std::tie(a, b, c, d, e, f, g, h, i, j, k, l, m, n); 
+} 
+template <typename T> 
+auto UnpackStructImpl(const T& t, MakeIndexSequence<15>, char) { 
+  const auto& [a, b, c, d, e, f, g, h, i, j, k, l, m, n, o] = t; 
+  return std::tie(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o); 
+} 
+template <typename T> 
+auto UnpackStructImpl(const T& t, MakeIndexSequence<16>, char) { 
+  const auto& [a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p] = t; 
+  return std::tie(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p); 
+} 
+#endif  // defined(__cpp_structured_bindings) 
+ 
+template <size_t I, typename T> 
+auto UnpackStruct(const T& t) 
+    -> decltype((UnpackStructImpl)(t, MakeIndexSequence<I>{}, 0)) { 
+  return (UnpackStructImpl)(t, MakeIndexSequence<I>{}, 0); 
+} 
+ 
+// Helper function to do comma folding in C++11. 
+// The array ensures left-to-right order of evaluation. 
+// Usage: VariadicExpand({expr...}); 
+template <typename T, size_t N> 
+void VariadicExpand(const T (&)[N]) {} 
+ 
+template <typename Struct, typename StructSize> 
+class FieldsAreMatcherImpl; 
+ 
+template <typename Struct, size_t... I> 
+class FieldsAreMatcherImpl<Struct, IndexSequence<I...>> 
+    : public MatcherInterface<Struct> { 
+  using UnpackedType = 
+      decltype(UnpackStruct<sizeof...(I)>(std::declval<const Struct&>())); 
+  using MatchersType = std::tuple< 
+      Matcher<const typename std::tuple_element<I, UnpackedType>::type&>...>; 
+ 
+ public: 
+  template <typename Inner> 
+  explicit FieldsAreMatcherImpl(const Inner& matchers) 
+      : matchers_(testing::SafeMatcherCast< 
+                  const typename std::tuple_element<I, UnpackedType>::type&>( 
+            std::get<I>(matchers))...) {} 
+ 
+  void DescribeTo(::std::ostream* os) const override { 
+    const char* separator = ""; 
+    VariadicExpand( 
+        {(*os << separator << "has field #" << I << " that ", 
+          std::get<I>(matchers_).DescribeTo(os), separator = ", and ")...}); 
+  } 
+ 
+  void DescribeNegationTo(::std::ostream* os) const override { 
+    const char* separator = ""; 
+    VariadicExpand({(*os << separator << "has field #" << I << " that ", 
+                     std::get<I>(matchers_).DescribeNegationTo(os), 
+                     separator = ", or ")...}); 
+  } 
+ 
+  bool MatchAndExplain(Struct t, MatchResultListener* listener) const override { 
+    return MatchInternal((UnpackStruct<sizeof...(I)>)(t), listener); 
+  } 
+ 
+ private: 
+  bool MatchInternal(UnpackedType tuple, MatchResultListener* listener) const { 
+    if (!listener->IsInterested()) { 
+      // If the listener is not interested, we don't need to construct the 
+      // explanation. 
+      bool good = true; 
+      VariadicExpand({good = good && std::get<I>(matchers_).Matches( 
+                                         std::get<I>(tuple))...}); 
+      return good; 
+    } 
+ 
+    size_t failed_pos = ~size_t{}; 
+ 
+    std::vector<StringMatchResultListener> inner_listener(sizeof...(I)); 
+ 
+    VariadicExpand( 
+        {failed_pos == ~size_t{} && !std::get<I>(matchers_).MatchAndExplain( 
+                                        std::get<I>(tuple), &inner_listener[I]) 
+             ? failed_pos = I 
+             : 0 ...}); 
+    if (failed_pos != ~size_t{}) { 
+      *listener << "whose field #" << failed_pos << " does not match"; 
+      PrintIfNotEmpty(inner_listener[failed_pos].str(), listener->stream()); 
+      return false; 
+    } 
+ 
+    *listener << "whose all elements match"; 
+    const char* separator = ", where"; 
+    for (size_t index = 0; index < sizeof...(I); ++index) { 
+      const std::string str = inner_listener[index].str(); 
+      if (!str.empty()) { 
+        *listener << separator << " field #" << index << " is a value " << str; 
+        separator = ", and"; 
+      } 
+    } 
+ 
+    return true; 
+  } 
+ 
+  MatchersType matchers_; 
+}; 
+ 
+template <typename... Inner> 
+class FieldsAreMatcher { 
+ public: 
+  explicit FieldsAreMatcher(Inner... inner) : matchers_(std::move(inner)...) {} 
+ 
+  template <typename Struct> 
+  operator Matcher<Struct>() const {  // NOLINT 
+    return Matcher<Struct>( 
+        new FieldsAreMatcherImpl<const Struct&, IndexSequenceFor<Inner...>>( 
+            matchers_)); 
+  } 
+ 
+ private: 
+  std::tuple<Inner...> matchers_; 
+}; 
+ 
 // Implements ElementsAre() and ElementsAreArray().
 template <typename Container>
 class ElementsAreMatcherImpl : public MatcherInterface<Container> {
@@ -3190,7 +3190,7 @@ class ElementsAreMatcherImpl : public MatcherInterface<Container> {
   }
 
   // Describes what this matcher does.
-  void DescribeTo(::std::ostream* os) const override {
+  void DescribeTo(::std::ostream* os) const override { 
     if (count() == 0) {
       *os << "is empty";
     } else if (count() == 1) {
@@ -3209,7 +3209,7 @@ class ElementsAreMatcherImpl : public MatcherInterface<Container> {
   }
 
   // Describes what the negation of this matcher does.
-  void DescribeNegationTo(::std::ostream* os) const override {
+  void DescribeNegationTo(::std::ostream* os) const override { 
     if (count() == 0) {
       *os << "isn't empty";
       return;
@@ -3225,15 +3225,15 @@ class ElementsAreMatcherImpl : public MatcherInterface<Container> {
     }
   }
 
-  bool MatchAndExplain(Container container,
-                       MatchResultListener* listener) const override {
+  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.
-    ::std::vector<std::string> explanations(count());
+    ::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;
@@ -3292,7 +3292,7 @@ class ElementsAreMatcherImpl : public MatcherInterface<Container> {
     if (listener_interested) {
       bool reason_printed = false;
       for (size_t i = 0; i != count(); ++i) {
-        const std::string& s = explanations[i];
+        const std::string& s = explanations[i]; 
         if (!s.empty()) {
           if (reason_printed) {
             *listener << ",\nand ";
@@ -3343,7 +3343,7 @@ class GTEST_API_ MatchMatrix {
 
   void Randomize();
 
-  std::string DebugString() const;
+  std::string DebugString() const; 
 
  private:
   size_t SpaceIndex(size_t ilhs, size_t irhs) const {
@@ -3367,23 +3367,23 @@ typedef ::std::vector<ElementMatcherPair> ElementMatcherPairs;
 GTEST_API_ ElementMatcherPairs
 FindMaxBipartiteMatching(const MatchMatrix& g);
 
-struct UnorderedMatcherRequire {
-  enum Flags {
-    Superset = 1 << 0,
-    Subset = 1 << 1,
-    ExactMatch = Superset | Subset,
-  };
-};
+struct UnorderedMatcherRequire { 
+  enum Flags { 
+    Superset = 1 << 0, 
+    Subset = 1 << 1, 
+    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:
-  explicit UnorderedElementsAreMatcherImplBase(
-      UnorderedMatcherRequire::Flags matcher_flags)
-      : match_flags_(matcher_flags) {}
-
+  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).
@@ -3395,13 +3395,13 @@ class GTEST_API_ UnorderedElementsAreMatcherImplBase {
   // 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;
+  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_;
   }
@@ -3410,15 +3410,15 @@ class GTEST_API_ UnorderedElementsAreMatcherImplBase {
     return Message() << n << " element" << (n == 1 ? "" : "s");
   }
 
-  UnorderedMatcherRequire::Flags match_flags() const { return match_flags_; }
-
+  UnorderedMatcherRequire::Flags match_flags() const { return match_flags_; } 
+ 
  private:
-  UnorderedMatcherRequire::Flags match_flags_;
+  UnorderedMatcherRequire::Flags match_flags_; 
   MatcherDescriberVec matcher_describers_;
 };
 
-// Implements UnorderedElementsAre, UnorderedElementsAreArray, IsSubsetOf, and
-// IsSupersetOf.
+// Implements UnorderedElementsAre, UnorderedElementsAreArray, IsSubsetOf, and 
+// IsSupersetOf. 
 template <typename Container>
 class UnorderedElementsAreMatcherImpl
     : public MatcherInterface<Container>,
@@ -3432,72 +3432,72 @@ class UnorderedElementsAreMatcherImpl
   typedef typename StlContainer::value_type Element;
 
   template <typename InputIter>
-  UnorderedElementsAreMatcherImpl(UnorderedMatcherRequire::Flags matcher_flags,
-                                  InputIter first, InputIter last)
-      : UnorderedElementsAreMatcherImplBase(matcher_flags) {
+  UnorderedElementsAreMatcherImpl(UnorderedMatcherRequire::Flags matcher_flags, 
+                                  InputIter first, InputIter last) 
+      : UnorderedElementsAreMatcherImplBase(matcher_flags) { 
     for (; first != last; ++first) {
       matchers_.push_back(MatcherCast<const Element&>(*first));
     }
-    for (const auto& m : matchers_) {
-      matcher_describers().push_back(m.GetDescriber());
-    }
+    for (const auto& m : matchers_) { 
+      matcher_describers().push_back(m.GetDescriber()); 
+    } 
   }
 
   // Describes what this matcher does.
-  void DescribeTo(::std::ostream* os) const override {
+  void DescribeTo(::std::ostream* os) const override { 
     return UnorderedElementsAreMatcherImplBase::DescribeToImpl(os);
   }
 
   // Describes what the negation of this matcher does.
-  void DescribeNegationTo(::std::ostream* os) const override {
+  void DescribeNegationTo(::std::ostream* os) const override { 
     return UnorderedElementsAreMatcherImplBase::DescribeNegationToImpl(os);
   }
 
-  bool MatchAndExplain(Container container,
-                       MatchResultListener* listener) const override {
+  bool MatchAndExplain(Container container, 
+                       MatchResultListener* listener) const override { 
     StlContainerReference stl_container = View::ConstReference(container);
-    ::std::vector<std::string> element_printouts;
-    MatchMatrix matrix =
-        AnalyzeElements(stl_container.begin(), stl_container.end(),
-                        &element_printouts, listener);
+    ::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) {
+    if (matrix.LhsSize() == 0 && matrix.RhsSize() == 0) { 
       return true;
     }
-
-    if (match_flags() == UnorderedMatcherRequire::ExactMatch) {
-      if (matrix.LhsSize() != matrix.RhsSize()) {
-        // 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 (matrix.LhsSize() != 0 && listener->IsInterested()) {
-          *listener << "which has " << Elements(matrix.LhsSize());
-        }
-        return false;
+ 
+    if (match_flags() == UnorderedMatcherRequire::ExactMatch) { 
+      if (matrix.LhsSize() != matrix.RhsSize()) { 
+        // 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 (matrix.LhsSize() != 0 && listener->IsInterested()) { 
+          *listener << "which has " << Elements(matrix.LhsSize()); 
+        } 
+        return false; 
       }
     }
 
-    return VerifyMatchMatrix(element_printouts, matrix, listener) &&
+    return VerifyMatchMatrix(element_printouts, matrix, listener) && 
            FindPairing(matrix, listener);
   }
 
  private:
   template <typename ElementIter>
   MatchMatrix AnalyzeElements(ElementIter elem_first, ElementIter elem_last,
-                              ::std::vector<std::string>* element_printouts,
+                              ::std::vector<std::string>* element_printouts, 
                               MatchResultListener* listener) const {
     element_printouts->clear();
     ::std::vector<char> did_match;
     size_t num_elements = 0;
-    DummyMatchResultListener dummy;
+    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) {
-        did_match.push_back(
-            matchers_[irhs].MatchAndExplain(*elem_first, &dummy));
+        did_match.push_back( 
+            matchers_[irhs].MatchAndExplain(*elem_first, &dummy)); 
       }
     }
 
@@ -3511,7 +3511,7 @@ class UnorderedElementsAreMatcherImpl
     return matrix;
   }
 
-  ::std::vector<Matcher<const Element&> > matchers_;
+  ::std::vector<Matcher<const Element&> > matchers_; 
 };
 
 // Functor for use in TransformTuple.
@@ -3538,13 +3538,13 @@ class UnorderedElementsAreMatcher {
     typedef typename View::value_type Element;
     typedef ::std::vector<Matcher<const Element&> > MatcherVec;
     MatcherVec matchers;
-    matchers.reserve(::std::tuple_size<MatcherTuple>::value);
+    matchers.reserve(::std::tuple_size<MatcherTuple>::value); 
     TransformTupleValues(CastAndAppendTransform<const Element&>(), matchers_,
                          ::std::back_inserter(matchers));
-    return Matcher<Container>(
-        new UnorderedElementsAreMatcherImpl<const Container&>(
-            UnorderedMatcherRequire::ExactMatch, matchers.begin(),
-            matchers.end()));
+    return Matcher<Container>( 
+        new UnorderedElementsAreMatcherImpl<const Container&>( 
+            UnorderedMatcherRequire::ExactMatch, matchers.begin(), 
+            matchers.end())); 
   }
 
  private:
@@ -3559,45 +3559,45 @@ class ElementsAreMatcher {
 
   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);
-
+    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;
-    matchers.reserve(::std::tuple_size<MatcherTuple>::value);
+    matchers.reserve(::std::tuple_size<MatcherTuple>::value); 
     TransformTupleValues(CastAndAppendTransform<const Element&>(), matchers_,
                          ::std::back_inserter(matchers));
-    return Matcher<Container>(new ElementsAreMatcherImpl<const Container&>(
-        matchers.begin(), matchers.end()));
+    return Matcher<Container>(new ElementsAreMatcherImpl<const Container&>( 
+        matchers.begin(), matchers.end())); 
   }
 
  private:
   const MatcherTuple matchers_;
 };
 
-// Implements UnorderedElementsAreArray(), IsSubsetOf(), and IsSupersetOf().
+// Implements UnorderedElementsAreArray(), IsSubsetOf(), and IsSupersetOf(). 
 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) {}
+  UnorderedElementsAreArrayMatcher(UnorderedMatcherRequire::Flags match_flags, 
+                                   Iter first, Iter last) 
+      : match_flags_(match_flags), matchers_(first, last) {} 
 
   template <typename Container>
   operator Matcher<Container>() const {
-    return Matcher<Container>(
-        new UnorderedElementsAreMatcherImpl<const Container&>(
-            match_flags_, matchers_.begin(), matchers_.end()));
+    return Matcher<Container>( 
+        new UnorderedElementsAreMatcherImpl<const Container&>( 
+            match_flags_, matchers_.begin(), matchers_.end())); 
   }
 
  private:
-  UnorderedMatcherRequire::Flags match_flags_;
+  UnorderedMatcherRequire::Flags match_flags_; 
   ::std::vector<T> matchers_;
 };
 
@@ -3610,11 +3610,11 @@ class ElementsAreArrayMatcher {
 
   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&>(
+    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()));
   }
 
@@ -3624,8 +3624,8 @@ class ElementsAreArrayMatcher {
 
 // 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
+// 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
@@ -3637,8 +3637,8 @@ class BoundSecondMatcher {
   BoundSecondMatcher(const Tuple2Matcher& tm, const Second& second)
       : tuple2_matcher_(tm), second_value_(second) {}
 
-  BoundSecondMatcher(const BoundSecondMatcher& other) = default;
-
+  BoundSecondMatcher(const BoundSecondMatcher& other) = default; 
+ 
   template <typename T>
   operator Matcher<T>() const {
     return MakeMatcher(new Impl<T>(tuple2_matcher_, second_value_));
@@ -3660,20 +3660,20 @@ class BoundSecondMatcher {
   template <typename T>
   class Impl : public MatcherInterface<T> {
    public:
-    typedef ::std::tuple<T, Second> ArgTuple;
+    typedef ::std::tuple<T, Second> ArgTuple; 
 
     Impl(const Tuple2Matcher& tm, const Second& second)
         : mono_tuple2_matcher_(SafeMatcherCast<const ArgTuple&>(tm)),
           second_value_(second) {}
 
-    void DescribeTo(::std::ostream* os) const override {
+    void DescribeTo(::std::ostream* os) const override { 
       *os << "and ";
       UniversalPrint(second_value_, os);
       *os << " ";
       mono_tuple2_matcher_.DescribeTo(os);
     }
 
-    bool MatchAndExplain(T x, MatchResultListener* listener) const override {
+    bool MatchAndExplain(T x, MatchResultListener* listener) const override { 
       return mono_tuple2_matcher_.MatchAndExplain(ArgTuple(x, second_value_),
                                                   listener);
     }
@@ -3689,8 +3689,8 @@ class BoundSecondMatcher {
 
 // 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().
+// 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) {
@@ -3702,262 +3702,262 @@ BoundSecondMatcher<Tuple2Matcher, Second> MatcherBindSecond(
 // '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 {
- public:
-  explicit OptionalMatcher(const ValueMatcher& value_matcher)
-      : value_matcher_(value_matcher) {}
-
-  template <typename Optional>
-  operator Matcher<Optional>() const {
-    return Matcher<Optional>(new Impl<const Optional&>(value_matcher_));
-  }
-
-  template <typename Optional>
-  class Impl : public MatcherInterface<Optional> {
-   public:
-    typedef GTEST_REMOVE_REFERENCE_AND_CONST_(Optional) OptionalView;
-    typedef typename OptionalView::value_type ValueType;
-    explicit Impl(const ValueMatcher& value_matcher)
-        : value_matcher_(MatcherCast<ValueType>(value_matcher)) {}
-
-    void DescribeTo(::std::ostream* os) const override {
-      *os << "value ";
-      value_matcher_.DescribeTo(os);
-    }
-
-    void DescribeNegationTo(::std::ostream* os) const override {
-      *os << "value ";
-      value_matcher_.DescribeNegationTo(os);
-    }
-
-    bool MatchAndExplain(Optional optional,
-                         MatchResultListener* listener) const override {
-      if (!optional) {
-        *listener << "which is not engaged";
-        return false;
-      }
-      const ValueType& value = *optional;
-      StringMatchResultListener value_listener;
-      const bool match = value_matcher_.MatchAndExplain(value, &value_listener);
-      *listener << "whose value " << PrintToString(value)
-                << (match ? " matches" : " doesn't match");
-      PrintIfNotEmpty(value_listener.str(), listener->stream());
-      return match;
-    }
-
-   private:
-    const Matcher<ValueType> value_matcher_;
-  };
-
- private:
-  const ValueMatcher value_matcher_;
-};
-
-namespace variant_matcher {
-// Overloads to allow VariantMatcher to do proper ADL lookup.
-template <typename T>
-void holds_alternative() {}
-template <typename T>
-void get() {}
-
-// Implements a matcher that checks the value of a variant<> type variable.
-template <typename T>
-class VariantMatcher {
- public:
-  explicit VariantMatcher(::testing::Matcher<const T&> matcher)
-      : matcher_(std::move(matcher)) {}
-
-  template <typename Variant>
-  bool MatchAndExplain(const Variant& value,
-                       ::testing::MatchResultListener* listener) const {
-    using std::get;
-    if (!listener->IsInterested()) {
-      return holds_alternative<T>(value) && matcher_.Matches(get<T>(value));
-    }
-
-    if (!holds_alternative<T>(value)) {
-      *listener << "whose value is not of type '" << GetTypeName() << "'";
-      return false;
-    }
-
-    const T& elem = get<T>(value);
-    StringMatchResultListener elem_listener;
-    const bool match = matcher_.MatchAndExplain(elem, &elem_listener);
-    *listener << "whose value " << PrintToString(elem)
-              << (match ? " matches" : " doesn't match");
-    PrintIfNotEmpty(elem_listener.str(), listener->stream());
-    return match;
-  }
-
-  void DescribeTo(std::ostream* os) const {
-    *os << "is a variant<> with value of type '" << GetTypeName()
-        << "' and the value ";
-    matcher_.DescribeTo(os);
-  }
-
-  void DescribeNegationTo(std::ostream* os) const {
-    *os << "is a variant<> with value of type other than '" << GetTypeName()
-        << "' or the value ";
-    matcher_.DescribeNegationTo(os);
-  }
-
- private:
-  static std::string GetTypeName() {
-#if GTEST_HAS_RTTI
-    GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(
-        return internal::GetTypeName<T>());
-#endif
-    return "the element type";
-  }
-
-  const ::testing::Matcher<const T&> matcher_;
-};
-
-}  // namespace variant_matcher
-
-namespace any_cast_matcher {
-
-// Overloads to allow AnyCastMatcher to do proper ADL lookup.
-template <typename T>
-void any_cast() {}
-
-// Implements a matcher that any_casts the value.
-template <typename T>
-class AnyCastMatcher {
- public:
-  explicit AnyCastMatcher(const ::testing::Matcher<const T&>& matcher)
-      : matcher_(matcher) {}
-
-  template <typename AnyType>
-  bool MatchAndExplain(const AnyType& value,
-                       ::testing::MatchResultListener* listener) const {
-    if (!listener->IsInterested()) {
-      const T* ptr = any_cast<T>(&value);
-      return ptr != nullptr && matcher_.Matches(*ptr);
-    }
-
-    const T* elem = any_cast<T>(&value);
-    if (elem == nullptr) {
-      *listener << "whose value is not of type '" << GetTypeName() << "'";
-      return false;
-    }
-
-    StringMatchResultListener elem_listener;
-    const bool match = matcher_.MatchAndExplain(*elem, &elem_listener);
-    *listener << "whose value " << PrintToString(*elem)
-              << (match ? " matches" : " doesn't match");
-    PrintIfNotEmpty(elem_listener.str(), listener->stream());
-    return match;
-  }
-
-  void DescribeTo(std::ostream* os) const {
-    *os << "is an 'any' type with value of type '" << GetTypeName()
-        << "' and the value ";
-    matcher_.DescribeTo(os);
-  }
-
-  void DescribeNegationTo(std::ostream* os) const {
-    *os << "is an 'any' type with value of type other than '" << GetTypeName()
-        << "' or the value ";
-    matcher_.DescribeNegationTo(os);
-  }
-
- private:
-  static std::string GetTypeName() {
-#if GTEST_HAS_RTTI
-    GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(
-        return internal::GetTypeName<T>());
-#endif
-    return "the element type";
-  }
-
-  const ::testing::Matcher<const T&> matcher_;
-};
-
-}  // namespace any_cast_matcher
-
-// Implements the Args() matcher.
-template <class ArgsTuple, size_t... k>
-class ArgsMatcherImpl : public MatcherInterface<ArgsTuple> {
- public:
-  using RawArgsTuple = typename std::decay<ArgsTuple>::type;
-  using SelectedArgs =
-      std::tuple<typename std::tuple_element<k, RawArgsTuple>::type...>;
-  using MonomorphicInnerMatcher = Matcher<const SelectedArgs&>;
-
-  template <typename InnerMatcher>
-  explicit ArgsMatcherImpl(const InnerMatcher& inner_matcher)
-      : inner_matcher_(SafeMatcherCast<const SelectedArgs&>(inner_matcher)) {}
-
-  bool MatchAndExplain(ArgsTuple args,
-                       MatchResultListener* listener) const override {
-    // Workaround spurious C4100 on MSVC<=15.7 when k is empty.
-    (void)args;
-    const SelectedArgs& selected_args =
-        std::forward_as_tuple(std::get<k>(args)...);
-    if (!listener->IsInterested()) return inner_matcher_.Matches(selected_args);
-
-    PrintIndices(listener->stream());
-    *listener << "are " << PrintToString(selected_args);
-
-    StringMatchResultListener inner_listener;
-    const bool match =
-        inner_matcher_.MatchAndExplain(selected_args, &inner_listener);
-    PrintIfNotEmpty(inner_listener.str(), listener->stream());
-    return match;
-  }
-
-  void DescribeTo(::std::ostream* os) const override {
-    *os << "are a tuple ";
-    PrintIndices(os);
-    inner_matcher_.DescribeTo(os);
-  }
-
-  void DescribeNegationTo(::std::ostream* os) const override {
-    *os << "are a tuple ";
-    PrintIndices(os);
-    inner_matcher_.DescribeNegationTo(os);
-  }
-
- private:
-  // Prints the indices of the selected fields.
-  static void PrintIndices(::std::ostream* os) {
-    *os << "whose fields (";
-    const char* sep = "";
-    // Workaround spurious C4189 on MSVC<=15.7 when k is empty.
-    (void)sep;
-    const char* dummy[] = {"", (*os << sep << "#" << k, sep = ", ")...};
-    (void)dummy;
-    *os << ") ";
-  }
-
-  MonomorphicInnerMatcher inner_matcher_;
-};
-
-template <class InnerMatcher, size_t... k>
-class ArgsMatcher {
- public:
-  explicit ArgsMatcher(InnerMatcher inner_matcher)
-      : inner_matcher_(std::move(inner_matcher)) {}
-
-  template <typename ArgsTuple>
-  operator Matcher<ArgsTuple>() const {  // NOLINT
-    return MakeMatcher(new ArgsMatcherImpl<ArgsTuple, k...>(inner_matcher_));
-  }
-
- private:
-  InnerMatcher inner_matcher_;
-};
-
+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 { 
+ public: 
+  explicit OptionalMatcher(const ValueMatcher& value_matcher) 
+      : value_matcher_(value_matcher) {} 
+ 
+  template <typename Optional> 
+  operator Matcher<Optional>() const { 
+    return Matcher<Optional>(new Impl<const Optional&>(value_matcher_)); 
+  } 
+ 
+  template <typename Optional> 
+  class Impl : public MatcherInterface<Optional> { 
+   public: 
+    typedef GTEST_REMOVE_REFERENCE_AND_CONST_(Optional) OptionalView; 
+    typedef typename OptionalView::value_type ValueType; 
+    explicit Impl(const ValueMatcher& value_matcher) 
+        : value_matcher_(MatcherCast<ValueType>(value_matcher)) {} 
+ 
+    void DescribeTo(::std::ostream* os) const override { 
+      *os << "value "; 
+      value_matcher_.DescribeTo(os); 
+    } 
+ 
+    void DescribeNegationTo(::std::ostream* os) const override { 
+      *os << "value "; 
+      value_matcher_.DescribeNegationTo(os); 
+    } 
+ 
+    bool MatchAndExplain(Optional optional, 
+                         MatchResultListener* listener) const override { 
+      if (!optional) { 
+        *listener << "which is not engaged"; 
+        return false; 
+      } 
+      const ValueType& value = *optional; 
+      StringMatchResultListener value_listener; 
+      const bool match = value_matcher_.MatchAndExplain(value, &value_listener); 
+      *listener << "whose value " << PrintToString(value) 
+                << (match ? " matches" : " doesn't match"); 
+      PrintIfNotEmpty(value_listener.str(), listener->stream()); 
+      return match; 
+    } 
+ 
+   private: 
+    const Matcher<ValueType> value_matcher_; 
+  }; 
+ 
+ private: 
+  const ValueMatcher value_matcher_; 
+}; 
+ 
+namespace variant_matcher { 
+// Overloads to allow VariantMatcher to do proper ADL lookup. 
+template <typename T> 
+void holds_alternative() {} 
+template <typename T> 
+void get() {} 
+ 
+// Implements a matcher that checks the value of a variant<> type variable. 
+template <typename T> 
+class VariantMatcher { 
+ public: 
+  explicit VariantMatcher(::testing::Matcher<const T&> matcher) 
+      : matcher_(std::move(matcher)) {} 
+ 
+  template <typename Variant> 
+  bool MatchAndExplain(const Variant& value, 
+                       ::testing::MatchResultListener* listener) const { 
+    using std::get; 
+    if (!listener->IsInterested()) { 
+      return holds_alternative<T>(value) && matcher_.Matches(get<T>(value)); 
+    } 
+ 
+    if (!holds_alternative<T>(value)) { 
+      *listener << "whose value is not of type '" << GetTypeName() << "'"; 
+      return false; 
+    } 
+ 
+    const T& elem = get<T>(value); 
+    StringMatchResultListener elem_listener; 
+    const bool match = matcher_.MatchAndExplain(elem, &elem_listener); 
+    *listener << "whose value " << PrintToString(elem) 
+              << (match ? " matches" : " doesn't match"); 
+    PrintIfNotEmpty(elem_listener.str(), listener->stream()); 
+    return match; 
+  } 
+ 
+  void DescribeTo(std::ostream* os) const { 
+    *os << "is a variant<> with value of type '" << GetTypeName() 
+        << "' and the value "; 
+    matcher_.DescribeTo(os); 
+  } 
+ 
+  void DescribeNegationTo(std::ostream* os) const { 
+    *os << "is a variant<> with value of type other than '" << GetTypeName() 
+        << "' or the value "; 
+    matcher_.DescribeNegationTo(os); 
+  } 
+ 
+ private: 
+  static std::string GetTypeName() { 
+#if GTEST_HAS_RTTI 
+    GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_( 
+        return internal::GetTypeName<T>()); 
+#endif 
+    return "the element type"; 
+  } 
+ 
+  const ::testing::Matcher<const T&> matcher_; 
+}; 
+ 
+}  // namespace variant_matcher 
+ 
+namespace any_cast_matcher { 
+ 
+// Overloads to allow AnyCastMatcher to do proper ADL lookup. 
+template <typename T> 
+void any_cast() {} 
+ 
+// Implements a matcher that any_casts the value. 
+template <typename T> 
+class AnyCastMatcher { 
+ public: 
+  explicit AnyCastMatcher(const ::testing::Matcher<const T&>& matcher) 
+      : matcher_(matcher) {} 
+ 
+  template <typename AnyType> 
+  bool MatchAndExplain(const AnyType& value, 
+                       ::testing::MatchResultListener* listener) const { 
+    if (!listener->IsInterested()) { 
+      const T* ptr = any_cast<T>(&value); 
+      return ptr != nullptr && matcher_.Matches(*ptr); 
+    } 
+ 
+    const T* elem = any_cast<T>(&value); 
+    if (elem == nullptr) { 
+      *listener << "whose value is not of type '" << GetTypeName() << "'"; 
+      return false; 
+    } 
+ 
+    StringMatchResultListener elem_listener; 
+    const bool match = matcher_.MatchAndExplain(*elem, &elem_listener); 
+    *listener << "whose value " << PrintToString(*elem) 
+              << (match ? " matches" : " doesn't match"); 
+    PrintIfNotEmpty(elem_listener.str(), listener->stream()); 
+    return match; 
+  } 
+ 
+  void DescribeTo(std::ostream* os) const { 
+    *os << "is an 'any' type with value of type '" << GetTypeName() 
+        << "' and the value "; 
+    matcher_.DescribeTo(os); 
+  } 
+ 
+  void DescribeNegationTo(std::ostream* os) const { 
+    *os << "is an 'any' type with value of type other than '" << GetTypeName() 
+        << "' or the value "; 
+    matcher_.DescribeNegationTo(os); 
+  } 
+ 
+ private: 
+  static std::string GetTypeName() { 
+#if GTEST_HAS_RTTI 
+    GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_( 
+        return internal::GetTypeName<T>()); 
+#endif 
+    return "the element type"; 
+  } 
+ 
+  const ::testing::Matcher<const T&> matcher_; 
+}; 
+ 
+}  // namespace any_cast_matcher 
+ 
+// Implements the Args() matcher. 
+template <class ArgsTuple, size_t... k> 
+class ArgsMatcherImpl : public MatcherInterface<ArgsTuple> { 
+ public: 
+  using RawArgsTuple = typename std::decay<ArgsTuple>::type; 
+  using SelectedArgs = 
+      std::tuple<typename std::tuple_element<k, RawArgsTuple>::type...>; 
+  using MonomorphicInnerMatcher = Matcher<const SelectedArgs&>; 
+ 
+  template <typename InnerMatcher> 
+  explicit ArgsMatcherImpl(const InnerMatcher& inner_matcher) 
+      : inner_matcher_(SafeMatcherCast<const SelectedArgs&>(inner_matcher)) {} 
+ 
+  bool MatchAndExplain(ArgsTuple args, 
+                       MatchResultListener* listener) const override { 
+    // Workaround spurious C4100 on MSVC<=15.7 when k is empty. 
+    (void)args; 
+    const SelectedArgs& selected_args = 
+        std::forward_as_tuple(std::get<k>(args)...); 
+    if (!listener->IsInterested()) return inner_matcher_.Matches(selected_args); 
+ 
+    PrintIndices(listener->stream()); 
+    *listener << "are " << PrintToString(selected_args); 
+ 
+    StringMatchResultListener inner_listener; 
+    const bool match = 
+        inner_matcher_.MatchAndExplain(selected_args, &inner_listener); 
+    PrintIfNotEmpty(inner_listener.str(), listener->stream()); 
+    return match; 
+  } 
+ 
+  void DescribeTo(::std::ostream* os) const override { 
+    *os << "are a tuple "; 
+    PrintIndices(os); 
+    inner_matcher_.DescribeTo(os); 
+  } 
+ 
+  void DescribeNegationTo(::std::ostream* os) const override { 
+    *os << "are a tuple "; 
+    PrintIndices(os); 
+    inner_matcher_.DescribeNegationTo(os); 
+  } 
+ 
+ private: 
+  // Prints the indices of the selected fields. 
+  static void PrintIndices(::std::ostream* os) { 
+    *os << "whose fields ("; 
+    const char* sep = ""; 
+    // Workaround spurious C4189 on MSVC<=15.7 when k is empty. 
+    (void)sep; 
+    const char* dummy[] = {"", (*os << sep << "#" << k, sep = ", ")...}; 
+    (void)dummy; 
+    *os << ") "; 
+  } 
+ 
+  MonomorphicInnerMatcher inner_matcher_; 
+}; 
+ 
+template <class InnerMatcher, size_t... k> 
+class ArgsMatcher { 
+ public: 
+  explicit ArgsMatcher(InnerMatcher inner_matcher) 
+      : inner_matcher_(std::move(inner_matcher)) {} 
+ 
+  template <typename ArgsTuple> 
+  operator Matcher<ArgsTuple>() const {  // NOLINT 
+    return MakeMatcher(new ArgsMatcherImpl<ArgsTuple, k...>(inner_matcher_)); 
+  } 
+ 
+ private: 
+  InnerMatcher inner_matcher_; 
+}; 
+ 
 }  // namespace internal
 
-// ElementsAreArray(iterator_first, iterator_last)
+// ElementsAreArray(iterator_first, iterator_last) 
 // ElementsAreArray(pointer, count)
 // ElementsAreArray(array)
 // ElementsAreArray(container)
@@ -4004,26 +4004,26 @@ ElementsAreArray(::std::initializer_list<T> xs) {
   return ElementsAreArray(xs.begin(), xs.end());
 }
 
-// UnorderedElementsAreArray(iterator_first, iterator_last)
+// UnorderedElementsAreArray(iterator_first, iterator_last) 
 // UnorderedElementsAreArray(pointer, count)
 // UnorderedElementsAreArray(array)
 // UnorderedElementsAreArray(container)
 // UnorderedElementsAreArray({ e1, e2, ..., en })
 //
-// UnorderedElementsAreArray() verifies that a bijective mapping onto a
-// collection of matchers exists.
-//
-// The matchers can be specified as an array, a pointer and count, a container,
-// an initializer list, or an STL iterator range. In each of these cases, the
-// underlying matchers can be either values or matchers.
-
+// UnorderedElementsAreArray() verifies that a bijective mapping onto a 
+// collection of matchers exists. 
+// 
+// The matchers can be specified as an array, a pointer and count, a container, 
+// 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;
-  return internal::UnorderedElementsAreArrayMatcher<T>(
-      internal::UnorderedMatcherRequire::ExactMatch, first, last);
+  return internal::UnorderedElementsAreArrayMatcher<T>( 
+      internal::UnorderedMatcherRequire::ExactMatch, first, last); 
 }
 
 template <typename T>
@@ -4063,21 +4063,21 @@ UnorderedElementsAreArray(::std::initializer_list<T> xs) {
 const internal::AnythingMatcher _ = {};
 // Creates a matcher that matches any value of the given type T.
 template <typename T>
-inline Matcher<T> A() {
-  return _;
-}
+inline Matcher<T> A() { 
+  return _; 
+} 
 
 // Creates a matcher that matches any value of the given type T.
 template <typename T>
-inline Matcher<T> An() {
-  return _;
-}
+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);
+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.
@@ -4099,11 +4099,11 @@ 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 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) {
@@ -4168,7 +4168,7 @@ inline internal::PointeeMatcher<InnerMatcher> Pointee(
   return internal::PointeeMatcher<InnerMatcher>(inner_matcher);
 }
 
-#if GTEST_HAS_RTTI
+#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.
@@ -4181,12 +4181,12 @@ WhenDynamicCastTo(const Matcher<To>& inner_matcher) {
   return MakePolymorphicMatcher(
       internal::WhenDynamicCastToMatcher<To>(inner_matcher));
 }
-#endif  // GTEST_HAS_RTTI
+#endif  // GTEST_HAS_RTTI 
 
 // 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.
+// 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(
@@ -4200,202 +4200,202 @@ inline PolymorphicMatcher<
   // 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>
-inline PolymorphicMatcher<internal::FieldMatcher<Class, FieldType> > Field(
-    const std::string& field_name, FieldType Class::*field,
-    const FieldMatcher& matcher) {
-  return MakePolymorphicMatcher(internal::FieldMatcher<Class, FieldType>(
-      field_name, field, MatcherCast<const FieldType&>(matcher)));
-}
-
+// Same as Field() but also takes the name of the field to provide better error 
+// messages. 
+template <typename Class, typename FieldType, typename FieldMatcher> 
+inline PolymorphicMatcher<internal::FieldMatcher<Class, FieldType> > Field( 
+    const std::string& field_name, FieldType Class::*field, 
+    const FieldMatcher& matcher) { 
+  return MakePolymorphicMatcher(internal::FieldMatcher<Class, FieldType>( 
+      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"))
-// matches a Foo object x if and only if x.str() starts with "hi".
+// matches a Foo object x if and only if x.str() starts with "hi". 
 template <typename Class, typename PropertyType, typename PropertyMatcher>
-inline PolymorphicMatcher<internal::PropertyMatcher<
-    Class, PropertyType, PropertyType (Class::*)() const> >
-Property(PropertyType (Class::*property)() const,
-         const PropertyMatcher& matcher) {
+inline PolymorphicMatcher<internal::PropertyMatcher< 
+    Class, PropertyType, PropertyType (Class::*)() const> > 
+Property(PropertyType (Class::*property)() const, 
+         const PropertyMatcher& matcher) { 
   return MakePolymorphicMatcher(
-      internal::PropertyMatcher<Class, PropertyType,
-                                PropertyType (Class::*)() const>(
-          property, MatcherCast<const PropertyType&>(matcher)));
+      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.
 }
 
-// Same as Property() above, but also takes the name of the property to provide
-// better error messages.
-template <typename Class, typename PropertyType, typename PropertyMatcher>
-inline PolymorphicMatcher<internal::PropertyMatcher<
-    Class, PropertyType, PropertyType (Class::*)() const> >
-Property(const std::string& property_name,
-         PropertyType (Class::*property)() const,
-         const PropertyMatcher& matcher) {
-  return MakePolymorphicMatcher(
-      internal::PropertyMatcher<Class, PropertyType,
-                                PropertyType (Class::*)() const>(
-          property_name, property, MatcherCast<const PropertyType&>(matcher)));
-}
-
-// The same as above but for reference-qualified member functions.
-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(
-      internal::PropertyMatcher<Class, PropertyType,
-                                PropertyType (Class::*)() const&>(
-          property, MatcherCast<const PropertyType&>(matcher)));
-}
-
-// Three-argument form for reference-qualified member functions.
-template <typename Class, typename PropertyType, typename PropertyMatcher>
-inline PolymorphicMatcher<internal::PropertyMatcher<
-    Class, PropertyType, PropertyType (Class::*)() const &> >
-Property(const std::string& property_name,
-         PropertyType (Class::*property)() const &,
-         const PropertyMatcher& matcher) {
-  return MakePolymorphicMatcher(
-      internal::PropertyMatcher<Class, PropertyType,
-                                PropertyType (Class::*)() const&>(
-          property_name, property, MatcherCast<const PropertyType&>(matcher)));
-}
-
-// Creates a matcher that matches an object if and only if the result of
-// applying a callable to x matches 'matcher'. For example,
+// Same as Property() above, but also takes the name of the property to provide 
+// better error messages. 
+template <typename Class, typename PropertyType, typename PropertyMatcher> 
+inline PolymorphicMatcher<internal::PropertyMatcher< 
+    Class, PropertyType, PropertyType (Class::*)() const> > 
+Property(const std::string& property_name, 
+         PropertyType (Class::*property)() const, 
+         const PropertyMatcher& matcher) { 
+  return MakePolymorphicMatcher( 
+      internal::PropertyMatcher<Class, PropertyType, 
+                                PropertyType (Class::*)() const>( 
+          property_name, property, MatcherCast<const PropertyType&>(matcher))); 
+} 
+ 
+// The same as above but for reference-qualified member functions. 
+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( 
+      internal::PropertyMatcher<Class, PropertyType, 
+                                PropertyType (Class::*)() const&>( 
+          property, MatcherCast<const PropertyType&>(matcher))); 
+} 
+ 
+// Three-argument form for reference-qualified member functions. 
+template <typename Class, typename PropertyType, typename PropertyMatcher> 
+inline PolymorphicMatcher<internal::PropertyMatcher< 
+    Class, PropertyType, PropertyType (Class::*)() const &> > 
+Property(const std::string& property_name, 
+         PropertyType (Class::*property)() const &, 
+         const PropertyMatcher& matcher) { 
+  return MakePolymorphicMatcher( 
+      internal::PropertyMatcher<Class, PropertyType, 
+                                PropertyType (Class::*)() const&>( 
+          property_name, property, MatcherCast<const PropertyType&>(matcher))); 
+} 
+ 
+// 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"))
-// 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
-// no assumptions about how many calls will be made. Any state it keeps must be
-// protected from the concurrent access.
-template <typename Callable, typename InnerMatcher>
-internal::ResultOfMatcher<Callable, InnerMatcher> ResultOf(
-    Callable callable, InnerMatcher matcher) {
-  return internal::ResultOfMatcher<Callable, InnerMatcher>(
-      std::move(callable), std::move(matcher));
+// 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 
+// no assumptions about how many calls will be made. Any state it keeps must be 
+// protected from the concurrent access. 
+template <typename Callable, typename InnerMatcher> 
+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.
-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));
+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.
-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));
+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.
-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));
+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.
-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));
+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.
-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)));
+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).
-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)));
+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).
-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)));
+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
+#if GTEST_HAS_STD_WSTRING 
 // 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));
+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.
-inline PolymorphicMatcher<internal::StrEqualityMatcher<std::wstring> > StrNe(
-    const std::wstring& str) {
-  return MakePolymorphicMatcher(
-      internal::StrEqualityMatcher<std::wstring>(str, false, true));
+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.
-inline PolymorphicMatcher<internal::StrEqualityMatcher<std::wstring> >
-StrCaseEq(const std::wstring& str) {
-  return MakePolymorphicMatcher(
-      internal::StrEqualityMatcher<std::wstring>(str, true, false));
+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.
-inline PolymorphicMatcher<internal::StrEqualityMatcher<std::wstring> >
-StrCaseNe(const std::wstring& str) {
-  return MakePolymorphicMatcher(
-      internal::StrEqualityMatcher<std::wstring>(str, false, false));
+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
+// Creates a matcher that matches any ::wstring, std::wstring, or C wide string 
 // that contains the given substring.
-inline PolymorphicMatcher<internal::HasSubstrMatcher<std::wstring> > HasSubstr(
-    const std::wstring& substring) {
-  return MakePolymorphicMatcher(
-      internal::HasSubstrMatcher<std::wstring>(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).
-inline PolymorphicMatcher<internal::StartsWithMatcher<std::wstring> >
-StartsWith(const std::wstring& prefix) {
-  return MakePolymorphicMatcher(
-      internal::StartsWithMatcher<std::wstring>(prefix));
+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).
-inline PolymorphicMatcher<internal::EndsWithMatcher<std::wstring> > EndsWith(
-    const std::wstring& suffix) {
-  return MakePolymorphicMatcher(
-      internal::EndsWithMatcher<std::wstring>(suffix));
+inline PolymorphicMatcher<internal::EndsWithMatcher<std::wstring> > EndsWith( 
+    const std::wstring& suffix) { 
+  return MakePolymorphicMatcher( 
+      internal::EndsWithMatcher<std::wstring>(suffix)); 
 }
 
-#endif  // GTEST_HAS_STD_WSTRING
+#endif  // GTEST_HAS_STD_WSTRING 
 
 // Creates a polymorphic matcher that matches a 2-tuple where the
 // first field == the second field.
@@ -4421,58 +4421,58 @@ inline internal::Lt2Matcher Lt() { return internal::Lt2Matcher(); }
 // 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() {
-  return internal::FloatingEq2Matcher<float>();
-}
-
-// Creates a polymorphic matcher that matches a 2-tuple where
-// DoubleEq(first field) matches the second field.
-inline internal::FloatingEq2Matcher<double> DoubleEq() {
-  return internal::FloatingEq2Matcher<double>();
-}
-
-// Creates a polymorphic matcher that matches a 2-tuple where
-// FloatEq(first field) matches the second field with NaN equality.
-inline internal::FloatingEq2Matcher<float> NanSensitiveFloatEq() {
-  return internal::FloatingEq2Matcher<float>(true);
-}
-
-// Creates a polymorphic matcher that matches a 2-tuple where
-// DoubleEq(first field) matches the second field with NaN equality.
-inline internal::FloatingEq2Matcher<double> NanSensitiveDoubleEq() {
-  return internal::FloatingEq2Matcher<double>(true);
-}
-
-// Creates a polymorphic matcher that matches a 2-tuple where
-// FloatNear(first field, max_abs_error) matches the second field.
-inline internal::FloatingEq2Matcher<float> FloatNear(float max_abs_error) {
-  return internal::FloatingEq2Matcher<float>(max_abs_error);
-}
-
-// Creates a polymorphic matcher that matches a 2-tuple where
-// DoubleNear(first field, max_abs_error) matches the second field.
-inline internal::FloatingEq2Matcher<double> DoubleNear(double max_abs_error) {
-  return internal::FloatingEq2Matcher<double>(max_abs_error);
-}
-
-// Creates a polymorphic matcher that matches a 2-tuple where
-// FloatNear(first field, max_abs_error) matches the second field with NaN
-// equality.
-inline internal::FloatingEq2Matcher<float> NanSensitiveFloatNear(
-    float max_abs_error) {
-  return internal::FloatingEq2Matcher<float>(max_abs_error, true);
-}
-
-// Creates a polymorphic matcher that matches a 2-tuple where
-// DoubleNear(first field, max_abs_error) matches the second field with NaN
-// equality.
-inline internal::FloatingEq2Matcher<double> NanSensitiveDoubleNear(
-    double max_abs_error) {
-  return internal::FloatingEq2Matcher<double>(max_abs_error, true);
-}
-
+// Creates a polymorphic matcher that matches a 2-tuple where 
+// FloatEq(first field) matches the second field. 
+inline internal::FloatingEq2Matcher<float> FloatEq() { 
+  return internal::FloatingEq2Matcher<float>(); 
+} 
+ 
+// Creates a polymorphic matcher that matches a 2-tuple where 
+// DoubleEq(first field) matches the second field. 
+inline internal::FloatingEq2Matcher<double> DoubleEq() { 
+  return internal::FloatingEq2Matcher<double>(); 
+} 
+ 
+// Creates a polymorphic matcher that matches a 2-tuple where 
+// FloatEq(first field) matches the second field with NaN equality. 
+inline internal::FloatingEq2Matcher<float> NanSensitiveFloatEq() { 
+  return internal::FloatingEq2Matcher<float>(true); 
+} 
+ 
+// Creates a polymorphic matcher that matches a 2-tuple where 
+// DoubleEq(first field) matches the second field with NaN equality. 
+inline internal::FloatingEq2Matcher<double> NanSensitiveDoubleEq() { 
+  return internal::FloatingEq2Matcher<double>(true); 
+} 
+ 
+// Creates a polymorphic matcher that matches a 2-tuple where 
+// FloatNear(first field, max_abs_error) matches the second field. 
+inline internal::FloatingEq2Matcher<float> FloatNear(float max_abs_error) { 
+  return internal::FloatingEq2Matcher<float>(max_abs_error); 
+} 
+ 
+// Creates a polymorphic matcher that matches a 2-tuple where 
+// DoubleNear(first field, max_abs_error) matches the second field. 
+inline internal::FloatingEq2Matcher<double> DoubleNear(double max_abs_error) { 
+  return internal::FloatingEq2Matcher<double>(max_abs_error); 
+} 
+ 
+// Creates a polymorphic matcher that matches a 2-tuple where 
+// FloatNear(first field, max_abs_error) matches the second field with NaN 
+// equality. 
+inline internal::FloatingEq2Matcher<float> NanSensitiveFloatNear( 
+    float max_abs_error) { 
+  return internal::FloatingEq2Matcher<float>(max_abs_error, true); 
+} 
+ 
+// Creates a polymorphic matcher that matches a 2-tuple where 
+// DoubleNear(first field, max_abs_error) matches the second field with NaN 
+// equality. 
+inline internal::FloatingEq2Matcher<double> NanSensitiveDoubleNear( 
+    double max_abs_error) { 
+  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>
@@ -4517,10 +4517,10 @@ BeginEndDistanceIs(const DistanceMatcher& distance_matcher) {
 // 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));
+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
@@ -4546,15 +4546,15 @@ WhenSorted(const ContainerMatcher& 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
+// 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,
-                                  typename std::remove_const<Container>::type>
+                                  typename std::remove_const<Container>::type> 
 Pointwise(const TupleMatcher& tuple_matcher, const Container& rhs) {
-  return internal::PointwiseMatcher<TupleMatcher, Container>(tuple_matcher,
-                                                             rhs);
+  return internal::PointwiseMatcher<TupleMatcher, Container>(tuple_matcher, 
+                                                             rhs); 
 }
 
 
@@ -4571,7 +4571,7 @@ inline internal::PointwiseMatcher<TupleMatcher, std::vector<T> > Pointwise(
 // 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
+// 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.
 //
@@ -4580,14 +4580,14 @@ inline internal::PointwiseMatcher<TupleMatcher, std::vector<T> > Pointwise(
 template <typename Tuple2Matcher, typename RhsContainer>
 inline internal::UnorderedElementsAreArrayMatcher<
     typename internal::BoundSecondMatcher<
-        Tuple2Matcher,
-        typename internal::StlContainerView<
-            typename std::remove_const<RhsContainer>::type>::type::value_type>>
+        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.
-  typedef typename internal::StlContainerView<RhsContainer> RhsView;
+  typedef typename internal::StlContainerView<RhsContainer> RhsView; 
   typedef typename RhsView::type RhsStlContainer;
   typedef typename RhsStlContainer::value_type Second;
   const RhsStlContainer& rhs_stl_container =
@@ -4639,124 +4639,124 @@ inline internal::ContainsMatcher<M> Contains(M matcher) {
   return internal::ContainsMatcher<M>(matcher);
 }
 
-// IsSupersetOf(iterator_first, iterator_last)
-// IsSupersetOf(pointer, count)
-// IsSupersetOf(array)
-// IsSupersetOf(container)
-// IsSupersetOf({e1, e2, ..., en})
-//
-// IsSupersetOf() verifies that a surjective partial mapping onto a collection
-// of matchers exists. In other words, a container matches
-// IsSupersetOf({e1, ..., en}) if and only if there is a permutation
-// {y1, ..., yn} of some of the container's elements where y1 matches e1,
-// ..., and yn matches en. Obviously, the size of the container must be >= n
-// in order to have a match. Examples:
-//
-// - {1, 2, 3} matches IsSupersetOf({Ge(3), Ne(0)}), as 3 matches Ge(3) and
-//   1 matches Ne(0).
-// - {1, 2} doesn't match IsSupersetOf({Eq(1), Lt(2)}), even though 1 matches
-//   both Eq(1) and Lt(2). The reason is that different matchers must be used
-//   for elements in different slots of the container.
-// - {1, 1, 2} matches IsSupersetOf({Eq(1), Lt(2)}), as (the first) 1 matches
-//   Eq(1) and (the second) 1 matches Lt(2).
-// - {1, 2, 3} matches IsSupersetOf(Gt(1), Gt(1)), as 2 matches (the first)
-//   Gt(1) and 3 matches (the second) Gt(1).
-//
-// The matchers can be specified as an array, a pointer and count, a container,
-// 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>
-IsSupersetOf(Iter first, Iter last) {
-  typedef typename ::std::iterator_traits<Iter>::value_type T;
-  return internal::UnorderedElementsAreArrayMatcher<T>(
-      internal::UnorderedMatcherRequire::Superset, first, last);
-}
-
-template <typename T>
-inline internal::UnorderedElementsAreArrayMatcher<T> IsSupersetOf(
-    const T* pointer, size_t count) {
-  return IsSupersetOf(pointer, pointer + count);
-}
-
-template <typename T, size_t N>
-inline internal::UnorderedElementsAreArrayMatcher<T> IsSupersetOf(
-    const T (&array)[N]) {
-  return IsSupersetOf(array, N);
-}
-
-template <typename Container>
-inline internal::UnorderedElementsAreArrayMatcher<
-    typename Container::value_type>
-IsSupersetOf(const Container& container) {
-  return IsSupersetOf(container.begin(), container.end());
-}
-
-template <typename T>
-inline internal::UnorderedElementsAreArrayMatcher<T> IsSupersetOf(
-    ::std::initializer_list<T> xs) {
-  return IsSupersetOf(xs.begin(), xs.end());
-}
-
-// IsSubsetOf(iterator_first, iterator_last)
-// IsSubsetOf(pointer, count)
-// IsSubsetOf(array)
-// IsSubsetOf(container)
-// IsSubsetOf({e1, e2, ..., en})
-//
-// IsSubsetOf() verifies that an injective mapping onto a collection of matchers
-// exists.  In other words, a container matches IsSubsetOf({e1, ..., en}) if and
-// only if there is a subset of matchers {m1, ..., mk} which would match the
-// container using UnorderedElementsAre.  Obviously, the size of the container
-// must be <= n in order to have a match. Examples:
-//
-// - {1} matches IsSubsetOf({Gt(0), Lt(0)}), as 1 matches Gt(0).
-// - {1, -1} matches IsSubsetOf({Lt(0), Gt(0)}), as 1 matches Gt(0) and -1
-//   matches Lt(0).
-// - {1, 2} doesn't matches IsSubsetOf({Gt(0), Lt(0)}), even though 1 and 2 both
-//   match Gt(0). The reason is that different matchers must be used for
-//   elements in different slots of the container.
-//
-// The matchers can be specified as an array, a pointer and count, a container,
-// 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>
-IsSubsetOf(Iter first, Iter last) {
-  typedef typename ::std::iterator_traits<Iter>::value_type T;
-  return internal::UnorderedElementsAreArrayMatcher<T>(
-      internal::UnorderedMatcherRequire::Subset, first, last);
-}
-
-template <typename T>
-inline internal::UnorderedElementsAreArrayMatcher<T> IsSubsetOf(
-    const T* pointer, size_t count) {
-  return IsSubsetOf(pointer, pointer + count);
-}
-
-template <typename T, size_t N>
-inline internal::UnorderedElementsAreArrayMatcher<T> IsSubsetOf(
-    const T (&array)[N]) {
-  return IsSubsetOf(array, N);
-}
-
-template <typename Container>
-inline internal::UnorderedElementsAreArrayMatcher<
-    typename Container::value_type>
-IsSubsetOf(const Container& container) {
-  return IsSubsetOf(container.begin(), container.end());
-}
-
-template <typename T>
-inline internal::UnorderedElementsAreArrayMatcher<T> IsSubsetOf(
-    ::std::initializer_list<T> xs) {
-  return IsSubsetOf(xs.begin(), xs.end());
-}
-
+// IsSupersetOf(iterator_first, iterator_last) 
+// IsSupersetOf(pointer, count) 
+// IsSupersetOf(array) 
+// IsSupersetOf(container) 
+// IsSupersetOf({e1, e2, ..., en}) 
+// 
+// IsSupersetOf() verifies that a surjective partial mapping onto a collection 
+// of matchers exists. In other words, a container matches 
+// IsSupersetOf({e1, ..., en}) if and only if there is a permutation 
+// {y1, ..., yn} of some of the container's elements where y1 matches e1, 
+// ..., and yn matches en. Obviously, the size of the container must be >= n 
+// in order to have a match. Examples: 
+// 
+// - {1, 2, 3} matches IsSupersetOf({Ge(3), Ne(0)}), as 3 matches Ge(3) and 
+//   1 matches Ne(0). 
+// - {1, 2} doesn't match IsSupersetOf({Eq(1), Lt(2)}), even though 1 matches 
+//   both Eq(1) and Lt(2). The reason is that different matchers must be used 
+//   for elements in different slots of the container. 
+// - {1, 1, 2} matches IsSupersetOf({Eq(1), Lt(2)}), as (the first) 1 matches 
+//   Eq(1) and (the second) 1 matches Lt(2). 
+// - {1, 2, 3} matches IsSupersetOf(Gt(1), Gt(1)), as 2 matches (the first) 
+//   Gt(1) and 3 matches (the second) Gt(1). 
+// 
+// The matchers can be specified as an array, a pointer and count, a container, 
+// 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> 
+IsSupersetOf(Iter first, Iter last) { 
+  typedef typename ::std::iterator_traits<Iter>::value_type T; 
+  return internal::UnorderedElementsAreArrayMatcher<T>( 
+      internal::UnorderedMatcherRequire::Superset, first, last); 
+} 
+ 
+template <typename T> 
+inline internal::UnorderedElementsAreArrayMatcher<T> IsSupersetOf( 
+    const T* pointer, size_t count) { 
+  return IsSupersetOf(pointer, pointer + count); 
+} 
+ 
+template <typename T, size_t N> 
+inline internal::UnorderedElementsAreArrayMatcher<T> IsSupersetOf( 
+    const T (&array)[N]) { 
+  return IsSupersetOf(array, N); 
+} 
+ 
+template <typename Container> 
+inline internal::UnorderedElementsAreArrayMatcher< 
+    typename Container::value_type> 
+IsSupersetOf(const Container& container) { 
+  return IsSupersetOf(container.begin(), container.end()); 
+} 
+ 
+template <typename T> 
+inline internal::UnorderedElementsAreArrayMatcher<T> IsSupersetOf( 
+    ::std::initializer_list<T> xs) { 
+  return IsSupersetOf(xs.begin(), xs.end()); 
+} 
+ 
+// IsSubsetOf(iterator_first, iterator_last) 
+// IsSubsetOf(pointer, count) 
+// IsSubsetOf(array) 
+// IsSubsetOf(container) 
+// IsSubsetOf({e1, e2, ..., en}) 
+// 
+// IsSubsetOf() verifies that an injective mapping onto a collection of matchers 
+// exists.  In other words, a container matches IsSubsetOf({e1, ..., en}) if and 
+// only if there is a subset of matchers {m1, ..., mk} which would match the 
+// container using UnorderedElementsAre.  Obviously, the size of the container 
+// must be <= n in order to have a match. Examples: 
+// 
+// - {1} matches IsSubsetOf({Gt(0), Lt(0)}), as 1 matches Gt(0). 
+// - {1, -1} matches IsSubsetOf({Lt(0), Gt(0)}), as 1 matches Gt(0) and -1 
+//   matches Lt(0). 
+// - {1, 2} doesn't matches IsSubsetOf({Gt(0), Lt(0)}), even though 1 and 2 both 
+//   match Gt(0). The reason is that different matchers must be used for 
+//   elements in different slots of the container. 
+// 
+// The matchers can be specified as an array, a pointer and count, a container, 
+// 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> 
+IsSubsetOf(Iter first, Iter last) { 
+  typedef typename ::std::iterator_traits<Iter>::value_type T; 
+  return internal::UnorderedElementsAreArrayMatcher<T>( 
+      internal::UnorderedMatcherRequire::Subset, first, last); 
+} 
+ 
+template <typename T> 
+inline internal::UnorderedElementsAreArrayMatcher<T> IsSubsetOf( 
+    const T* pointer, size_t count) { 
+  return IsSubsetOf(pointer, pointer + count); 
+} 
+ 
+template <typename T, size_t N> 
+inline internal::UnorderedElementsAreArrayMatcher<T> IsSubsetOf( 
+    const T (&array)[N]) { 
+  return IsSubsetOf(array, N); 
+} 
+ 
+template <typename Container> 
+inline internal::UnorderedElementsAreArrayMatcher< 
+    typename Container::value_type> 
+IsSubsetOf(const Container& container) { 
+  return IsSubsetOf(container.begin(), container.end()); 
+} 
+ 
+template <typename T> 
+inline internal::UnorderedElementsAreArrayMatcher<T> IsSubsetOf( 
+    ::std::initializer_list<T> xs) { 
+  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.
 //
@@ -4809,35 +4809,35 @@ Pair(FirstMatcher first_matcher, SecondMatcher second_matcher) {
       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
-// are enabled any class that supports them.
-// In particular, `std::tuple`, `std::pair`, `std::array` and aggregate types.
-template <typename... M>
-internal::FieldsAreMatcher<typename std::decay<M>::type...> FieldsAre(
-    M&&... matchers) {
-  return internal::FieldsAreMatcher<typename std::decay<M>::type...>(
-      std::forward<M>(matchers)...);
-}
-
-// Creates a matcher that matches a pointer (raw or smart) that matches
-// inner_matcher.
-template <typename InnerMatcher>
-inline internal::PointerMatcher<InnerMatcher> Pointer(
-    const InnerMatcher& inner_matcher) {
-  return internal::PointerMatcher<InnerMatcher>(inner_matcher);
-}
-
-// Creates a matcher that matches an object that has an address that matches
-// inner_matcher.
-template <typename InnerMatcher>
-inline internal::AddressMatcher<InnerMatcher> Address(
-    const InnerMatcher& inner_matcher) {
-  return internal::AddressMatcher<InnerMatcher>(inner_matcher);
-}
-}  // namespace no_adl
-
+namespace no_adl { 
+// FieldsAre(matchers...) matches piecewise the fields of compatible structs. 
+// These include those that support `get<I>(obj)`, and when structured bindings 
+// are enabled any class that supports them. 
+// In particular, `std::tuple`, `std::pair`, `std::array` and aggregate types. 
+template <typename... M> 
+internal::FieldsAreMatcher<typename std::decay<M>::type...> FieldsAre( 
+    M&&... matchers) { 
+  return internal::FieldsAreMatcher<typename std::decay<M>::type...>( 
+      std::forward<M>(matchers)...); 
+} 
+ 
+// Creates a matcher that matches a pointer (raw or smart) that matches 
+// inner_matcher. 
+template <typename InnerMatcher> 
+inline internal::PointerMatcher<InnerMatcher> Pointer( 
+    const InnerMatcher& inner_matcher) { 
+  return internal::PointerMatcher<InnerMatcher>(inner_matcher); 
+} 
+ 
+// Creates a matcher that matches an object that has an address that matches 
+// inner_matcher. 
+template <typename InnerMatcher> 
+inline internal::AddressMatcher<InnerMatcher> Address( 
+    const InnerMatcher& inner_matcher) { 
+  return internal::AddressMatcher<InnerMatcher>(inner_matcher); 
+} 
+}  // namespace no_adl 
+ 
 // Returns a predicate that is satisfied by anything that matches the
 // given matcher.
 template <typename M>
@@ -4845,7 +4845,7 @@ inline internal::MatcherAsPredicate<M> Matches(M matcher) {
   return internal::MatcherAsPredicate<M>(matcher);
 }
 
-// Returns true if and only if the value matches the 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);
@@ -4859,153 +4859,153 @@ inline bool ExplainMatchResult(
   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:
-//
-// MATCHER_P(XAndYThat, matcher,
-//           "X that " + DescribeMatcher<int>(matcher, negation) +
-//               " and Y that " + DescribeMatcher<double>(matcher, negation)) {
-//   return ExplainMatchResult(matcher, arg.x(), result_listener) &&
-//          ExplainMatchResult(matcher, arg.y(), result_listener);
-// }
-template <typename T, typename M>
-std::string DescribeMatcher(const M& matcher, bool negation = false) {
-  ::std::stringstream ss;
-  Matcher<T> monomorphic_matcher = SafeMatcherCast<T>(matcher);
-  if (negation) {
-    monomorphic_matcher.DescribeNegationTo(&ss);
-  } else {
-    monomorphic_matcher.DescribeTo(&ss);
-  }
-  return ss.str();
-}
-
-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>
-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.
+// 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: 
+// 
+// MATCHER_P(XAndYThat, matcher, 
+//           "X that " + DescribeMatcher<int>(matcher, negation) + 
+//               " and Y that " + DescribeMatcher<double>(matcher, negation)) { 
+//   return ExplainMatchResult(matcher, arg.x(), result_listener) && 
+//          ExplainMatchResult(matcher, arg.y(), result_listener); 
+// } 
+template <typename T, typename M> 
+std::string DescribeMatcher(const M& matcher, bool negation = false) { 
+  ::std::stringstream ss; 
+  Matcher<T> monomorphic_matcher = SafeMatcherCast<T>(matcher); 
+  if (negation) { 
+    monomorphic_matcher.DescribeNegationTo(&ss); 
+  } else { 
+    monomorphic_matcher.DescribeTo(&ss); 
+  } 
+  return ss.str(); 
+} 
+ 
 template <typename... Args>
-internal::AllOfMatcher<typename std::decay<const Args&>::type...> AllOf(
-    const Args&... matchers) {
-  return internal::AllOfMatcher<typename std::decay<const Args&>::type...>(
-      matchers...);
+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>
-internal::AnyOfMatcher<typename std::decay<const Args&>::type...> AnyOf(
-    const Args&... matchers) {
-  return internal::AnyOfMatcher<typename std::decay<const Args&>::type...>(
-      matchers...);
-}
-
-// AnyOfArray(array)
-// AnyOfArray(pointer, count)
-// AnyOfArray(container)
-// AnyOfArray({ e1, e2, ..., en })
-// AnyOfArray(iterator_first, iterator_last)
-//
-// AnyOfArray() verifies whether a given value matches any member of a
-// collection of matchers.
-//
-// AllOfArray(array)
-// AllOfArray(pointer, count)
-// AllOfArray(container)
-// AllOfArray({ e1, e2, ..., en })
-// AllOfArray(iterator_first, iterator_last)
-//
-// AllOfArray() verifies whether a given value matches all members of a
-// collection of matchers.
-//
-// The matchers can be specified as an array, a pointer and count, a container,
-// 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::AnyOfArrayMatcher<
-    typename ::std::iterator_traits<Iter>::value_type>
-AnyOfArray(Iter first, Iter last) {
-  return internal::AnyOfArrayMatcher<
-      typename ::std::iterator_traits<Iter>::value_type>(first, last);
-}
-
-template <typename Iter>
-inline internal::AllOfArrayMatcher<
-    typename ::std::iterator_traits<Iter>::value_type>
-AllOfArray(Iter first, Iter last) {
-  return internal::AllOfArrayMatcher<
-      typename ::std::iterator_traits<Iter>::value_type>(first, last);
-}
-
-template <typename T>
-inline internal::AnyOfArrayMatcher<T> AnyOfArray(const T* ptr, size_t count) {
-  return AnyOfArray(ptr, ptr + count);
-}
-
-template <typename T>
-inline internal::AllOfArrayMatcher<T> AllOfArray(const T* ptr, size_t count) {
-  return AllOfArray(ptr, ptr + count);
-}
-
-template <typename T, size_t N>
-inline internal::AnyOfArrayMatcher<T> AnyOfArray(const T (&array)[N]) {
-  return AnyOfArray(array, N);
-}
-
-template <typename T, size_t N>
-inline internal::AllOfArrayMatcher<T> AllOfArray(const T (&array)[N]) {
-  return AllOfArray(array, N);
-}
-
-template <typename Container>
-inline internal::AnyOfArrayMatcher<typename Container::value_type> AnyOfArray(
-    const Container& container) {
-  return AnyOfArray(container.begin(), container.end());
-}
-
-template <typename Container>
-inline internal::AllOfArrayMatcher<typename Container::value_type> AllOfArray(
-    const Container& container) {
-  return AllOfArray(container.begin(), container.end());
-}
-
-template <typename T>
-inline internal::AnyOfArrayMatcher<T> AnyOfArray(
-    ::std::initializer_list<T> xs) {
-  return AnyOfArray(xs.begin(), xs.end());
-}
-
-template <typename T>
-inline internal::AllOfArrayMatcher<T> AllOfArray(
-    ::std::initializer_list<T> xs) {
-  return AllOfArray(xs.begin(), xs.end());
-}
-
-// Args<N1, N2, ..., Nk>(a_matcher) matches a tuple if the selected
-// fields of it matches a_matcher.  C++ doesn't support default
-// arguments for function templates, so we have to overload it.
-template <size_t... k, typename InnerMatcher>
-internal::ArgsMatcher<typename std::decay<InnerMatcher>::type, k...> Args(
-    InnerMatcher&& matcher) {
-  return internal::ArgsMatcher<typename std::decay<InnerMatcher>::type, k...>(
-      std::forward<InnerMatcher>(matcher));
-}
-
+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( 
+    const Args&... matchers) { 
+  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) { 
+  return internal::AnyOfMatcher<typename std::decay<const Args&>::type...>( 
+      matchers...); 
+} 
+ 
+// AnyOfArray(array) 
+// AnyOfArray(pointer, count) 
+// AnyOfArray(container) 
+// AnyOfArray({ e1, e2, ..., en }) 
+// AnyOfArray(iterator_first, iterator_last) 
+// 
+// AnyOfArray() verifies whether a given value matches any member of a 
+// collection of matchers. 
+// 
+// AllOfArray(array) 
+// AllOfArray(pointer, count) 
+// AllOfArray(container) 
+// AllOfArray({ e1, e2, ..., en }) 
+// AllOfArray(iterator_first, iterator_last) 
+// 
+// AllOfArray() verifies whether a given value matches all members of a 
+// collection of matchers. 
+// 
+// The matchers can be specified as an array, a pointer and count, a container, 
+// 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::AnyOfArrayMatcher< 
+    typename ::std::iterator_traits<Iter>::value_type> 
+AnyOfArray(Iter first, Iter last) { 
+  return internal::AnyOfArrayMatcher< 
+      typename ::std::iterator_traits<Iter>::value_type>(first, last); 
+} 
+ 
+template <typename Iter> 
+inline internal::AllOfArrayMatcher< 
+    typename ::std::iterator_traits<Iter>::value_type> 
+AllOfArray(Iter first, Iter last) { 
+  return internal::AllOfArrayMatcher< 
+      typename ::std::iterator_traits<Iter>::value_type>(first, last); 
+} 
+ 
+template <typename T> 
+inline internal::AnyOfArrayMatcher<T> AnyOfArray(const T* ptr, size_t count) { 
+  return AnyOfArray(ptr, ptr + count); 
+} 
+ 
+template <typename T> 
+inline internal::AllOfArrayMatcher<T> AllOfArray(const T* ptr, size_t count) { 
+  return AllOfArray(ptr, ptr + count); 
+} 
+ 
+template <typename T, size_t N> 
+inline internal::AnyOfArrayMatcher<T> AnyOfArray(const T (&array)[N]) { 
+  return AnyOfArray(array, N); 
+} 
+ 
+template <typename T, size_t N> 
+inline internal::AllOfArrayMatcher<T> AllOfArray(const T (&array)[N]) { 
+  return AllOfArray(array, N); 
+} 
+ 
+template <typename Container> 
+inline internal::AnyOfArrayMatcher<typename Container::value_type> AnyOfArray( 
+    const Container& container) { 
+  return AnyOfArray(container.begin(), container.end()); 
+} 
+ 
+template <typename Container> 
+inline internal::AllOfArrayMatcher<typename Container::value_type> AllOfArray( 
+    const Container& container) { 
+  return AllOfArray(container.begin(), container.end()); 
+} 
+ 
+template <typename T> 
+inline internal::AnyOfArrayMatcher<T> AnyOfArray( 
+    ::std::initializer_list<T> xs) { 
+  return AnyOfArray(xs.begin(), xs.end()); 
+} 
+ 
+template <typename T> 
+inline internal::AllOfArrayMatcher<T> AllOfArray( 
+    ::std::initializer_list<T> xs) { 
+  return AllOfArray(xs.begin(), xs.end()); 
+} 
+ 
+// Args<N1, N2, ..., Nk>(a_matcher) matches a tuple if the selected 
+// fields of it matches a_matcher.  C++ doesn't support default 
+// arguments for function templates, so we have to overload it. 
+template <size_t... k, typename InnerMatcher> 
+internal::ArgsMatcher<typename std::decay<InnerMatcher>::type, k...> Args( 
+    InnerMatcher&& matcher) { 
+  return internal::ArgsMatcher<typename std::decay<InnerMatcher>::type, k...>( 
+      std::forward<InnerMatcher>(matcher)); 
+} 
+ 
 // AllArgs(m) is a synonym of m.  This is useful in
 //
 //   EXPECT_CALL(foo, Bar(_, _)).With(AllArgs(Eq()));
@@ -5016,377 +5016,377 @@ internal::ArgsMatcher<typename std::decay<InnerMatcher>::type, k...> Args(
 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'
-// and is printable using 'PrintToString'. It is compatible with
-// std::optional/std::experimental::optional.
-// Note that to compare an optional type variable against nullopt you should
-// use Eq(nullopt) and not Eq(Optional(nullopt)). The latter implies that the
-// optional value contains an optional itself.
-template <typename ValueMatcher>
-inline internal::OptionalMatcher<ValueMatcher> Optional(
-    const ValueMatcher& value_matcher) {
-  return internal::OptionalMatcher<ValueMatcher>(value_matcher);
-}
-
-// Returns a matcher that matches the value of a absl::any type variable.
-template <typename T>
-PolymorphicMatcher<internal::any_cast_matcher::AnyCastMatcher<T> > AnyWith(
-    const Matcher<const T&>& matcher) {
-  return MakePolymorphicMatcher(
-      internal::any_cast_matcher::AnyCastMatcher<T>(matcher));
-}
-
-// Returns a matcher that matches the value of a variant<> type variable.
-// The matcher implementation uses ADL to find the holds_alternative and get
-// functions.
-// It is compatible with std::variant.
-template <typename T>
-PolymorphicMatcher<internal::variant_matcher::VariantMatcher<T> > VariantWith(
-    const Matcher<const T&>& matcher) {
-  return MakePolymorphicMatcher(
-      internal::variant_matcher::VariantMatcher<T>(matcher));
-}
-
-#if GTEST_HAS_EXCEPTIONS
-
-// Anything inside the `internal` namespace is internal to the implementation
-// and must not be used in user code!
-namespace internal {
-
-class WithWhatMatcherImpl {
- public:
-  WithWhatMatcherImpl(Matcher<std::string> matcher)
-      : matcher_(std::move(matcher)) {}
-
-  void DescribeTo(std::ostream* os) const {
-    *os << "contains .what() that ";
-    matcher_.DescribeTo(os);
-  }
-
-  void DescribeNegationTo(std::ostream* os) const {
-    *os << "contains .what() that does not ";
-    matcher_.DescribeTo(os);
-  }
-
-  template <typename Err>
-  bool MatchAndExplain(const Err& err, MatchResultListener* listener) const {
-    *listener << "which contains .what() that ";
-    return matcher_.MatchAndExplain(err.what(), listener);
-  }
-
- private:
-  const Matcher<std::string> matcher_;
-};
-
-inline PolymorphicMatcher<WithWhatMatcherImpl> WithWhat(
-    Matcher<std::string> m) {
-  return MakePolymorphicMatcher(WithWhatMatcherImpl(std::move(m)));
-}
-
-template <typename Err>
-class ExceptionMatcherImpl {
-  class NeverThrown {
-   public:
-    const char* what() const noexcept {
-      return "this exception should never be thrown";
-    }
-  };
-
-  // If the matchee raises an exception of a wrong type, we'd like to
-  // catch it and print its message and type. To do that, we add an additional
-  // catch clause:
-  //
-  //     try { ... }
-  //     catch (const Err&) { /* an expected exception */ }
-  //     catch (const std::exception&) { /* exception of a wrong type */ }
-  //
-  // However, if the `Err` itself is `std::exception`, we'd end up with two
-  // identical `catch` clauses:
-  //
-  //     try { ... }
-  //     catch (const std::exception&) { /* an expected exception */ }
-  //     catch (const std::exception&) { /* exception of a wrong type */ }
-  //
-  // This can cause a warning or an error in some compilers. To resolve
-  // the issue, we use a fake error type whenever `Err` is `std::exception`:
-  //
-  //     try { ... }
-  //     catch (const std::exception&) { /* an expected exception */ }
-  //     catch (const NeverThrown&) { /* exception of a wrong type */ }
-  using DefaultExceptionType = typename std::conditional<
-      std::is_same<typename std::remove_cv<
-                       typename std::remove_reference<Err>::type>::type,
-                   std::exception>::value,
-      const NeverThrown&, const std::exception&>::type;
-
- public:
-  ExceptionMatcherImpl(Matcher<const Err&> matcher)
-      : matcher_(std::move(matcher)) {}
-
-  void DescribeTo(std::ostream* os) const {
-    *os << "throws an exception which is a " << GetTypeName<Err>();
-    *os << " which ";
-    matcher_.DescribeTo(os);
-  }
-
-  void DescribeNegationTo(std::ostream* os) const {
-    *os << "throws an exception which is not a " << GetTypeName<Err>();
-    *os << " which ";
-    matcher_.DescribeNegationTo(os);
-  }
-
-  template <typename T>
-  bool MatchAndExplain(T&& x, MatchResultListener* listener) const {
-    try {
-      (void)(std::forward<T>(x)());
-    } catch (const Err& err) {
-      *listener << "throws an exception which is a " << GetTypeName<Err>();
-      *listener << " ";
-      return matcher_.MatchAndExplain(err, listener);
-    } catch (DefaultExceptionType err) {
-#if GTEST_HAS_RTTI
-      *listener << "throws an exception of type " << GetTypeName(typeid(err));
-      *listener << " ";
-#else
-      *listener << "throws an std::exception-derived type ";
-#endif
-      *listener << "with description \"" << err.what() << "\"";
-      return false;
-    } catch (...) {
-      *listener << "throws an exception of an unknown type";
-      return false;
-    }
-
-    *listener << "does not throw any exception";
-    return false;
-  }
-
- private:
-  const Matcher<const Err&> matcher_;
-};
-
-}  // namespace internal
-
-// Throws()
-// Throws(exceptionMatcher)
-// ThrowsMessage(messageMatcher)
-//
-// This matcher accepts a callable and verifies that when invoked, it throws
-// an exception with the given type and properties.
-//
-// Examples:
-//
-//   EXPECT_THAT(
-//       []() { throw std::runtime_error("message"); },
-//       Throws<std::runtime_error>());
-//
-//   EXPECT_THAT(
-//       []() { throw std::runtime_error("message"); },
-//       ThrowsMessage<std::runtime_error>(HasSubstr("message")));
-//
-//   EXPECT_THAT(
-//       []() { throw std::runtime_error("message"); },
-//       Throws<std::runtime_error>(
-//           Property(&std::runtime_error::what, HasSubstr("message"))));
-
-template <typename Err>
-PolymorphicMatcher<internal::ExceptionMatcherImpl<Err>> Throws() {
-  return MakePolymorphicMatcher(
-      internal::ExceptionMatcherImpl<Err>(A<const Err&>()));
-}
-
-template <typename Err, typename ExceptionMatcher>
-PolymorphicMatcher<internal::ExceptionMatcherImpl<Err>> Throws(
-    const ExceptionMatcher& exception_matcher) {
-  // Using matcher cast allows users to pass a matcher of a more broad type.
-  // For example user may want to pass Matcher<std::exception>
-  // to Throws<std::runtime_error>, or Matcher<int64> to Throws<int32>.
-  return MakePolymorphicMatcher(internal::ExceptionMatcherImpl<Err>(
-      SafeMatcherCast<const Err&>(exception_matcher)));
-}
-
-template <typename Err, typename MessageMatcher>
-PolymorphicMatcher<internal::ExceptionMatcherImpl<Err>> ThrowsMessage(
-    MessageMatcher&& message_matcher) {
-  static_assert(std::is_base_of<std::exception, Err>::value,
-                "expected an std::exception-derived type");
-  return Throws<Err>(internal::WithWhat(
-      MatcherCast<std::string>(std::forward<MessageMatcher>(message_matcher))));
-}
-
-#endif  // GTEST_HAS_EXCEPTIONS
-
+// 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' 
+// and is printable using 'PrintToString'. It is compatible with 
+// std::optional/std::experimental::optional. 
+// Note that to compare an optional type variable against nullopt you should 
+// use Eq(nullopt) and not Eq(Optional(nullopt)). The latter implies that the 
+// optional value contains an optional itself. 
+template <typename ValueMatcher> 
+inline internal::OptionalMatcher<ValueMatcher> Optional( 
+    const ValueMatcher& value_matcher) { 
+  return internal::OptionalMatcher<ValueMatcher>(value_matcher); 
+} 
+ 
+// Returns a matcher that matches the value of a absl::any type variable. 
+template <typename T> 
+PolymorphicMatcher<internal::any_cast_matcher::AnyCastMatcher<T> > AnyWith( 
+    const Matcher<const T&>& matcher) { 
+  return MakePolymorphicMatcher( 
+      internal::any_cast_matcher::AnyCastMatcher<T>(matcher)); 
+} 
+ 
+// Returns a matcher that matches the value of a variant<> type variable. 
+// The matcher implementation uses ADL to find the holds_alternative and get 
+// functions. 
+// It is compatible with std::variant. 
+template <typename T> 
+PolymorphicMatcher<internal::variant_matcher::VariantMatcher<T> > VariantWith( 
+    const Matcher<const T&>& matcher) { 
+  return MakePolymorphicMatcher( 
+      internal::variant_matcher::VariantMatcher<T>(matcher)); 
+} 
+ 
+#if GTEST_HAS_EXCEPTIONS 
+ 
+// Anything inside the `internal` namespace is internal to the implementation 
+// and must not be used in user code! 
+namespace internal { 
+ 
+class WithWhatMatcherImpl { 
+ public: 
+  WithWhatMatcherImpl(Matcher<std::string> matcher) 
+      : matcher_(std::move(matcher)) {} 
+ 
+  void DescribeTo(std::ostream* os) const { 
+    *os << "contains .what() that "; 
+    matcher_.DescribeTo(os); 
+  } 
+ 
+  void DescribeNegationTo(std::ostream* os) const { 
+    *os << "contains .what() that does not "; 
+    matcher_.DescribeTo(os); 
+  } 
+ 
+  template <typename Err> 
+  bool MatchAndExplain(const Err& err, MatchResultListener* listener) const { 
+    *listener << "which contains .what() that "; 
+    return matcher_.MatchAndExplain(err.what(), listener); 
+  } 
+ 
+ private: 
+  const Matcher<std::string> matcher_; 
+}; 
+ 
+inline PolymorphicMatcher<WithWhatMatcherImpl> WithWhat( 
+    Matcher<std::string> m) { 
+  return MakePolymorphicMatcher(WithWhatMatcherImpl(std::move(m))); 
+} 
+ 
+template <typename Err> 
+class ExceptionMatcherImpl { 
+  class NeverThrown { 
+   public: 
+    const char* what() const noexcept { 
+      return "this exception should never be thrown"; 
+    } 
+  }; 
+ 
+  // If the matchee raises an exception of a wrong type, we'd like to 
+  // catch it and print its message and type. To do that, we add an additional 
+  // catch clause: 
+  // 
+  //     try { ... } 
+  //     catch (const Err&) { /* an expected exception */ } 
+  //     catch (const std::exception&) { /* exception of a wrong type */ } 
+  // 
+  // However, if the `Err` itself is `std::exception`, we'd end up with two 
+  // identical `catch` clauses: 
+  // 
+  //     try { ... } 
+  //     catch (const std::exception&) { /* an expected exception */ } 
+  //     catch (const std::exception&) { /* exception of a wrong type */ } 
+  // 
+  // This can cause a warning or an error in some compilers. To resolve 
+  // the issue, we use a fake error type whenever `Err` is `std::exception`: 
+  // 
+  //     try { ... } 
+  //     catch (const std::exception&) { /* an expected exception */ } 
+  //     catch (const NeverThrown&) { /* exception of a wrong type */ } 
+  using DefaultExceptionType = typename std::conditional< 
+      std::is_same<typename std::remove_cv< 
+                       typename std::remove_reference<Err>::type>::type, 
+                   std::exception>::value, 
+      const NeverThrown&, const std::exception&>::type; 
+ 
+ public: 
+  ExceptionMatcherImpl(Matcher<const Err&> matcher) 
+      : matcher_(std::move(matcher)) {} 
+ 
+  void DescribeTo(std::ostream* os) const { 
+    *os << "throws an exception which is a " << GetTypeName<Err>(); 
+    *os << " which "; 
+    matcher_.DescribeTo(os); 
+  } 
+ 
+  void DescribeNegationTo(std::ostream* os) const { 
+    *os << "throws an exception which is not a " << GetTypeName<Err>(); 
+    *os << " which "; 
+    matcher_.DescribeNegationTo(os); 
+  } 
+ 
+  template <typename T> 
+  bool MatchAndExplain(T&& x, MatchResultListener* listener) const { 
+    try { 
+      (void)(std::forward<T>(x)()); 
+    } catch (const Err& err) { 
+      *listener << "throws an exception which is a " << GetTypeName<Err>(); 
+      *listener << " "; 
+      return matcher_.MatchAndExplain(err, listener); 
+    } catch (DefaultExceptionType err) { 
+#if GTEST_HAS_RTTI 
+      *listener << "throws an exception of type " << GetTypeName(typeid(err)); 
+      *listener << " "; 
+#else 
+      *listener << "throws an std::exception-derived type "; 
+#endif 
+      *listener << "with description \"" << err.what() << "\""; 
+      return false; 
+    } catch (...) { 
+      *listener << "throws an exception of an unknown type"; 
+      return false; 
+    } 
+ 
+    *listener << "does not throw any exception"; 
+    return false; 
+  } 
+ 
+ private: 
+  const Matcher<const Err&> matcher_; 
+}; 
+ 
+}  // namespace internal 
+ 
+// Throws() 
+// Throws(exceptionMatcher) 
+// ThrowsMessage(messageMatcher) 
+// 
+// This matcher accepts a callable and verifies that when invoked, it throws 
+// an exception with the given type and properties. 
+// 
+// Examples: 
+// 
+//   EXPECT_THAT( 
+//       []() { throw std::runtime_error("message"); }, 
+//       Throws<std::runtime_error>()); 
+// 
+//   EXPECT_THAT( 
+//       []() { throw std::runtime_error("message"); }, 
+//       ThrowsMessage<std::runtime_error>(HasSubstr("message"))); 
+// 
+//   EXPECT_THAT( 
+//       []() { throw std::runtime_error("message"); }, 
+//       Throws<std::runtime_error>( 
+//           Property(&std::runtime_error::what, HasSubstr("message")))); 
+ 
+template <typename Err> 
+PolymorphicMatcher<internal::ExceptionMatcherImpl<Err>> Throws() { 
+  return MakePolymorphicMatcher( 
+      internal::ExceptionMatcherImpl<Err>(A<const Err&>())); 
+} 
+ 
+template <typename Err, typename ExceptionMatcher> 
+PolymorphicMatcher<internal::ExceptionMatcherImpl<Err>> Throws( 
+    const ExceptionMatcher& exception_matcher) { 
+  // Using matcher cast allows users to pass a matcher of a more broad type. 
+  // For example user may want to pass Matcher<std::exception> 
+  // to Throws<std::runtime_error>, or Matcher<int64> to Throws<int32>. 
+  return MakePolymorphicMatcher(internal::ExceptionMatcherImpl<Err>( 
+      SafeMatcherCast<const Err&>(exception_matcher))); 
+} 
+ 
+template <typename Err, typename MessageMatcher> 
+PolymorphicMatcher<internal::ExceptionMatcherImpl<Err>> ThrowsMessage( 
+    MessageMatcher&& message_matcher) { 
+  static_assert(std::is_base_of<std::exception, Err>::value, 
+                "expected an std::exception-derived type"); 
+  return Throws<Err>(internal::WithWhat( 
+      MatcherCast<std::string>(std::forward<MessageMatcher>(message_matcher)))); 
+} 
+ 
+#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)
-// 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.
+// 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)
 
-// MATCHER* macroses itself are listed below.
-#define MATCHER(name, description)                                             \
-  class name##Matcher                                                          \
-      : public ::testing::internal::MatcherBaseImpl<name##Matcher> {           \
-   public:                                                                     \
-    template <typename arg_type>                                               \
-    class gmock_Impl : public ::testing::MatcherInterface<const arg_type&> {   \
-     public:                                                                   \
-      gmock_Impl() {}                                                          \
-      bool MatchAndExplain(                                                    \
-          const arg_type& arg,                                                 \
-          ::testing::MatchResultListener* result_listener) const override;     \
-      void DescribeTo(::std::ostream* gmock_os) const override {               \
-        *gmock_os << FormatDescription(false);                                 \
-      }                                                                        \
-      void DescribeNegationTo(::std::ostream* gmock_os) const override {       \
-        *gmock_os << FormatDescription(true);                                  \
-      }                                                                        \
-                                                                               \
-     private:                                                                  \
-      ::std::string FormatDescription(bool negation) const {                   \
-        ::std::string gmock_description = (description);                       \
-        if (!gmock_description.empty()) {                                      \
-          return gmock_description;                                            \
-        }                                                                      \
-        return ::testing::internal::FormatMatcherDescription(negation, #name,  \
-                                                             {});              \
-      }                                                                        \
-    };                                                                         \
-  };                                                                           \
-  GTEST_ATTRIBUTE_UNUSED_ inline name##Matcher name() { return {}; }           \
-  template <typename arg_type>                                                 \
-  bool name##Matcher::gmock_Impl<arg_type>::MatchAndExplain(                   \
-      const arg_type& arg,                                                     \
-      ::testing::MatchResultListener* result_listener GTEST_ATTRIBUTE_UNUSED_) \
-      const
-
-#define MATCHER_P(name, p0, description) \
-  GMOCK_INTERNAL_MATCHER(name, name##MatcherP, description, (p0))
-#define MATCHER_P2(name, p0, p1, description) \
-  GMOCK_INTERNAL_MATCHER(name, name##MatcherP2, description, (p0, p1))
-#define MATCHER_P3(name, p0, p1, p2, description) \
-  GMOCK_INTERNAL_MATCHER(name, name##MatcherP3, description, (p0, p1, p2))
-#define MATCHER_P4(name, p0, p1, p2, p3, description) \
-  GMOCK_INTERNAL_MATCHER(name, name##MatcherP4, description, (p0, p1, p2, p3))
-#define MATCHER_P5(name, p0, p1, p2, p3, p4, description)    \
-  GMOCK_INTERNAL_MATCHER(name, name##MatcherP5, description, \
-                         (p0, p1, p2, p3, p4))
-#define MATCHER_P6(name, p0, p1, p2, p3, p4, p5, description) \
-  GMOCK_INTERNAL_MATCHER(name, name##MatcherP6, description,  \
-                         (p0, p1, p2, p3, p4, p5))
-#define MATCHER_P7(name, p0, p1, p2, p3, p4, p5, p6, description) \
-  GMOCK_INTERNAL_MATCHER(name, name##MatcherP7, description,      \
-                         (p0, p1, p2, p3, p4, p5, p6))
-#define MATCHER_P8(name, p0, p1, p2, p3, p4, p5, p6, p7, description) \
-  GMOCK_INTERNAL_MATCHER(name, name##MatcherP8, description,          \
-                         (p0, p1, p2, p3, p4, p5, p6, p7))
-#define MATCHER_P9(name, p0, p1, p2, p3, p4, p5, p6, p7, p8, description) \
-  GMOCK_INTERNAL_MATCHER(name, name##MatcherP9, description,              \
-                         (p0, p1, p2, p3, p4, p5, p6, p7, p8))
-#define MATCHER_P10(name, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, description) \
-  GMOCK_INTERNAL_MATCHER(name, name##MatcherP10, description,                  \
-                         (p0, p1, p2, p3, p4, p5, p6, p7, p8, p9))
-
-#define GMOCK_INTERNAL_MATCHER(name, full_name, description, args)             \
-  template <GMOCK_INTERNAL_MATCHER_TEMPLATE_PARAMS(args)>                      \
-  class full_name : public ::testing::internal::MatcherBaseImpl<               \
-                        full_name<GMOCK_INTERNAL_MATCHER_TYPE_PARAMS(args)>> { \
-   public:                                                                     \
-    using full_name::MatcherBaseImpl::MatcherBaseImpl;                         \
-    template <typename arg_type>                                               \
-    class gmock_Impl : public ::testing::MatcherInterface<const arg_type&> {   \
-     public:                                                                   \
-      explicit gmock_Impl(GMOCK_INTERNAL_MATCHER_FUNCTION_ARGS(args))          \
-          : GMOCK_INTERNAL_MATCHER_FORWARD_ARGS(args) {}                       \
-      bool MatchAndExplain(                                                    \
-          const arg_type& arg,                                                 \
-          ::testing::MatchResultListener* result_listener) const override;     \
-      void DescribeTo(::std::ostream* gmock_os) const override {               \
-        *gmock_os << FormatDescription(false);                                 \
-      }                                                                        \
-      void DescribeNegationTo(::std::ostream* gmock_os) const override {       \
-        *gmock_os << FormatDescription(true);                                  \
-      }                                                                        \
-      GMOCK_INTERNAL_MATCHER_MEMBERS(args)                                     \
-                                                                               \
-     private:                                                                  \
-      ::std::string FormatDescription(bool negation) const {                   \
-        ::std::string gmock_description = (description);                       \
-        if (!gmock_description.empty()) {                                      \
-          return gmock_description;                                            \
-        }                                                                      \
-        return ::testing::internal::FormatMatcherDescription(                  \
-            negation, #name,                                                   \
-            ::testing::internal::UniversalTersePrintTupleFieldsToStrings(      \
-                ::std::tuple<GMOCK_INTERNAL_MATCHER_TYPE_PARAMS(args)>(        \
-                    GMOCK_INTERNAL_MATCHER_MEMBERS_USAGE(args))));             \
-      }                                                                        \
-    };                                                                         \
-  };                                                                           \
-  template <GMOCK_INTERNAL_MATCHER_TEMPLATE_PARAMS(args)>                      \
-  inline full_name<GMOCK_INTERNAL_MATCHER_TYPE_PARAMS(args)> name(             \
-      GMOCK_INTERNAL_MATCHER_FUNCTION_ARGS(args)) {                            \
-    return full_name<GMOCK_INTERNAL_MATCHER_TYPE_PARAMS(args)>(                \
-        GMOCK_INTERNAL_MATCHER_ARGS_USAGE(args));                              \
-  }                                                                            \
-  template <GMOCK_INTERNAL_MATCHER_TEMPLATE_PARAMS(args)>                      \
-  template <typename arg_type>                                                 \
-  bool full_name<GMOCK_INTERNAL_MATCHER_TYPE_PARAMS(args)>::gmock_Impl<        \
-      arg_type>::MatchAndExplain(const arg_type& arg,                          \
-                                 ::testing::MatchResultListener*               \
-                                     result_listener GTEST_ATTRIBUTE_UNUSED_)  \
-      const
-
-#define GMOCK_INTERNAL_MATCHER_TEMPLATE_PARAMS(args) \
-  GMOCK_PP_TAIL(                                     \
-      GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_MATCHER_TEMPLATE_PARAM, , args))
-#define GMOCK_INTERNAL_MATCHER_TEMPLATE_PARAM(i_unused, data_unused, arg) \
-  , typename arg##_type
-
-#define GMOCK_INTERNAL_MATCHER_TYPE_PARAMS(args) \
-  GMOCK_PP_TAIL(GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_MATCHER_TYPE_PARAM, , args))
-#define GMOCK_INTERNAL_MATCHER_TYPE_PARAM(i_unused, data_unused, arg) \
-  , arg##_type
-
-#define GMOCK_INTERNAL_MATCHER_FUNCTION_ARGS(args) \
-  GMOCK_PP_TAIL(dummy_first GMOCK_PP_FOR_EACH(     \
-      GMOCK_INTERNAL_MATCHER_FUNCTION_ARG, , args))
-#define GMOCK_INTERNAL_MATCHER_FUNCTION_ARG(i, data_unused, arg) \
-  , arg##_type gmock_p##i
-
-#define GMOCK_INTERNAL_MATCHER_FORWARD_ARGS(args) \
-  GMOCK_PP_TAIL(GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_MATCHER_FORWARD_ARG, , args))
-#define GMOCK_INTERNAL_MATCHER_FORWARD_ARG(i, data_unused, arg) \
-  , arg(::std::forward<arg##_type>(gmock_p##i))
-
-#define GMOCK_INTERNAL_MATCHER_MEMBERS(args) \
-  GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_MATCHER_MEMBER, , args)
-#define GMOCK_INTERNAL_MATCHER_MEMBER(i_unused, data_unused, arg) \
-  const arg##_type arg;
-
-#define GMOCK_INTERNAL_MATCHER_MEMBERS_USAGE(args) \
-  GMOCK_PP_TAIL(GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_MATCHER_MEMBER_USAGE, , args))
-#define GMOCK_INTERNAL_MATCHER_MEMBER_USAGE(i_unused, data_unused, arg) , arg
-
-#define GMOCK_INTERNAL_MATCHER_ARGS_USAGE(args) \
-  GMOCK_PP_TAIL(GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_MATCHER_ARG_USAGE, , args))
-#define GMOCK_INTERNAL_MATCHER_ARG_USAGE(i, data_unused, arg_unused) \
-  , gmock_p##i
-
-// To prevent ADL on certain functions we put them on a separate namespace.
-using namespace no_adl;  // NOLINT
-
+// MATCHER* macroses itself are listed below. 
+#define MATCHER(name, description)                                             \ 
+  class name##Matcher                                                          \ 
+      : public ::testing::internal::MatcherBaseImpl<name##Matcher> {           \ 
+   public:                                                                     \ 
+    template <typename arg_type>                                               \ 
+    class gmock_Impl : public ::testing::MatcherInterface<const arg_type&> {   \ 
+     public:                                                                   \ 
+      gmock_Impl() {}                                                          \ 
+      bool MatchAndExplain(                                                    \ 
+          const arg_type& arg,                                                 \ 
+          ::testing::MatchResultListener* result_listener) const override;     \ 
+      void DescribeTo(::std::ostream* gmock_os) const override {               \ 
+        *gmock_os << FormatDescription(false);                                 \ 
+      }                                                                        \ 
+      void DescribeNegationTo(::std::ostream* gmock_os) const override {       \ 
+        *gmock_os << FormatDescription(true);                                  \ 
+      }                                                                        \ 
+                                                                               \ 
+     private:                                                                  \ 
+      ::std::string FormatDescription(bool negation) const {                   \ 
+        ::std::string gmock_description = (description);                       \ 
+        if (!gmock_description.empty()) {                                      \ 
+          return gmock_description;                                            \ 
+        }                                                                      \ 
+        return ::testing::internal::FormatMatcherDescription(negation, #name,  \ 
+                                                             {});              \ 
+      }                                                                        \ 
+    };                                                                         \ 
+  };                                                                           \ 
+  GTEST_ATTRIBUTE_UNUSED_ inline name##Matcher name() { return {}; }           \ 
+  template <typename arg_type>                                                 \ 
+  bool name##Matcher::gmock_Impl<arg_type>::MatchAndExplain(                   \ 
+      const arg_type& arg,                                                     \ 
+      ::testing::MatchResultListener* result_listener GTEST_ATTRIBUTE_UNUSED_) \ 
+      const 
+ 
+#define MATCHER_P(name, p0, description) \ 
+  GMOCK_INTERNAL_MATCHER(name, name##MatcherP, description, (p0)) 
+#define MATCHER_P2(name, p0, p1, description) \ 
+  GMOCK_INTERNAL_MATCHER(name, name##MatcherP2, description, (p0, p1)) 
+#define MATCHER_P3(name, p0, p1, p2, description) \ 
+  GMOCK_INTERNAL_MATCHER(name, name##MatcherP3, description, (p0, p1, p2)) 
+#define MATCHER_P4(name, p0, p1, p2, p3, description) \ 
+  GMOCK_INTERNAL_MATCHER(name, name##MatcherP4, description, (p0, p1, p2, p3)) 
+#define MATCHER_P5(name, p0, p1, p2, p3, p4, description)    \ 
+  GMOCK_INTERNAL_MATCHER(name, name##MatcherP5, description, \ 
+                         (p0, p1, p2, p3, p4)) 
+#define MATCHER_P6(name, p0, p1, p2, p3, p4, p5, description) \ 
+  GMOCK_INTERNAL_MATCHER(name, name##MatcherP6, description,  \ 
+                         (p0, p1, p2, p3, p4, p5)) 
+#define MATCHER_P7(name, p0, p1, p2, p3, p4, p5, p6, description) \ 
+  GMOCK_INTERNAL_MATCHER(name, name##MatcherP7, description,      \ 
+                         (p0, p1, p2, p3, p4, p5, p6)) 
+#define MATCHER_P8(name, p0, p1, p2, p3, p4, p5, p6, p7, description) \ 
+  GMOCK_INTERNAL_MATCHER(name, name##MatcherP8, description,          \ 
+                         (p0, p1, p2, p3, p4, p5, p6, p7)) 
+#define MATCHER_P9(name, p0, p1, p2, p3, p4, p5, p6, p7, p8, description) \ 
+  GMOCK_INTERNAL_MATCHER(name, name##MatcherP9, description,              \ 
+                         (p0, p1, p2, p3, p4, p5, p6, p7, p8)) 
+#define MATCHER_P10(name, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, description) \ 
+  GMOCK_INTERNAL_MATCHER(name, name##MatcherP10, description,                  \ 
+                         (p0, p1, p2, p3, p4, p5, p6, p7, p8, p9)) 
+ 
+#define GMOCK_INTERNAL_MATCHER(name, full_name, description, args)             \ 
+  template <GMOCK_INTERNAL_MATCHER_TEMPLATE_PARAMS(args)>                      \ 
+  class full_name : public ::testing::internal::MatcherBaseImpl<               \ 
+                        full_name<GMOCK_INTERNAL_MATCHER_TYPE_PARAMS(args)>> { \ 
+   public:                                                                     \ 
+    using full_name::MatcherBaseImpl::MatcherBaseImpl;                         \ 
+    template <typename arg_type>                                               \ 
+    class gmock_Impl : public ::testing::MatcherInterface<const arg_type&> {   \ 
+     public:                                                                   \ 
+      explicit gmock_Impl(GMOCK_INTERNAL_MATCHER_FUNCTION_ARGS(args))          \ 
+          : GMOCK_INTERNAL_MATCHER_FORWARD_ARGS(args) {}                       \ 
+      bool MatchAndExplain(                                                    \ 
+          const arg_type& arg,                                                 \ 
+          ::testing::MatchResultListener* result_listener) const override;     \ 
+      void DescribeTo(::std::ostream* gmock_os) const override {               \ 
+        *gmock_os << FormatDescription(false);                                 \ 
+      }                                                                        \ 
+      void DescribeNegationTo(::std::ostream* gmock_os) const override {       \ 
+        *gmock_os << FormatDescription(true);                                  \ 
+      }                                                                        \ 
+      GMOCK_INTERNAL_MATCHER_MEMBERS(args)                                     \ 
+                                                                               \ 
+     private:                                                                  \ 
+      ::std::string FormatDescription(bool negation) const {                   \ 
+        ::std::string gmock_description = (description);                       \ 
+        if (!gmock_description.empty()) {                                      \ 
+          return gmock_description;                                            \ 
+        }                                                                      \ 
+        return ::testing::internal::FormatMatcherDescription(                  \ 
+            negation, #name,                                                   \ 
+            ::testing::internal::UniversalTersePrintTupleFieldsToStrings(      \ 
+                ::std::tuple<GMOCK_INTERNAL_MATCHER_TYPE_PARAMS(args)>(        \ 
+                    GMOCK_INTERNAL_MATCHER_MEMBERS_USAGE(args))));             \ 
+      }                                                                        \ 
+    };                                                                         \ 
+  };                                                                           \ 
+  template <GMOCK_INTERNAL_MATCHER_TEMPLATE_PARAMS(args)>                      \ 
+  inline full_name<GMOCK_INTERNAL_MATCHER_TYPE_PARAMS(args)> name(             \ 
+      GMOCK_INTERNAL_MATCHER_FUNCTION_ARGS(args)) {                            \ 
+    return full_name<GMOCK_INTERNAL_MATCHER_TYPE_PARAMS(args)>(                \ 
+        GMOCK_INTERNAL_MATCHER_ARGS_USAGE(args));                              \ 
+  }                                                                            \ 
+  template <GMOCK_INTERNAL_MATCHER_TEMPLATE_PARAMS(args)>                      \ 
+  template <typename arg_type>                                                 \ 
+  bool full_name<GMOCK_INTERNAL_MATCHER_TYPE_PARAMS(args)>::gmock_Impl<        \ 
+      arg_type>::MatchAndExplain(const arg_type& arg,                          \ 
+                                 ::testing::MatchResultListener*               \ 
+                                     result_listener GTEST_ATTRIBUTE_UNUSED_)  \ 
+      const 
+ 
+#define GMOCK_INTERNAL_MATCHER_TEMPLATE_PARAMS(args) \ 
+  GMOCK_PP_TAIL(                                     \ 
+      GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_MATCHER_TEMPLATE_PARAM, , args)) 
+#define GMOCK_INTERNAL_MATCHER_TEMPLATE_PARAM(i_unused, data_unused, arg) \ 
+  , typename arg##_type 
+ 
+#define GMOCK_INTERNAL_MATCHER_TYPE_PARAMS(args) \ 
+  GMOCK_PP_TAIL(GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_MATCHER_TYPE_PARAM, , args)) 
+#define GMOCK_INTERNAL_MATCHER_TYPE_PARAM(i_unused, data_unused, arg) \ 
+  , arg##_type 
+ 
+#define GMOCK_INTERNAL_MATCHER_FUNCTION_ARGS(args) \ 
+  GMOCK_PP_TAIL(dummy_first GMOCK_PP_FOR_EACH(     \ 
+      GMOCK_INTERNAL_MATCHER_FUNCTION_ARG, , args)) 
+#define GMOCK_INTERNAL_MATCHER_FUNCTION_ARG(i, data_unused, arg) \ 
+  , arg##_type gmock_p##i 
+ 
+#define GMOCK_INTERNAL_MATCHER_FORWARD_ARGS(args) \ 
+  GMOCK_PP_TAIL(GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_MATCHER_FORWARD_ARG, , args)) 
+#define GMOCK_INTERNAL_MATCHER_FORWARD_ARG(i, data_unused, arg) \ 
+  , arg(::std::forward<arg##_type>(gmock_p##i)) 
+ 
+#define GMOCK_INTERNAL_MATCHER_MEMBERS(args) \ 
+  GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_MATCHER_MEMBER, , args) 
+#define GMOCK_INTERNAL_MATCHER_MEMBER(i_unused, data_unused, arg) \ 
+  const arg##_type arg; 
+ 
+#define GMOCK_INTERNAL_MATCHER_MEMBERS_USAGE(args) \ 
+  GMOCK_PP_TAIL(GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_MATCHER_MEMBER_USAGE, , args)) 
+#define GMOCK_INTERNAL_MATCHER_MEMBER_USAGE(i_unused, data_unused, arg) , arg 
+ 
+#define GMOCK_INTERNAL_MATCHER_ARGS_USAGE(args) \ 
+  GMOCK_PP_TAIL(GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_MATCHER_ARG_USAGE, , args)) 
+#define GMOCK_INTERNAL_MATCHER_ARG_USAGE(i, data_unused, arg_unused) \ 
+  , gmock_p##i 
+ 
+// To prevent ADL on certain functions we put them on a separate namespace. 
+using namespace no_adl;  // NOLINT 
+ 
 }  // namespace testing
 
-GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251 5046
-
+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"
-
-#endif  // GOOGLEMOCK_INCLUDE_GMOCK_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 fd293358a2..1712771ffe 100644
--- a/contrib/restricted/googletest/googlemock/include/gmock/gmock-more-actions.h
+++ b/contrib/restricted/googletest/googlemock/include/gmock/gmock-more-actions.h
@@ -27,468 +27,468 @@
 // (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 variadic actions.
+// This file implements some commonly used variadic actions. 
 
-// GOOGLETEST_CM0002 DO NOT DELETE
+// GOOGLETEST_CM0002 DO NOT DELETE 
+ 
+#ifndef GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_MORE_ACTIONS_H_ 
+#define GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_MORE_ACTIONS_H_ 
 
-#ifndef GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_MORE_ACTIONS_H_
-#define GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_MORE_ACTIONS_H_
+#include <memory> 
+#include <utility> 
 
-#include <memory>
-#include <utility>
+#include "gmock/gmock-actions.h" 
+#include "gmock/internal/gmock-port.h" 
 
-#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" 
 
-// 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 
+// and can be viewed as an extension to ACTION() and ACTION_P*(). 
+// 
+// The syntax: 
+// 
+//   ACTION_TEMPLATE(ActionName, 
+//                   HAS_m_TEMPLATE_PARAMS(kind1, name1, ..., kind_m, name_m), 
+//                   AND_n_VALUE_PARAMS(p1, ..., p_n)) { statements; } 
+// 
+// defines an action template that takes m explicit template 
+// parameters and n value parameters.  name_i is the name of the i-th 
+// template parameter, and kind_i specifies whether it's a typename, 
+// an integral constant, or a template.  p_i is the name of the i-th 
+// value parameter. 
+// 
+// Example: 
+// 
+//   // DuplicateArg<k, T>(output) converts the k-th argument of the mock 
+//   // function to type T and copies it to *output. 
+//   ACTION_TEMPLATE(DuplicateArg, 
+//                   HAS_2_TEMPLATE_PARAMS(int, k, typename, T), 
+//                   AND_1_VALUE_PARAMS(output)) { 
+//     *output = T(::std::get<k>(args)); 
+//   } 
+//   ... 
+//     int n; 
+//     EXPECT_CALL(mock, Foo(_, _)) 
+//         .WillOnce(DuplicateArg<1, unsigned char>(&n)); 
+// 
+// To create an instance of an action template, write: 
+// 
+//   ActionName<t1, ..., t_m>(v1, ..., v_n) 
+// 
+// where the ts are the template arguments and the vs are the value 
+// arguments.  The value argument types are inferred by the compiler. 
+// If you want to explicitly specify the value argument types, you can 
+// provide additional template arguments: 
+// 
+//   ActionName<t1, ..., t_m, u1, ..., u_k>(v1, ..., v_n) 
+// 
+// where u_i is the desired type of v_i. 
+// 
+// ACTION_TEMPLATE and ACTION/ACTION_P* can be overloaded on the 
+// number of value parameters, but not on the number of template 
+// parameters.  Without the restriction, the meaning of the following 
+// is unclear: 
+// 
+//   OverloadedAction<int, bool>(x); 
+// 
+// Are we using a single-template-parameter action where 'bool' refers 
+// to the type of x, or are we using a two-template-parameter action 
+// where the compiler is asked to infer the type of x? 
+// 
+// Implementation notes: 
+// 
+// GMOCK_INTERNAL_*_HAS_m_TEMPLATE_PARAMS and 
+// GMOCK_INTERNAL_*_AND_n_VALUE_PARAMS are internal macros for 
+// implementing ACTION_TEMPLATE.  The main trick we use is to create 
+// new macro invocations when expanding a macro.  For example, we have 
+// 
+//   #define ACTION_TEMPLATE(name, template_params, value_params) 
+//       ... GMOCK_INTERNAL_DECL_##template_params ... 
+// 
+// which causes ACTION_TEMPLATE(..., HAS_1_TEMPLATE_PARAMS(typename, T), ...) 
+// to expand to 
+// 
+//       ... GMOCK_INTERNAL_DECL_HAS_1_TEMPLATE_PARAMS(typename, T) ... 
+// 
+// Since GMOCK_INTERNAL_DECL_HAS_1_TEMPLATE_PARAMS is a macro, the 
+// preprocessor will continue to expand it to 
+// 
+//       ... typename T ... 
+// 
+// This technique conforms to the C++ standard and is portable.  It 
+// allows us to implement action templates using O(N) code, where N is 
+// 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. 
 
-// 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
-// and can be viewed as an extension to ACTION() and ACTION_P*().
-//
-// The syntax:
-//
-//   ACTION_TEMPLATE(ActionName,
-//                   HAS_m_TEMPLATE_PARAMS(kind1, name1, ..., kind_m, name_m),
-//                   AND_n_VALUE_PARAMS(p1, ..., p_n)) { statements; }
-//
-// defines an action template that takes m explicit template
-// parameters and n value parameters.  name_i is the name of the i-th
-// template parameter, and kind_i specifies whether it's a typename,
-// an integral constant, or a template.  p_i is the name of the i-th
-// value parameter.
-//
-// Example:
-//
-//   // DuplicateArg<k, T>(output) converts the k-th argument of the mock
-//   // function to type T and copies it to *output.
-//   ACTION_TEMPLATE(DuplicateArg,
-//                   HAS_2_TEMPLATE_PARAMS(int, k, typename, T),
-//                   AND_1_VALUE_PARAMS(output)) {
-//     *output = T(::std::get<k>(args));
-//   }
-//   ...
-//     int n;
-//     EXPECT_CALL(mock, Foo(_, _))
-//         .WillOnce(DuplicateArg<1, unsigned char>(&n));
-//
-// To create an instance of an action template, write:
-//
-//   ActionName<t1, ..., t_m>(v1, ..., v_n)
-//
-// where the ts are the template arguments and the vs are the value
-// arguments.  The value argument types are inferred by the compiler.
-// If you want to explicitly specify the value argument types, you can
-// provide additional template arguments:
-//
-//   ActionName<t1, ..., t_m, u1, ..., u_k>(v1, ..., v_n)
-//
-// where u_i is the desired type of v_i.
-//
-// ACTION_TEMPLATE and ACTION/ACTION_P* can be overloaded on the
-// number of value parameters, but not on the number of template
-// parameters.  Without the restriction, the meaning of the following
-// is unclear:
-//
-//   OverloadedAction<int, bool>(x);
-//
-// Are we using a single-template-parameter action where 'bool' refers
-// to the type of x, or are we using a two-template-parameter action
-// where the compiler is asked to infer the type of x?
-//
-// Implementation notes:
-//
-// GMOCK_INTERNAL_*_HAS_m_TEMPLATE_PARAMS and
-// GMOCK_INTERNAL_*_AND_n_VALUE_PARAMS are internal macros for
-// implementing ACTION_TEMPLATE.  The main trick we use is to create
-// new macro invocations when expanding a macro.  For example, we have
-//
-//   #define ACTION_TEMPLATE(name, template_params, value_params)
-//       ... GMOCK_INTERNAL_DECL_##template_params ...
-//
-// which causes ACTION_TEMPLATE(..., HAS_1_TEMPLATE_PARAMS(typename, T), ...)
-// to expand to
-//
-//       ... GMOCK_INTERNAL_DECL_HAS_1_TEMPLATE_PARAMS(typename, T) ...
-//
-// Since GMOCK_INTERNAL_DECL_HAS_1_TEMPLATE_PARAMS is a macro, the
-// preprocessor will continue to expand it to
-//
-//       ... typename T ...
-//
-// This technique conforms to the C++ standard and is portable.  It
-// allows us to implement action templates using O(N) code, where N is
-// 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, \
-    name1) kind0 name0, kind1 name1
-#define GMOCK_INTERNAL_DECL_HAS_3_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
-    kind2, name2) kind0 name0, kind1 name1, kind2 name2
-#define GMOCK_INTERNAL_DECL_HAS_4_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
-    kind2, name2, kind3, name3) kind0 name0, kind1 name1, kind2 name2, \
-    kind3 name3
-#define GMOCK_INTERNAL_DECL_HAS_5_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
-    kind2, name2, kind3, name3, kind4, name4) kind0 name0, kind1 name1, \
-    kind2 name2, kind3 name3, kind4 name4
-#define GMOCK_INTERNAL_DECL_HAS_6_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
-    kind2, name2, kind3, name3, kind4, name4, kind5, name5) kind0 name0, \
-    kind1 name1, kind2 name2, kind3 name3, kind4 name4, kind5 name5
-#define GMOCK_INTERNAL_DECL_HAS_7_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
-    kind2, name2, kind3, name3, kind4, name4, kind5, name5, kind6, \
-    name6) kind0 name0, kind1 name1, kind2 name2, kind3 name3, kind4 name4, \
-    kind5 name5, kind6 name6
-#define GMOCK_INTERNAL_DECL_HAS_8_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
-    kind2, name2, kind3, name3, kind4, name4, kind5, name5, kind6, name6, \
-    kind7, name7) kind0 name0, kind1 name1, kind2 name2, kind3 name3, \
-    kind4 name4, kind5 name5, kind6 name6, kind7 name7
-#define GMOCK_INTERNAL_DECL_HAS_9_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
-    kind2, name2, kind3, name3, kind4, name4, kind5, name5, kind6, name6, \
-    kind7, name7, kind8, name8) kind0 name0, kind1 name1, kind2 name2, \
-    kind3 name3, kind4 name4, kind5 name5, kind6 name6, kind7 name7, \
-    kind8 name8
-#define GMOCK_INTERNAL_DECL_HAS_10_TEMPLATE_PARAMS(kind0, name0, kind1, \
-    name1, kind2, name2, kind3, name3, kind4, name4, kind5, name5, kind6, \
-    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, \
-    name1) name0, name1
-#define GMOCK_INTERNAL_LIST_HAS_3_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
-    kind2, name2) name0, name1, name2
-#define GMOCK_INTERNAL_LIST_HAS_4_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
-    kind2, name2, kind3, name3) name0, name1, name2, name3
-#define GMOCK_INTERNAL_LIST_HAS_5_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
-    kind2, name2, kind3, name3, kind4, name4) name0, name1, name2, name3, \
-    name4
-#define GMOCK_INTERNAL_LIST_HAS_6_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
-    kind2, name2, kind3, name3, kind4, name4, kind5, name5) name0, name1, \
-    name2, name3, name4, name5
-#define GMOCK_INTERNAL_LIST_HAS_7_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
-    kind2, name2, kind3, name3, kind4, name4, kind5, name5, kind6, \
-    name6) name0, name1, name2, name3, name4, name5, name6
-#define GMOCK_INTERNAL_LIST_HAS_8_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
-    kind2, name2, kind3, name3, kind4, name4, kind5, name5, kind6, name6, \
-    kind7, name7) name0, name1, name2, name3, name4, name5, name6, name7
-#define GMOCK_INTERNAL_LIST_HAS_9_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \
-    kind2, name2, kind3, name3, kind4, name4, kind5, name5, kind6, name6, \
-    kind7, name7, kind8, name8) name0, name1, name2, name3, name4, name5, \
-    name6, name7, name8
-#define GMOCK_INTERNAL_LIST_HAS_10_TEMPLATE_PARAMS(kind0, name0, kind1, \
-    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
-#define GMOCK_INTERNAL_DECL_TYPE_AND_2_VALUE_PARAMS(p0, p1) , \
-    typename p0##_type, typename p1##_type
-#define GMOCK_INTERNAL_DECL_TYPE_AND_3_VALUE_PARAMS(p0, p1, p2) , \
-    typename p0##_type, typename p1##_type, typename p2##_type
-#define GMOCK_INTERNAL_DECL_TYPE_AND_4_VALUE_PARAMS(p0, p1, p2, p3) , \
-    typename p0##_type, typename p1##_type, typename p2##_type, \
-    typename p3##_type
-#define GMOCK_INTERNAL_DECL_TYPE_AND_5_VALUE_PARAMS(p0, p1, p2, p3, p4) , \
-    typename p0##_type, typename p1##_type, typename p2##_type, \
-    typename p3##_type, typename p4##_type
-#define GMOCK_INTERNAL_DECL_TYPE_AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, p5) , \
-    typename p0##_type, typename p1##_type, typename p2##_type, \
-    typename p3##_type, typename p4##_type, typename p5##_type
-#define GMOCK_INTERNAL_DECL_TYPE_AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
-    p6) , typename p0##_type, typename p1##_type, typename p2##_type, \
-    typename p3##_type, typename p4##_type, typename p5##_type, \
-    typename p6##_type
-#define GMOCK_INTERNAL_DECL_TYPE_AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
-    p6, p7) , typename p0##_type, typename p1##_type, typename p2##_type, \
-    typename p3##_type, typename p4##_type, typename p5##_type, \
-    typename p6##_type, typename p7##_type
-#define GMOCK_INTERNAL_DECL_TYPE_AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
-    p6, p7, p8) , typename p0##_type, typename p1##_type, typename p2##_type, \
-    typename p3##_type, typename p4##_type, typename p5##_type, \
-    typename p6##_type, typename p7##_type, typename p8##_type
-#define GMOCK_INTERNAL_DECL_TYPE_AND_10_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
-    p6, p7, p8, p9) , typename p0##_type, typename p1##_type, \
-    typename p2##_type, typename p3##_type, typename p4##_type, \
-    typename p5##_type, typename p6##_type, typename p7##_type, \
-    typename p8##_type, typename p9##_type
-
-// Initializes the value parameters.
-#define GMOCK_INTERNAL_INIT_AND_0_VALUE_PARAMS()\
-    ()
-#define GMOCK_INTERNAL_INIT_AND_1_VALUE_PARAMS(p0)\
-    (p0##_type gmock_p0) : p0(::std::move(gmock_p0))
-#define GMOCK_INTERNAL_INIT_AND_2_VALUE_PARAMS(p0, p1)\
-    (p0##_type gmock_p0, p1##_type gmock_p1) : p0(::std::move(gmock_p0)), \
-        p1(::std::move(gmock_p1))
-#define GMOCK_INTERNAL_INIT_AND_3_VALUE_PARAMS(p0, p1, p2)\
-    (p0##_type gmock_p0, p1##_type gmock_p1, \
-        p2##_type gmock_p2) : p0(::std::move(gmock_p0)), \
-        p1(::std::move(gmock_p1)), p2(::std::move(gmock_p2))
-#define GMOCK_INTERNAL_INIT_AND_4_VALUE_PARAMS(p0, p1, p2, p3)\
-    (p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
-        p3##_type gmock_p3) : p0(::std::move(gmock_p0)), \
-        p1(::std::move(gmock_p1)), p2(::std::move(gmock_p2)), \
-        p3(::std::move(gmock_p3))
-#define GMOCK_INTERNAL_INIT_AND_5_VALUE_PARAMS(p0, p1, p2, p3, p4)\
-    (p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
-        p3##_type gmock_p3, p4##_type gmock_p4) : p0(::std::move(gmock_p0)), \
-        p1(::std::move(gmock_p1)), p2(::std::move(gmock_p2)), \
-        p3(::std::move(gmock_p3)), p4(::std::move(gmock_p4))
-#define GMOCK_INTERNAL_INIT_AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, p5)\
-    (p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
-        p3##_type gmock_p3, p4##_type gmock_p4, \
-        p5##_type gmock_p5) : p0(::std::move(gmock_p0)), \
-        p1(::std::move(gmock_p1)), p2(::std::move(gmock_p2)), \
-        p3(::std::move(gmock_p3)), p4(::std::move(gmock_p4)), \
-        p5(::std::move(gmock_p5))
-#define GMOCK_INTERNAL_INIT_AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6)\
-    (p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
-        p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5, \
-        p6##_type gmock_p6) : p0(::std::move(gmock_p0)), \
-        p1(::std::move(gmock_p1)), p2(::std::move(gmock_p2)), \
-        p3(::std::move(gmock_p3)), p4(::std::move(gmock_p4)), \
-        p5(::std::move(gmock_p5)), p6(::std::move(gmock_p6))
-#define GMOCK_INTERNAL_INIT_AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, p7)\
-    (p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
-        p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5, \
-        p6##_type gmock_p6, p7##_type gmock_p7) : p0(::std::move(gmock_p0)), \
-        p1(::std::move(gmock_p1)), p2(::std::move(gmock_p2)), \
-        p3(::std::move(gmock_p3)), p4(::std::move(gmock_p4)), \
-        p5(::std::move(gmock_p5)), p6(::std::move(gmock_p6)), \
-        p7(::std::move(gmock_p7))
-#define GMOCK_INTERNAL_INIT_AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
-    p7, p8)\
-    (p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
-        p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5, \
-        p6##_type gmock_p6, p7##_type gmock_p7, \
-        p8##_type gmock_p8) : p0(::std::move(gmock_p0)), \
-        p1(::std::move(gmock_p1)), p2(::std::move(gmock_p2)), \
-        p3(::std::move(gmock_p3)), p4(::std::move(gmock_p4)), \
-        p5(::std::move(gmock_p5)), p6(::std::move(gmock_p6)), \
-        p7(::std::move(gmock_p7)), p8(::std::move(gmock_p8))
-#define GMOCK_INTERNAL_INIT_AND_10_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
-    p7, p8, p9)\
-    (p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \
-        p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5, \
-        p6##_type gmock_p6, p7##_type gmock_p7, p8##_type gmock_p8, \
-        p9##_type gmock_p9) : p0(::std::move(gmock_p0)), \
-        p1(::std::move(gmock_p1)), p2(::std::move(gmock_p2)), \
-        p3(::std::move(gmock_p3)), p4(::std::move(gmock_p4)), \
-        p5(::std::move(gmock_p5)), p6(::std::move(gmock_p6)), \
-        p7(::std::move(gmock_p7)), p8(::std::move(gmock_p8)), \
-        p9(::std::move(gmock_p9))
-
-// Defines the copy constructor
-#define GMOCK_INTERNAL_DEFN_COPY_AND_0_VALUE_PARAMS() \
-    {}  // Avoid https://gcc.gnu.org/bugzilla/show_bug.cgi?id=82134
-#define GMOCK_INTERNAL_DEFN_COPY_AND_1_VALUE_PARAMS(...) = default;
-#define GMOCK_INTERNAL_DEFN_COPY_AND_2_VALUE_PARAMS(...) = default;
-#define GMOCK_INTERNAL_DEFN_COPY_AND_3_VALUE_PARAMS(...) = default;
-#define GMOCK_INTERNAL_DEFN_COPY_AND_4_VALUE_PARAMS(...) = default;
-#define GMOCK_INTERNAL_DEFN_COPY_AND_5_VALUE_PARAMS(...) = default;
-#define GMOCK_INTERNAL_DEFN_COPY_AND_6_VALUE_PARAMS(...) = default;
-#define GMOCK_INTERNAL_DEFN_COPY_AND_7_VALUE_PARAMS(...) = default;
-#define GMOCK_INTERNAL_DEFN_COPY_AND_8_VALUE_PARAMS(...) = default;
-#define GMOCK_INTERNAL_DEFN_COPY_AND_9_VALUE_PARAMS(...) = default;
-#define GMOCK_INTERNAL_DEFN_COPY_AND_10_VALUE_PARAMS(...) = default;
-
-// Declares the fields for storing the value parameters.
-#define GMOCK_INTERNAL_DEFN_AND_0_VALUE_PARAMS()
-#define GMOCK_INTERNAL_DEFN_AND_1_VALUE_PARAMS(p0) p0##_type p0;
-#define GMOCK_INTERNAL_DEFN_AND_2_VALUE_PARAMS(p0, p1) p0##_type p0; \
-    p1##_type p1;
-#define GMOCK_INTERNAL_DEFN_AND_3_VALUE_PARAMS(p0, p1, p2) p0##_type p0; \
-    p1##_type p1; p2##_type p2;
-#define GMOCK_INTERNAL_DEFN_AND_4_VALUE_PARAMS(p0, p1, p2, p3) p0##_type p0; \
-    p1##_type p1; p2##_type p2; p3##_type p3;
-#define GMOCK_INTERNAL_DEFN_AND_5_VALUE_PARAMS(p0, p1, p2, p3, \
-    p4) p0##_type p0; p1##_type p1; p2##_type p2; p3##_type p3; p4##_type p4;
-#define GMOCK_INTERNAL_DEFN_AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, \
-    p5) p0##_type p0; p1##_type p1; p2##_type p2; p3##_type p3; p4##_type p4; \
-    p5##_type p5;
-#define GMOCK_INTERNAL_DEFN_AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
-    p6) p0##_type p0; p1##_type p1; p2##_type p2; p3##_type p3; p4##_type p4; \
-    p5##_type p5; p6##_type p6;
-#define GMOCK_INTERNAL_DEFN_AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
-    p7) p0##_type p0; p1##_type p1; p2##_type p2; p3##_type p3; p4##_type p4; \
-    p5##_type p5; p6##_type p6; p7##_type p7;
-#define GMOCK_INTERNAL_DEFN_AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
-    p7, p8) p0##_type p0; p1##_type p1; p2##_type p2; p3##_type p3; \
-    p4##_type p4; p5##_type p5; p6##_type p6; p7##_type p7; p8##_type p8;
-#define GMOCK_INTERNAL_DEFN_AND_10_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
-    p7, p8, p9) p0##_type p0; p1##_type p1; p2##_type p2; p3##_type p3; \
-    p4##_type p4; p5##_type p5; p6##_type p6; p7##_type p7; p8##_type p8; \
-    p9##_type p9;
-
-// Lists the value parameters.
-#define GMOCK_INTERNAL_LIST_AND_0_VALUE_PARAMS()
-#define GMOCK_INTERNAL_LIST_AND_1_VALUE_PARAMS(p0) p0
-#define GMOCK_INTERNAL_LIST_AND_2_VALUE_PARAMS(p0, p1) p0, p1
-#define GMOCK_INTERNAL_LIST_AND_3_VALUE_PARAMS(p0, p1, p2) p0, p1, p2
-#define GMOCK_INTERNAL_LIST_AND_4_VALUE_PARAMS(p0, p1, p2, p3) p0, p1, p2, p3
-#define GMOCK_INTERNAL_LIST_AND_5_VALUE_PARAMS(p0, p1, p2, p3, p4) p0, p1, \
-    p2, p3, p4
-#define GMOCK_INTERNAL_LIST_AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, p5) p0, \
-    p1, p2, p3, p4, p5
-#define GMOCK_INTERNAL_LIST_AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
-    p6) p0, p1, p2, p3, p4, p5, p6
-#define GMOCK_INTERNAL_LIST_AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
-    p7) p0, p1, p2, p3, p4, p5, p6, p7
-#define GMOCK_INTERNAL_LIST_AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
-    p7, p8) p0, p1, p2, p3, p4, p5, p6, p7, p8
-#define GMOCK_INTERNAL_LIST_AND_10_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
-    p7, p8, p9) p0, p1, p2, p3, p4, p5, p6, p7, p8, p9
-
-// Lists the value parameter types.
-#define GMOCK_INTERNAL_LIST_TYPE_AND_0_VALUE_PARAMS()
-#define GMOCK_INTERNAL_LIST_TYPE_AND_1_VALUE_PARAMS(p0) , p0##_type
-#define GMOCK_INTERNAL_LIST_TYPE_AND_2_VALUE_PARAMS(p0, p1) , p0##_type, \
-    p1##_type
-#define GMOCK_INTERNAL_LIST_TYPE_AND_3_VALUE_PARAMS(p0, p1, p2) , p0##_type, \
-    p1##_type, p2##_type
-#define GMOCK_INTERNAL_LIST_TYPE_AND_4_VALUE_PARAMS(p0, p1, p2, p3) , \
-    p0##_type, p1##_type, p2##_type, p3##_type
-#define GMOCK_INTERNAL_LIST_TYPE_AND_5_VALUE_PARAMS(p0, p1, p2, p3, p4) , \
-    p0##_type, p1##_type, p2##_type, p3##_type, p4##_type
-#define GMOCK_INTERNAL_LIST_TYPE_AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, p5) , \
-    p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, p5##_type
-#define GMOCK_INTERNAL_LIST_TYPE_AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
-    p6) , p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, p5##_type, \
-    p6##_type
-#define GMOCK_INTERNAL_LIST_TYPE_AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
-    p6, p7) , p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, \
-    p5##_type, p6##_type, p7##_type
-#define GMOCK_INTERNAL_LIST_TYPE_AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
-    p6, p7, p8) , p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, \
-    p5##_type, p6##_type, p7##_type, p8##_type
-#define GMOCK_INTERNAL_LIST_TYPE_AND_10_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
-    p6, p7, p8, p9) , p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, \
-    p5##_type, p6##_type, p7##_type, p8##_type, p9##_type
-
-// Declares the value parameters.
-#define GMOCK_INTERNAL_DECL_AND_0_VALUE_PARAMS()
-#define GMOCK_INTERNAL_DECL_AND_1_VALUE_PARAMS(p0) p0##_type p0
-#define GMOCK_INTERNAL_DECL_AND_2_VALUE_PARAMS(p0, p1) p0##_type p0, \
-    p1##_type p1
-#define GMOCK_INTERNAL_DECL_AND_3_VALUE_PARAMS(p0, p1, p2) p0##_type p0, \
-    p1##_type p1, p2##_type p2
-#define GMOCK_INTERNAL_DECL_AND_4_VALUE_PARAMS(p0, p1, p2, p3) p0##_type p0, \
-    p1##_type p1, p2##_type p2, p3##_type p3
-#define GMOCK_INTERNAL_DECL_AND_5_VALUE_PARAMS(p0, p1, p2, p3, \
-    p4) p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, p4##_type p4
-#define GMOCK_INTERNAL_DECL_AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, \
-    p5) p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, p4##_type p4, \
-    p5##_type p5
-#define GMOCK_INTERNAL_DECL_AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \
-    p6) p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, p4##_type p4, \
-    p5##_type p5, p6##_type p6
-#define GMOCK_INTERNAL_DECL_AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
-    p7) p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, p4##_type p4, \
-    p5##_type p5, p6##_type p6, p7##_type p7
-#define GMOCK_INTERNAL_DECL_AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
-    p7, p8) p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, \
-    p4##_type p4, p5##_type p5, p6##_type p6, p7##_type p7, p8##_type p8
-#define GMOCK_INTERNAL_DECL_AND_10_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
-    p7, p8, p9) p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, \
-    p4##_type p4, p5##_type p5, p6##_type p6, p7##_type p7, p8##_type p8, \
-    p9##_type p9
+// 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, \ 
+    name1) kind0 name0, kind1 name1 
+#define GMOCK_INTERNAL_DECL_HAS_3_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \ 
+    kind2, name2) kind0 name0, kind1 name1, kind2 name2 
+#define GMOCK_INTERNAL_DECL_HAS_4_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \ 
+    kind2, name2, kind3, name3) kind0 name0, kind1 name1, kind2 name2, \ 
+    kind3 name3 
+#define GMOCK_INTERNAL_DECL_HAS_5_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \ 
+    kind2, name2, kind3, name3, kind4, name4) kind0 name0, kind1 name1, \ 
+    kind2 name2, kind3 name3, kind4 name4 
+#define GMOCK_INTERNAL_DECL_HAS_6_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \ 
+    kind2, name2, kind3, name3, kind4, name4, kind5, name5) kind0 name0, \ 
+    kind1 name1, kind2 name2, kind3 name3, kind4 name4, kind5 name5 
+#define GMOCK_INTERNAL_DECL_HAS_7_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \ 
+    kind2, name2, kind3, name3, kind4, name4, kind5, name5, kind6, \ 
+    name6) kind0 name0, kind1 name1, kind2 name2, kind3 name3, kind4 name4, \ 
+    kind5 name5, kind6 name6 
+#define GMOCK_INTERNAL_DECL_HAS_8_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \ 
+    kind2, name2, kind3, name3, kind4, name4, kind5, name5, kind6, name6, \ 
+    kind7, name7) kind0 name0, kind1 name1, kind2 name2, kind3 name3, \ 
+    kind4 name4, kind5 name5, kind6 name6, kind7 name7 
+#define GMOCK_INTERNAL_DECL_HAS_9_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \ 
+    kind2, name2, kind3, name3, kind4, name4, kind5, name5, kind6, name6, \ 
+    kind7, name7, kind8, name8) kind0 name0, kind1 name1, kind2 name2, \ 
+    kind3 name3, kind4 name4, kind5 name5, kind6 name6, kind7 name7, \ 
+    kind8 name8 
+#define GMOCK_INTERNAL_DECL_HAS_10_TEMPLATE_PARAMS(kind0, name0, kind1, \ 
+    name1, kind2, name2, kind3, name3, kind4, name4, kind5, name5, kind6, \ 
+    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 
 
-// The suffix of the class template implementing the action template.
-#define GMOCK_INTERNAL_COUNT_AND_0_VALUE_PARAMS()
-#define GMOCK_INTERNAL_COUNT_AND_1_VALUE_PARAMS(p0) P
-#define GMOCK_INTERNAL_COUNT_AND_2_VALUE_PARAMS(p0, p1) P2
-#define GMOCK_INTERNAL_COUNT_AND_3_VALUE_PARAMS(p0, p1, p2) P3
-#define GMOCK_INTERNAL_COUNT_AND_4_VALUE_PARAMS(p0, p1, p2, p3) P4
-#define GMOCK_INTERNAL_COUNT_AND_5_VALUE_PARAMS(p0, p1, p2, p3, p4) P5
-#define GMOCK_INTERNAL_COUNT_AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, p5) P6
-#define GMOCK_INTERNAL_COUNT_AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6) P7
-#define GMOCK_INTERNAL_COUNT_AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
-    p7) P8
-#define GMOCK_INTERNAL_COUNT_AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
-    p7, p8) P9
-#define GMOCK_INTERNAL_COUNT_AND_10_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \
-    p7, p8, p9) P10
-
-// The name of the class template implementing the action template.
-#define GMOCK_ACTION_CLASS_(name, value_params)\
-    GTEST_CONCAT_TOKEN_(name##Action, GMOCK_INTERNAL_COUNT_##value_params)
-
-#define ACTION_TEMPLATE(name, template_params, value_params)                   \
-  template <GMOCK_INTERNAL_DECL_##template_params                              \
-            GMOCK_INTERNAL_DECL_TYPE_##value_params>                           \
-  class GMOCK_ACTION_CLASS_(name, value_params) {                              \
-   public:                                                                     \
-    explicit GMOCK_ACTION_CLASS_(name, value_params)(                          \
-        GMOCK_INTERNAL_DECL_##value_params)                                    \
-        GMOCK_PP_IF(GMOCK_PP_IS_EMPTY(GMOCK_INTERNAL_COUNT_##value_params),    \
-                    = default; ,                                               \
-                    : impl_(std::make_shared<gmock_Impl>(                      \
-                                GMOCK_INTERNAL_LIST_##value_params)) { })      \
-    GMOCK_ACTION_CLASS_(name, value_params)(                                   \
-        const GMOCK_ACTION_CLASS_(name, value_params)&) noexcept               \
-        GMOCK_INTERNAL_DEFN_COPY_##value_params                                \
-    GMOCK_ACTION_CLASS_(name, value_params)(                                   \
-        GMOCK_ACTION_CLASS_(name, value_params)&&) noexcept                    \
-        GMOCK_INTERNAL_DEFN_COPY_##value_params                                \
-    template <typename F>                                                      \
-    operator ::testing::Action<F>() const {                                    \
-      return GMOCK_PP_IF(                                                      \
-          GMOCK_PP_IS_EMPTY(GMOCK_INTERNAL_COUNT_##value_params),              \
-                      (::testing::internal::MakeAction<F, gmock_Impl>()),      \
-                      (::testing::internal::MakeAction<F>(impl_)));            \
-    }                                                                          \
-   private:                                                                    \
-    class gmock_Impl {                                                         \
-     public:                                                                   \
-      explicit gmock_Impl GMOCK_INTERNAL_INIT_##value_params {}                \
-      template <typename function_type, typename return_type,                  \
-                typename args_type, GMOCK_ACTION_TEMPLATE_ARGS_NAMES_>         \
-      return_type gmock_PerformImpl(GMOCK_ACTION_ARG_TYPES_AND_NAMES_) const;  \
-      GMOCK_INTERNAL_DEFN_##value_params                                       \
-    };                                                                         \
-    GMOCK_PP_IF(GMOCK_PP_IS_EMPTY(GMOCK_INTERNAL_COUNT_##value_params),        \
-                , std::shared_ptr<const gmock_Impl> impl_;)                    \
-  };                                                                           \
-  template <GMOCK_INTERNAL_DECL_##template_params                              \
-            GMOCK_INTERNAL_DECL_TYPE_##value_params>                           \
-  GMOCK_ACTION_CLASS_(name, value_params)<                                     \
-      GMOCK_INTERNAL_LIST_##template_params                                    \
-      GMOCK_INTERNAL_LIST_TYPE_##value_params> name(                           \
-          GMOCK_INTERNAL_DECL_##value_params) GTEST_MUST_USE_RESULT_;          \
-  template <GMOCK_INTERNAL_DECL_##template_params                              \
-            GMOCK_INTERNAL_DECL_TYPE_##value_params>                           \
-  inline GMOCK_ACTION_CLASS_(name, value_params)<                              \
-      GMOCK_INTERNAL_LIST_##template_params                                    \
-      GMOCK_INTERNAL_LIST_TYPE_##value_params> name(                           \
-          GMOCK_INTERNAL_DECL_##value_params) {                                \
-    return GMOCK_ACTION_CLASS_(name, value_params)<                            \
-        GMOCK_INTERNAL_LIST_##template_params                                  \
-        GMOCK_INTERNAL_LIST_TYPE_##value_params>(                              \
-            GMOCK_INTERNAL_LIST_##value_params);                               \
-  }                                                                            \
-  template <GMOCK_INTERNAL_DECL_##template_params                              \
-            GMOCK_INTERNAL_DECL_TYPE_##value_params>                           \
-  template <typename function_type, typename return_type, typename args_type,  \
-            GMOCK_ACTION_TEMPLATE_ARGS_NAMES_>                                 \
-  return_type GMOCK_ACTION_CLASS_(name, value_params)<                         \
-      GMOCK_INTERNAL_LIST_##template_params                                    \
-      GMOCK_INTERNAL_LIST_TYPE_##value_params>::gmock_Impl::gmock_PerformImpl( \
-          GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const
-
-namespace testing {
+// 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, \ 
+    name1) name0, name1 
+#define GMOCK_INTERNAL_LIST_HAS_3_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \ 
+    kind2, name2) name0, name1, name2 
+#define GMOCK_INTERNAL_LIST_HAS_4_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \ 
+    kind2, name2, kind3, name3) name0, name1, name2, name3 
+#define GMOCK_INTERNAL_LIST_HAS_5_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \ 
+    kind2, name2, kind3, name3, kind4, name4) name0, name1, name2, name3, \ 
+    name4 
+#define GMOCK_INTERNAL_LIST_HAS_6_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \ 
+    kind2, name2, kind3, name3, kind4, name4, kind5, name5) name0, name1, \ 
+    name2, name3, name4, name5 
+#define GMOCK_INTERNAL_LIST_HAS_7_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \ 
+    kind2, name2, kind3, name3, kind4, name4, kind5, name5, kind6, \ 
+    name6) name0, name1, name2, name3, name4, name5, name6 
+#define GMOCK_INTERNAL_LIST_HAS_8_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \ 
+    kind2, name2, kind3, name3, kind4, name4, kind5, name5, kind6, name6, \ 
+    kind7, name7) name0, name1, name2, name3, name4, name5, name6, name7 
+#define GMOCK_INTERNAL_LIST_HAS_9_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \ 
+    kind2, name2, kind3, name3, kind4, name4, kind5, name5, kind6, name6, \ 
+    kind7, name7, kind8, name8) name0, name1, name2, name3, name4, name5, \ 
+    name6, name7, name8 
+#define GMOCK_INTERNAL_LIST_HAS_10_TEMPLATE_PARAMS(kind0, name0, kind1, \ 
+    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 
+#define GMOCK_INTERNAL_DECL_TYPE_AND_2_VALUE_PARAMS(p0, p1) , \ 
+    typename p0##_type, typename p1##_type 
+#define GMOCK_INTERNAL_DECL_TYPE_AND_3_VALUE_PARAMS(p0, p1, p2) , \ 
+    typename p0##_type, typename p1##_type, typename p2##_type 
+#define GMOCK_INTERNAL_DECL_TYPE_AND_4_VALUE_PARAMS(p0, p1, p2, p3) , \ 
+    typename p0##_type, typename p1##_type, typename p2##_type, \ 
+    typename p3##_type 
+#define GMOCK_INTERNAL_DECL_TYPE_AND_5_VALUE_PARAMS(p0, p1, p2, p3, p4) , \ 
+    typename p0##_type, typename p1##_type, typename p2##_type, \ 
+    typename p3##_type, typename p4##_type 
+#define GMOCK_INTERNAL_DECL_TYPE_AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, p5) , \ 
+    typename p0##_type, typename p1##_type, typename p2##_type, \ 
+    typename p3##_type, typename p4##_type, typename p5##_type 
+#define GMOCK_INTERNAL_DECL_TYPE_AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \ 
+    p6) , typename p0##_type, typename p1##_type, typename p2##_type, \ 
+    typename p3##_type, typename p4##_type, typename p5##_type, \ 
+    typename p6##_type 
+#define GMOCK_INTERNAL_DECL_TYPE_AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \ 
+    p6, p7) , typename p0##_type, typename p1##_type, typename p2##_type, \ 
+    typename p3##_type, typename p4##_type, typename p5##_type, \ 
+    typename p6##_type, typename p7##_type 
+#define GMOCK_INTERNAL_DECL_TYPE_AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \ 
+    p6, p7, p8) , typename p0##_type, typename p1##_type, typename p2##_type, \ 
+    typename p3##_type, typename p4##_type, typename p5##_type, \ 
+    typename p6##_type, typename p7##_type, typename p8##_type 
+#define GMOCK_INTERNAL_DECL_TYPE_AND_10_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \ 
+    p6, p7, p8, p9) , typename p0##_type, typename p1##_type, \ 
+    typename p2##_type, typename p3##_type, typename p4##_type, \ 
+    typename p5##_type, typename p6##_type, typename p7##_type, \ 
+    typename p8##_type, typename p9##_type 
+ 
+// Initializes the value parameters. 
+#define GMOCK_INTERNAL_INIT_AND_0_VALUE_PARAMS()\ 
+    () 
+#define GMOCK_INTERNAL_INIT_AND_1_VALUE_PARAMS(p0)\ 
+    (p0##_type gmock_p0) : p0(::std::move(gmock_p0)) 
+#define GMOCK_INTERNAL_INIT_AND_2_VALUE_PARAMS(p0, p1)\ 
+    (p0##_type gmock_p0, p1##_type gmock_p1) : p0(::std::move(gmock_p0)), \ 
+        p1(::std::move(gmock_p1)) 
+#define GMOCK_INTERNAL_INIT_AND_3_VALUE_PARAMS(p0, p1, p2)\ 
+    (p0##_type gmock_p0, p1##_type gmock_p1, \ 
+        p2##_type gmock_p2) : p0(::std::move(gmock_p0)), \ 
+        p1(::std::move(gmock_p1)), p2(::std::move(gmock_p2)) 
+#define GMOCK_INTERNAL_INIT_AND_4_VALUE_PARAMS(p0, p1, p2, p3)\ 
+    (p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \ 
+        p3##_type gmock_p3) : p0(::std::move(gmock_p0)), \ 
+        p1(::std::move(gmock_p1)), p2(::std::move(gmock_p2)), \ 
+        p3(::std::move(gmock_p3)) 
+#define GMOCK_INTERNAL_INIT_AND_5_VALUE_PARAMS(p0, p1, p2, p3, p4)\ 
+    (p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \ 
+        p3##_type gmock_p3, p4##_type gmock_p4) : p0(::std::move(gmock_p0)), \ 
+        p1(::std::move(gmock_p1)), p2(::std::move(gmock_p2)), \ 
+        p3(::std::move(gmock_p3)), p4(::std::move(gmock_p4)) 
+#define GMOCK_INTERNAL_INIT_AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, p5)\ 
+    (p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \ 
+        p3##_type gmock_p3, p4##_type gmock_p4, \ 
+        p5##_type gmock_p5) : p0(::std::move(gmock_p0)), \ 
+        p1(::std::move(gmock_p1)), p2(::std::move(gmock_p2)), \ 
+        p3(::std::move(gmock_p3)), p4(::std::move(gmock_p4)), \ 
+        p5(::std::move(gmock_p5)) 
+#define GMOCK_INTERNAL_INIT_AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6)\ 
+    (p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \ 
+        p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5, \ 
+        p6##_type gmock_p6) : p0(::std::move(gmock_p0)), \ 
+        p1(::std::move(gmock_p1)), p2(::std::move(gmock_p2)), \ 
+        p3(::std::move(gmock_p3)), p4(::std::move(gmock_p4)), \ 
+        p5(::std::move(gmock_p5)), p6(::std::move(gmock_p6)) 
+#define GMOCK_INTERNAL_INIT_AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, p7)\ 
+    (p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \ 
+        p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5, \ 
+        p6##_type gmock_p6, p7##_type gmock_p7) : p0(::std::move(gmock_p0)), \ 
+        p1(::std::move(gmock_p1)), p2(::std::move(gmock_p2)), \ 
+        p3(::std::move(gmock_p3)), p4(::std::move(gmock_p4)), \ 
+        p5(::std::move(gmock_p5)), p6(::std::move(gmock_p6)), \ 
+        p7(::std::move(gmock_p7)) 
+#define GMOCK_INTERNAL_INIT_AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \ 
+    p7, p8)\ 
+    (p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \ 
+        p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5, \ 
+        p6##_type gmock_p6, p7##_type gmock_p7, \ 
+        p8##_type gmock_p8) : p0(::std::move(gmock_p0)), \ 
+        p1(::std::move(gmock_p1)), p2(::std::move(gmock_p2)), \ 
+        p3(::std::move(gmock_p3)), p4(::std::move(gmock_p4)), \ 
+        p5(::std::move(gmock_p5)), p6(::std::move(gmock_p6)), \ 
+        p7(::std::move(gmock_p7)), p8(::std::move(gmock_p8)) 
+#define GMOCK_INTERNAL_INIT_AND_10_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \ 
+    p7, p8, p9)\ 
+    (p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \ 
+        p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5, \ 
+        p6##_type gmock_p6, p7##_type gmock_p7, p8##_type gmock_p8, \ 
+        p9##_type gmock_p9) : p0(::std::move(gmock_p0)), \ 
+        p1(::std::move(gmock_p1)), p2(::std::move(gmock_p2)), \ 
+        p3(::std::move(gmock_p3)), p4(::std::move(gmock_p4)), \ 
+        p5(::std::move(gmock_p5)), p6(::std::move(gmock_p6)), \ 
+        p7(::std::move(gmock_p7)), p8(::std::move(gmock_p8)), \ 
+        p9(::std::move(gmock_p9)) 
+ 
+// Defines the copy constructor 
+#define GMOCK_INTERNAL_DEFN_COPY_AND_0_VALUE_PARAMS() \ 
+    {}  // Avoid https://gcc.gnu.org/bugzilla/show_bug.cgi?id=82134 
+#define GMOCK_INTERNAL_DEFN_COPY_AND_1_VALUE_PARAMS(...) = default; 
+#define GMOCK_INTERNAL_DEFN_COPY_AND_2_VALUE_PARAMS(...) = default; 
+#define GMOCK_INTERNAL_DEFN_COPY_AND_3_VALUE_PARAMS(...) = default; 
+#define GMOCK_INTERNAL_DEFN_COPY_AND_4_VALUE_PARAMS(...) = default; 
+#define GMOCK_INTERNAL_DEFN_COPY_AND_5_VALUE_PARAMS(...) = default; 
+#define GMOCK_INTERNAL_DEFN_COPY_AND_6_VALUE_PARAMS(...) = default; 
+#define GMOCK_INTERNAL_DEFN_COPY_AND_7_VALUE_PARAMS(...) = default; 
+#define GMOCK_INTERNAL_DEFN_COPY_AND_8_VALUE_PARAMS(...) = default; 
+#define GMOCK_INTERNAL_DEFN_COPY_AND_9_VALUE_PARAMS(...) = default; 
+#define GMOCK_INTERNAL_DEFN_COPY_AND_10_VALUE_PARAMS(...) = default; 
+ 
+// Declares the fields for storing the value parameters. 
+#define GMOCK_INTERNAL_DEFN_AND_0_VALUE_PARAMS() 
+#define GMOCK_INTERNAL_DEFN_AND_1_VALUE_PARAMS(p0) p0##_type p0; 
+#define GMOCK_INTERNAL_DEFN_AND_2_VALUE_PARAMS(p0, p1) p0##_type p0; \ 
+    p1##_type p1; 
+#define GMOCK_INTERNAL_DEFN_AND_3_VALUE_PARAMS(p0, p1, p2) p0##_type p0; \ 
+    p1##_type p1; p2##_type p2; 
+#define GMOCK_INTERNAL_DEFN_AND_4_VALUE_PARAMS(p0, p1, p2, p3) p0##_type p0; \ 
+    p1##_type p1; p2##_type p2; p3##_type p3; 
+#define GMOCK_INTERNAL_DEFN_AND_5_VALUE_PARAMS(p0, p1, p2, p3, \ 
+    p4) p0##_type p0; p1##_type p1; p2##_type p2; p3##_type p3; p4##_type p4; 
+#define GMOCK_INTERNAL_DEFN_AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, \ 
+    p5) p0##_type p0; p1##_type p1; p2##_type p2; p3##_type p3; p4##_type p4; \ 
+    p5##_type p5; 
+#define GMOCK_INTERNAL_DEFN_AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \ 
+    p6) p0##_type p0; p1##_type p1; p2##_type p2; p3##_type p3; p4##_type p4; \ 
+    p5##_type p5; p6##_type p6; 
+#define GMOCK_INTERNAL_DEFN_AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \ 
+    p7) p0##_type p0; p1##_type p1; p2##_type p2; p3##_type p3; p4##_type p4; \ 
+    p5##_type p5; p6##_type p6; p7##_type p7; 
+#define GMOCK_INTERNAL_DEFN_AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \ 
+    p7, p8) p0##_type p0; p1##_type p1; p2##_type p2; p3##_type p3; \ 
+    p4##_type p4; p5##_type p5; p6##_type p6; p7##_type p7; p8##_type p8; 
+#define GMOCK_INTERNAL_DEFN_AND_10_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \ 
+    p7, p8, p9) p0##_type p0; p1##_type p1; p2##_type p2; p3##_type p3; \ 
+    p4##_type p4; p5##_type p5; p6##_type p6; p7##_type p7; p8##_type p8; \ 
+    p9##_type p9; 
+ 
+// Lists the value parameters. 
+#define GMOCK_INTERNAL_LIST_AND_0_VALUE_PARAMS() 
+#define GMOCK_INTERNAL_LIST_AND_1_VALUE_PARAMS(p0) p0 
+#define GMOCK_INTERNAL_LIST_AND_2_VALUE_PARAMS(p0, p1) p0, p1 
+#define GMOCK_INTERNAL_LIST_AND_3_VALUE_PARAMS(p0, p1, p2) p0, p1, p2 
+#define GMOCK_INTERNAL_LIST_AND_4_VALUE_PARAMS(p0, p1, p2, p3) p0, p1, p2, p3 
+#define GMOCK_INTERNAL_LIST_AND_5_VALUE_PARAMS(p0, p1, p2, p3, p4) p0, p1, \ 
+    p2, p3, p4 
+#define GMOCK_INTERNAL_LIST_AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, p5) p0, \ 
+    p1, p2, p3, p4, p5 
+#define GMOCK_INTERNAL_LIST_AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \ 
+    p6) p0, p1, p2, p3, p4, p5, p6 
+#define GMOCK_INTERNAL_LIST_AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \ 
+    p7) p0, p1, p2, p3, p4, p5, p6, p7 
+#define GMOCK_INTERNAL_LIST_AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \ 
+    p7, p8) p0, p1, p2, p3, p4, p5, p6, p7, p8 
+#define GMOCK_INTERNAL_LIST_AND_10_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \ 
+    p7, p8, p9) p0, p1, p2, p3, p4, p5, p6, p7, p8, p9 
+ 
+// Lists the value parameter types. 
+#define GMOCK_INTERNAL_LIST_TYPE_AND_0_VALUE_PARAMS() 
+#define GMOCK_INTERNAL_LIST_TYPE_AND_1_VALUE_PARAMS(p0) , p0##_type 
+#define GMOCK_INTERNAL_LIST_TYPE_AND_2_VALUE_PARAMS(p0, p1) , p0##_type, \ 
+    p1##_type 
+#define GMOCK_INTERNAL_LIST_TYPE_AND_3_VALUE_PARAMS(p0, p1, p2) , p0##_type, \ 
+    p1##_type, p2##_type 
+#define GMOCK_INTERNAL_LIST_TYPE_AND_4_VALUE_PARAMS(p0, p1, p2, p3) , \ 
+    p0##_type, p1##_type, p2##_type, p3##_type 
+#define GMOCK_INTERNAL_LIST_TYPE_AND_5_VALUE_PARAMS(p0, p1, p2, p3, p4) , \ 
+    p0##_type, p1##_type, p2##_type, p3##_type, p4##_type 
+#define GMOCK_INTERNAL_LIST_TYPE_AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, p5) , \ 
+    p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, p5##_type 
+#define GMOCK_INTERNAL_LIST_TYPE_AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \ 
+    p6) , p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, p5##_type, \ 
+    p6##_type 
+#define GMOCK_INTERNAL_LIST_TYPE_AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \ 
+    p6, p7) , p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, \ 
+    p5##_type, p6##_type, p7##_type 
+#define GMOCK_INTERNAL_LIST_TYPE_AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \ 
+    p6, p7, p8) , p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, \ 
+    p5##_type, p6##_type, p7##_type, p8##_type 
+#define GMOCK_INTERNAL_LIST_TYPE_AND_10_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \ 
+    p6, p7, p8, p9) , p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, \ 
+    p5##_type, p6##_type, p7##_type, p8##_type, p9##_type 
+ 
+// Declares the value parameters. 
+#define GMOCK_INTERNAL_DECL_AND_0_VALUE_PARAMS() 
+#define GMOCK_INTERNAL_DECL_AND_1_VALUE_PARAMS(p0) p0##_type p0 
+#define GMOCK_INTERNAL_DECL_AND_2_VALUE_PARAMS(p0, p1) p0##_type p0, \ 
+    p1##_type p1 
+#define GMOCK_INTERNAL_DECL_AND_3_VALUE_PARAMS(p0, p1, p2) p0##_type p0, \ 
+    p1##_type p1, p2##_type p2 
+#define GMOCK_INTERNAL_DECL_AND_4_VALUE_PARAMS(p0, p1, p2, p3) p0##_type p0, \ 
+    p1##_type p1, p2##_type p2, p3##_type p3 
+#define GMOCK_INTERNAL_DECL_AND_5_VALUE_PARAMS(p0, p1, p2, p3, \ 
+    p4) p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, p4##_type p4 
+#define GMOCK_INTERNAL_DECL_AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, \ 
+    p5) p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, p4##_type p4, \ 
+    p5##_type p5 
+#define GMOCK_INTERNAL_DECL_AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \ 
+    p6) p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, p4##_type p4, \ 
+    p5##_type p5, p6##_type p6 
+#define GMOCK_INTERNAL_DECL_AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \ 
+    p7) p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, p4##_type p4, \ 
+    p5##_type p5, p6##_type p6, p7##_type p7 
+#define GMOCK_INTERNAL_DECL_AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \ 
+    p7, p8) p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, \ 
+    p4##_type p4, p5##_type p5, p6##_type p6, p7##_type p7, p8##_type p8 
+#define GMOCK_INTERNAL_DECL_AND_10_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \ 
+    p7, p8, p9) p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, \ 
+    p4##_type p4, p5##_type p5, p6##_type p6, p7##_type p7, p8##_type p8, \ 
+    p9##_type p9 
+ 
+// The suffix of the class template implementing the action template. 
+#define GMOCK_INTERNAL_COUNT_AND_0_VALUE_PARAMS() 
+#define GMOCK_INTERNAL_COUNT_AND_1_VALUE_PARAMS(p0) P 
+#define GMOCK_INTERNAL_COUNT_AND_2_VALUE_PARAMS(p0, p1) P2 
+#define GMOCK_INTERNAL_COUNT_AND_3_VALUE_PARAMS(p0, p1, p2) P3 
+#define GMOCK_INTERNAL_COUNT_AND_4_VALUE_PARAMS(p0, p1, p2, p3) P4 
+#define GMOCK_INTERNAL_COUNT_AND_5_VALUE_PARAMS(p0, p1, p2, p3, p4) P5 
+#define GMOCK_INTERNAL_COUNT_AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, p5) P6 
+#define GMOCK_INTERNAL_COUNT_AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6) P7 
+#define GMOCK_INTERNAL_COUNT_AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \ 
+    p7) P8 
+#define GMOCK_INTERNAL_COUNT_AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \ 
+    p7, p8) P9 
+#define GMOCK_INTERNAL_COUNT_AND_10_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \ 
+    p7, p8, p9) P10 
+ 
+// The name of the class template implementing the action template. 
+#define GMOCK_ACTION_CLASS_(name, value_params)\ 
+    GTEST_CONCAT_TOKEN_(name##Action, GMOCK_INTERNAL_COUNT_##value_params) 
+ 
+#define ACTION_TEMPLATE(name, template_params, value_params)                   \ 
+  template <GMOCK_INTERNAL_DECL_##template_params                              \ 
+            GMOCK_INTERNAL_DECL_TYPE_##value_params>                           \ 
+  class GMOCK_ACTION_CLASS_(name, value_params) {                              \ 
+   public:                                                                     \ 
+    explicit GMOCK_ACTION_CLASS_(name, value_params)(                          \ 
+        GMOCK_INTERNAL_DECL_##value_params)                                    \ 
+        GMOCK_PP_IF(GMOCK_PP_IS_EMPTY(GMOCK_INTERNAL_COUNT_##value_params),    \ 
+                    = default; ,                                               \ 
+                    : impl_(std::make_shared<gmock_Impl>(                      \ 
+                                GMOCK_INTERNAL_LIST_##value_params)) { })      \ 
+    GMOCK_ACTION_CLASS_(name, value_params)(                                   \ 
+        const GMOCK_ACTION_CLASS_(name, value_params)&) noexcept               \ 
+        GMOCK_INTERNAL_DEFN_COPY_##value_params                                \ 
+    GMOCK_ACTION_CLASS_(name, value_params)(                                   \ 
+        GMOCK_ACTION_CLASS_(name, value_params)&&) noexcept                    \ 
+        GMOCK_INTERNAL_DEFN_COPY_##value_params                                \ 
+    template <typename F>                                                      \ 
+    operator ::testing::Action<F>() const {                                    \ 
+      return GMOCK_PP_IF(                                                      \ 
+          GMOCK_PP_IS_EMPTY(GMOCK_INTERNAL_COUNT_##value_params),              \ 
+                      (::testing::internal::MakeAction<F, gmock_Impl>()),      \ 
+                      (::testing::internal::MakeAction<F>(impl_)));            \ 
+    }                                                                          \ 
+   private:                                                                    \ 
+    class gmock_Impl {                                                         \ 
+     public:                                                                   \ 
+      explicit gmock_Impl GMOCK_INTERNAL_INIT_##value_params {}                \ 
+      template <typename function_type, typename return_type,                  \ 
+                typename args_type, GMOCK_ACTION_TEMPLATE_ARGS_NAMES_>         \ 
+      return_type gmock_PerformImpl(GMOCK_ACTION_ARG_TYPES_AND_NAMES_) const;  \ 
+      GMOCK_INTERNAL_DEFN_##value_params                                       \ 
+    };                                                                         \ 
+    GMOCK_PP_IF(GMOCK_PP_IS_EMPTY(GMOCK_INTERNAL_COUNT_##value_params),        \ 
+                , std::shared_ptr<const gmock_Impl> impl_;)                    \ 
+  };                                                                           \ 
+  template <GMOCK_INTERNAL_DECL_##template_params                              \ 
+            GMOCK_INTERNAL_DECL_TYPE_##value_params>                           \ 
+  GMOCK_ACTION_CLASS_(name, value_params)<                                     \ 
+      GMOCK_INTERNAL_LIST_##template_params                                    \ 
+      GMOCK_INTERNAL_LIST_TYPE_##value_params> name(                           \ 
+          GMOCK_INTERNAL_DECL_##value_params) GTEST_MUST_USE_RESULT_;          \ 
+  template <GMOCK_INTERNAL_DECL_##template_params                              \ 
+            GMOCK_INTERNAL_DECL_TYPE_##value_params>                           \ 
+  inline GMOCK_ACTION_CLASS_(name, value_params)<                              \ 
+      GMOCK_INTERNAL_LIST_##template_params                                    \ 
+      GMOCK_INTERNAL_LIST_TYPE_##value_params> name(                           \ 
+          GMOCK_INTERNAL_DECL_##value_params) {                                \ 
+    return GMOCK_ACTION_CLASS_(name, value_params)<                            \ 
+        GMOCK_INTERNAL_LIST_##template_params                                  \ 
+        GMOCK_INTERNAL_LIST_TYPE_##value_params>(                              \ 
+            GMOCK_INTERNAL_LIST_##value_params);                               \ 
+  }                                                                            \ 
+  template <GMOCK_INTERNAL_DECL_##template_params                              \ 
+            GMOCK_INTERNAL_DECL_TYPE_##value_params>                           \ 
+  template <typename function_type, typename return_type, typename args_type,  \ 
+            GMOCK_ACTION_TEMPLATE_ARGS_NAMES_>                                 \ 
+  return_type GMOCK_ACTION_CLASS_(name, value_params)<                         \ 
+      GMOCK_INTERNAL_LIST_##template_params                                    \ 
+      GMOCK_INTERNAL_LIST_TYPE_##value_params>::gmock_Impl::gmock_PerformImpl( \ 
+          GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const 
+ 
+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
@@ -499,69 +499,69 @@ namespace testing {
 # pragma warning(disable:4100)
 #endif
 
-namespace internal {
+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
-// internal/custom/gmock-generated-actions.h header.
-template <typename F, typename... Args>
-auto InvokeArgument(F f, Args... args) -> decltype(f(args...)) {
-  return f(args...);
+// 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 
+// internal/custom/gmock-generated-actions.h header. 
+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>
-  auto operator()(Args&&... args) const -> decltype(internal::InvokeArgument(
-      std::get<index>(std::forward_as_tuple(std::forward<Args>(args)...)),
-      std::declval<const Params&>()...)) {
-    internal::FlatTuple<Args&&...> args_tuple(FlatTupleConstructTag{},
-                                              std::forward<Args>(args)...);
-    return params.Apply([&](const Params&... unpacked_params) {
-      auto&& callable = args_tuple.template Get<index>();
-      return internal::InvokeArgument(
-          std::forward<decltype(callable)>(callable), unpacked_params...);
-    });
-  }
+template <std::size_t index, typename... Params> 
+struct InvokeArgumentAction { 
+  template <typename... Args> 
+  auto operator()(Args&&... args) const -> decltype(internal::InvokeArgument( 
+      std::get<index>(std::forward_as_tuple(std::forward<Args>(args)...)), 
+      std::declval<const Params&>()...)) { 
+    internal::FlatTuple<Args&&...> args_tuple(FlatTupleConstructTag{}, 
+                                              std::forward<Args>(args)...); 
+    return params.Apply([&](const Params&... unpacked_params) { 
+      auto&& callable = args_tuple.template Get<index>(); 
+      return internal::InvokeArgument( 
+          std::forward<decltype(callable)>(callable), unpacked_params...); 
+    }); 
+  } 
 
-  internal::FlatTuple<Params...> params;
-};
+  internal::FlatTuple<Params...> params; 
+}; 
 
-}  // namespace internal
+}  // 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.
-//
-// Notes:
-//
-//   1. The arguments are passed by value by default.  If you need to
-//   pass an argument by reference, wrap it inside std::ref().  For
-//   example,
-//
-//     InvokeArgument<1>(5, string("Hello"), std::ref(foo))
-//
-//   passes 5 and string("Hello") by value, and passes foo by
-//   reference.
-//
-//   2. If the callable takes an argument by reference but std::ref() is
-//   not used, it will receive the reference to a copy of the value,
-//   instead of the original value.  For example, when the 0-th
-//   argument of the mock function takes a const string&, the action
-//
-//     InvokeArgument<0>(string("Hello"))
-//
-//   makes a copy of the temporary string("Hello") object and passes a
-//   reference of the copy, instead of the original temporary object,
-//   to the callable.  This makes it easy for a user to define an
-//   InvokeArgument action from temporary values and have it performed
-//   later.
-template <std::size_t index, typename... Params>
-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)...)};
+// 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. 
+// 
+// Notes: 
+// 
+//   1. The arguments are passed by value by default.  If you need to 
+//   pass an argument by reference, wrap it inside std::ref().  For 
+//   example, 
+// 
+//     InvokeArgument<1>(5, string("Hello"), std::ref(foo)) 
+// 
+//   passes 5 and string("Hello") by value, and passes foo by 
+//   reference. 
+// 
+//   2. If the callable takes an argument by reference but std::ref() is 
+//   not used, it will receive the reference to a copy of the value, 
+//   instead of the original value.  For example, when the 0-th 
+//   argument of the mock function takes a const string&, the action 
+// 
+//     InvokeArgument<0>(string("Hello")) 
+// 
+//   makes a copy of the temporary string("Hello") object and passes a 
+//   reference of the copy, instead of the original temporary object, 
+//   to the callable.  This makes it easy for a user to define an 
+//   InvokeArgument action from temporary values and have it performed 
+//   later. 
+template <std::size_t index, typename... Params> 
+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
@@ -570,4 +570,4 @@ InvokeArgument(Params&&... params) {
 
 }  // namespace testing
 
-#endif  // GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_MORE_ACTIONS_H_
+#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 dfc77e359c..cfee28a1c7 100644
--- a/contrib/restricted/googletest/googlemock/include/gmock/gmock-more-matchers.h
+++ b/contrib/restricted/googletest/googlemock/include/gmock/gmock-more-matchers.h
@@ -27,35 +27,35 @@
 // (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 matchers that depend on gmock-matchers.h.
+// 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.
 
-// GOOGLETEST_CM0002 DO NOT DELETE
-
-#ifndef GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_MORE_MATCHERS_H_
-#define GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_MORE_MATCHERS_H_
+// GOOGLETEST_CM0002 DO NOT DELETE 
 
-#include "gmock/gmock-matchers.h"
+#ifndef GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_MORE_MATCHERS_H_ 
+#define GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_MORE_MATCHERS_H_ 
+ 
+#include "gmock/gmock-matchers.h" 
 
 namespace testing {
 
-// Silence C4100 (unreferenced formal
-// parameter) for MSVC
-#ifdef _MSC_VER
-# pragma warning(push)
-# pragma warning(disable:4100)
-#if (_MSC_VER == 1900)
-// and silence C4800 (C4800: 'int *const ': forcing value
-// to bool 'true' or 'false') for MSVC 14
-# pragma warning(disable:4800)
-  #endif
-#endif
-
+// Silence C4100 (unreferenced formal 
+// parameter) for MSVC 
+#ifdef _MSC_VER 
+# pragma warning(push) 
+# pragma warning(disable:4100) 
+#if (_MSC_VER == 1900) 
+// and silence C4800 (C4800: 'int *const ': forcing value 
+// to bool 'true' or 'false') for MSVC 14 
+# pragma warning(disable:4800) 
+  #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") {
@@ -66,27 +66,27 @@ MATCHER(IsEmpty, negation ? "isn't empty" : "is empty") {
   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
-// and false.
-MATCHER(IsTrue, negation ? "is false" : "is true") {
-  return static_cast<bool>(arg);
-}
-
-// Define a matcher that matches a value that evaluates in boolean
-// context to false.  Useful for types that define "explicit operator
-// bool" operators and so can't be compared for equality with true
-// and false.
-MATCHER(IsFalse, negation ? "is true" : "is false") {
-  return !static_cast<bool>(arg);
-}
-
-#ifdef _MSC_VER
-# pragma warning(pop)
-#endif
-
-
+// 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 
+// and false. 
+MATCHER(IsTrue, negation ? "is false" : "is true") { 
+  return static_cast<bool>(arg); 
+} 
+ 
+// Define a matcher that matches a value that evaluates in boolean 
+// context to false.  Useful for types that define "explicit operator 
+// bool" operators and so can't be compared for equality with true 
+// and false. 
+MATCHER(IsFalse, negation ? "is true" : "is false") { 
+  return !static_cast<bool>(arg); 
+} 
+ 
+#ifdef _MSC_VER 
+# pragma warning(pop) 
+#endif 
+ 
+ 
 }  // namespace testing
 
-#endif  // GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_MORE_MATCHERS_H_
+#endif  // GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_MORE_MATCHERS_H_ 
diff --git a/contrib/restricted/googletest/googlemock/include/gmock/gmock-nice-strict.h b/contrib/restricted/googletest/googlemock/include/gmock/gmock-nice-strict.h
index b03b770c75..d902a780a5 100644
--- a/contrib/restricted/googletest/googlemock/include/gmock/gmock-nice-strict.h
+++ b/contrib/restricted/googletest/googlemock/include/gmock/gmock-nice-strict.h
@@ -1,261 +1,261 @@
-// 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.
-
-
-// Implements class templates NiceMock, NaggyMock, and StrictMock.
-//
-// Given a mock class MockFoo that is created using Google Mock,
-// NiceMock<MockFoo> is a subclass of MockFoo that allows
-// uninteresting calls (i.e. calls to mock methods that have no
-// EXPECT_CALL specs), NaggyMock<MockFoo> is a subclass of MockFoo
-// that prints a warning when an uninteresting call occurs, and
-// StrictMock<MockFoo> is a subclass of MockFoo that treats all
-// uninteresting calls as errors.
-//
-// Currently a mock is naggy by default, so MockFoo and
-// NaggyMock<MockFoo> behave like the same.  However, we will soon
-// switch the default behavior of mocks to be nice, as that in general
-// leads to more maintainable tests.  When that happens, MockFoo will
-// stop behaving like NaggyMock<MockFoo> and start behaving like
-// NiceMock<MockFoo>.
-//
-// NiceMock, NaggyMock, and StrictMock "inherit" the constructors of
-// their respective base class.  Therefore you can write
-// NiceMock<MockFoo>(5, "a") to construct a nice mock where MockFoo
-// has a constructor that accepts (int, const char*), for example.
-//
-// A known limitation is that NiceMock<MockFoo>, NaggyMock<MockFoo>,
-// and StrictMock<MockFoo> only works for mock methods defined using
-// the MOCK_METHOD* family of macros DIRECTLY in the MockFoo class.
-// If a mock method is defined in a base class of MockFoo, the "nice"
-// or "strict" modifier may not affect it, depending on the compiler.
-// In particular, nesting NiceMock, NaggyMock, and StrictMock is NOT
-// supported.
-
-// GOOGLETEST_CM0002 DO NOT DELETE
-
-#ifndef GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_NICE_STRICT_H_
-#define GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_NICE_STRICT_H_
-
-#include <type_traits>
-
-#include "gmock/gmock-spec-builders.h"
-#include "gmock/internal/gmock-port.h"
-
-namespace testing {
-template <class MockClass>
-class NiceMock;
-template <class MockClass>
-class NaggyMock;
-template <class MockClass>
-class StrictMock;
-
-namespace internal {
-template <typename T>
-std::true_type StrictnessModifierProbe(const NiceMock<T>&);
-template <typename T>
-std::true_type StrictnessModifierProbe(const NaggyMock<T>&);
-template <typename T>
-std::true_type StrictnessModifierProbe(const StrictMock<T>&);
-std::false_type StrictnessModifierProbe(...);
-
-template <typename T>
-constexpr bool HasStrictnessModifier() {
-  return decltype(StrictnessModifierProbe(std::declval<const T&>()))::value;
-}
-
-// Base classes that register and deregister with testing::Mock to alter the
-// default behavior around uninteresting calls. Inheriting from one of these
-// classes first and then MockClass ensures the MockClass constructor is run
-// after registration, and that the MockClass destructor runs before
-// deregistration. This guarantees that MockClass's constructor and destructor
-// run with the same level of strictness as its instance methods.
-
-#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MINGW && \
-    (defined(_MSC_VER) || defined(__clang__))
-// We need to mark these classes with this declspec to ensure that
-// the empty base class optimization is performed.
-#define GTEST_INTERNAL_EMPTY_BASE_CLASS __declspec(empty_bases)
-#else
-#define GTEST_INTERNAL_EMPTY_BASE_CLASS
-#endif
-
-template <typename Base>
-class NiceMockImpl {
- public:
-  NiceMockImpl() { ::testing::Mock::AllowUninterestingCalls(this); }
-
-  ~NiceMockImpl() { ::testing::Mock::UnregisterCallReaction(this); }
-};
-
-template <typename Base>
-class NaggyMockImpl {
- public:
-  NaggyMockImpl() { ::testing::Mock::WarnUninterestingCalls(this); }
-
-  ~NaggyMockImpl() { ::testing::Mock::UnregisterCallReaction(this); }
-};
-
-template <typename Base>
-class StrictMockImpl {
- public:
-  StrictMockImpl() { ::testing::Mock::FailUninterestingCalls(this); }
-
-  ~StrictMockImpl() { ::testing::Mock::UnregisterCallReaction(this); }
-};
-
-}  // namespace internal
-
-template <class MockClass>
-class GTEST_INTERNAL_EMPTY_BASE_CLASS NiceMock
-    : private internal::NiceMockImpl<MockClass>,
-      public MockClass {
- public:
-  static_assert(!internal::HasStrictnessModifier<MockClass>(),
-                "Can't apply NiceMock to a class hierarchy that already has a "
-                "strictness modifier. See "
-                "https://google.github.io/googletest/"
-                "gmock_cook_book.html#NiceStrictNaggy");
-  NiceMock() : MockClass() {
-    static_assert(sizeof(*this) == sizeof(MockClass),
-                  "The impl subclass shouldn't introduce any padding");
-  }
-
-  // Ideally, we would inherit base class's constructors through a using
-  // declaration, which would preserve their visibility. However, many existing
-  // tests rely on the fact that current implementation reexports protected
-  // constructors as public. These tests would need to be cleaned up first.
-
-  // Single argument constructor is special-cased so that it can be
-  // made explicit.
-  template <typename A>
-  explicit NiceMock(A&& arg) : MockClass(std::forward<A>(arg)) {
-    static_assert(sizeof(*this) == sizeof(MockClass),
-                  "The impl subclass shouldn't introduce any padding");
-  }
-
-  template <typename TArg1, typename TArg2, typename... An>
-  NiceMock(TArg1&& arg1, TArg2&& arg2, An&&... args)
-      : MockClass(std::forward<TArg1>(arg1), std::forward<TArg2>(arg2),
-                  std::forward<An>(args)...) {
-    static_assert(sizeof(*this) == sizeof(MockClass),
-                  "The impl subclass shouldn't introduce any padding");
-  }
-
- private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(NiceMock);
-};
-
-template <class MockClass>
-class GTEST_INTERNAL_EMPTY_BASE_CLASS NaggyMock
-    : private internal::NaggyMockImpl<MockClass>,
-      public MockClass {
-  static_assert(!internal::HasStrictnessModifier<MockClass>(),
-                "Can't apply NaggyMock to a class hierarchy that already has a "
-                "strictness modifier. See "
-                "https://google.github.io/googletest/"
-                "gmock_cook_book.html#NiceStrictNaggy");
-
- public:
-  NaggyMock() : MockClass() {
-    static_assert(sizeof(*this) == sizeof(MockClass),
-                  "The impl subclass shouldn't introduce any padding");
-  }
-
-  // Ideally, we would inherit base class's constructors through a using
-  // declaration, which would preserve their visibility. However, many existing
-  // tests rely on the fact that current implementation reexports protected
-  // constructors as public. These tests would need to be cleaned up first.
-
-  // Single argument constructor is special-cased so that it can be
-  // made explicit.
-  template <typename A>
-  explicit NaggyMock(A&& arg) : MockClass(std::forward<A>(arg)) {
-    static_assert(sizeof(*this) == sizeof(MockClass),
-                  "The impl subclass shouldn't introduce any padding");
-  }
-
-  template <typename TArg1, typename TArg2, typename... An>
-  NaggyMock(TArg1&& arg1, TArg2&& arg2, An&&... args)
-      : MockClass(std::forward<TArg1>(arg1), std::forward<TArg2>(arg2),
-                  std::forward<An>(args)...) {
-    static_assert(sizeof(*this) == sizeof(MockClass),
-                  "The impl subclass shouldn't introduce any padding");
-  }
-
- private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(NaggyMock);
-};
-
-template <class MockClass>
-class GTEST_INTERNAL_EMPTY_BASE_CLASS StrictMock
-    : private internal::StrictMockImpl<MockClass>,
-      public MockClass {
- public:
-  static_assert(
-      !internal::HasStrictnessModifier<MockClass>(),
-      "Can't apply StrictMock to a class hierarchy that already has a "
-      "strictness modifier. See "
-      "https://google.github.io/googletest/"
-      "gmock_cook_book.html#NiceStrictNaggy");
-  StrictMock() : MockClass() {
-    static_assert(sizeof(*this) == sizeof(MockClass),
-                  "The impl subclass shouldn't introduce any padding");
-  }
-
-  // Ideally, we would inherit base class's constructors through a using
-  // declaration, which would preserve their visibility. However, many existing
-  // tests rely on the fact that current implementation reexports protected
-  // constructors as public. These tests would need to be cleaned up first.
-
-  // Single argument constructor is special-cased so that it can be
-  // made explicit.
-  template <typename A>
-  explicit StrictMock(A&& arg) : MockClass(std::forward<A>(arg)) {
-    static_assert(sizeof(*this) == sizeof(MockClass),
-                  "The impl subclass shouldn't introduce any padding");
-  }
-
-  template <typename TArg1, typename TArg2, typename... An>
-  StrictMock(TArg1&& arg1, TArg2&& arg2, An&&... args)
-      : MockClass(std::forward<TArg1>(arg1), std::forward<TArg2>(arg2),
-                  std::forward<An>(args)...) {
-    static_assert(sizeof(*this) == sizeof(MockClass),
-                  "The impl subclass shouldn't introduce any padding");
-  }
-
- private:
-  GTEST_DISALLOW_COPY_AND_ASSIGN_(StrictMock);
-};
-
-#undef GTEST_INTERNAL_EMPTY_BASE_CLASS
-
-}  // namespace testing
-
-#endif  // GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_NICE_STRICT_H_
+// 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. 
+ 
+ 
+// Implements class templates NiceMock, NaggyMock, and StrictMock. 
+// 
+// Given a mock class MockFoo that is created using Google Mock, 
+// NiceMock<MockFoo> is a subclass of MockFoo that allows 
+// uninteresting calls (i.e. calls to mock methods that have no 
+// EXPECT_CALL specs), NaggyMock<MockFoo> is a subclass of MockFoo 
+// that prints a warning when an uninteresting call occurs, and 
+// StrictMock<MockFoo> is a subclass of MockFoo that treats all 
+// uninteresting calls as errors. 
+// 
+// Currently a mock is naggy by default, so MockFoo and 
+// NaggyMock<MockFoo> behave like the same.  However, we will soon 
+// switch the default behavior of mocks to be nice, as that in general 
+// leads to more maintainable tests.  When that happens, MockFoo will 
+// stop behaving like NaggyMock<MockFoo> and start behaving like 
+// NiceMock<MockFoo>. 
+// 
+// NiceMock, NaggyMock, and StrictMock "inherit" the constructors of 
+// their respective base class.  Therefore you can write 
+// NiceMock<MockFoo>(5, "a") to construct a nice mock where MockFoo 
+// has a constructor that accepts (int, const char*), for example. 
+// 
+// A known limitation is that NiceMock<MockFoo>, NaggyMock<MockFoo>, 
+// and StrictMock<MockFoo> only works for mock methods defined using 
+// the MOCK_METHOD* family of macros DIRECTLY in the MockFoo class. 
+// If a mock method is defined in a base class of MockFoo, the "nice" 
+// or "strict" modifier may not affect it, depending on the compiler. 
+// In particular, nesting NiceMock, NaggyMock, and StrictMock is NOT 
+// supported. 
+ 
+// GOOGLETEST_CM0002 DO NOT DELETE 
+ 
+#ifndef GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_NICE_STRICT_H_ 
+#define GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_NICE_STRICT_H_ 
+ 
+#include <type_traits> 
+ 
+#include "gmock/gmock-spec-builders.h" 
+#include "gmock/internal/gmock-port.h" 
+ 
+namespace testing { 
+template <class MockClass> 
+class NiceMock; 
+template <class MockClass> 
+class NaggyMock; 
+template <class MockClass> 
+class StrictMock; 
+ 
+namespace internal { 
+template <typename T> 
+std::true_type StrictnessModifierProbe(const NiceMock<T>&); 
+template <typename T> 
+std::true_type StrictnessModifierProbe(const NaggyMock<T>&); 
+template <typename T> 
+std::true_type StrictnessModifierProbe(const StrictMock<T>&); 
+std::false_type StrictnessModifierProbe(...); 
+ 
+template <typename T> 
+constexpr bool HasStrictnessModifier() { 
+  return decltype(StrictnessModifierProbe(std::declval<const T&>()))::value; 
+} 
+ 
+// Base classes that register and deregister with testing::Mock to alter the 
+// default behavior around uninteresting calls. Inheriting from one of these 
+// classes first and then MockClass ensures the MockClass constructor is run 
+// after registration, and that the MockClass destructor runs before 
+// deregistration. This guarantees that MockClass's constructor and destructor 
+// run with the same level of strictness as its instance methods. 
+ 
+#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MINGW && \ 
+    (defined(_MSC_VER) || defined(__clang__)) 
+// We need to mark these classes with this declspec to ensure that 
+// the empty base class optimization is performed. 
+#define GTEST_INTERNAL_EMPTY_BASE_CLASS __declspec(empty_bases) 
+#else 
+#define GTEST_INTERNAL_EMPTY_BASE_CLASS 
+#endif 
+ 
+template <typename Base> 
+class NiceMockImpl { 
+ public: 
+  NiceMockImpl() { ::testing::Mock::AllowUninterestingCalls(this); } 
+ 
+  ~NiceMockImpl() { ::testing::Mock::UnregisterCallReaction(this); } 
+}; 
+ 
+template <typename Base> 
+class NaggyMockImpl { 
+ public: 
+  NaggyMockImpl() { ::testing::Mock::WarnUninterestingCalls(this); } 
+ 
+  ~NaggyMockImpl() { ::testing::Mock::UnregisterCallReaction(this); } 
+}; 
+ 
+template <typename Base> 
+class StrictMockImpl { 
+ public: 
+  StrictMockImpl() { ::testing::Mock::FailUninterestingCalls(this); } 
+ 
+  ~StrictMockImpl() { ::testing::Mock::UnregisterCallReaction(this); } 
+}; 
+ 
+}  // namespace internal 
+ 
+template <class MockClass> 
+class GTEST_INTERNAL_EMPTY_BASE_CLASS NiceMock 
+    : private internal::NiceMockImpl<MockClass>, 
+      public MockClass { 
+ public: 
+  static_assert(!internal::HasStrictnessModifier<MockClass>(), 
+                "Can't apply NiceMock to a class hierarchy that already has a " 
+                "strictness modifier. See " 
+                "https://google.github.io/googletest/" 
+                "gmock_cook_book.html#NiceStrictNaggy"); 
+  NiceMock() : MockClass() { 
+    static_assert(sizeof(*this) == sizeof(MockClass), 
+                  "The impl subclass shouldn't introduce any padding"); 
+  } 
+ 
+  // Ideally, we would inherit base class's constructors through a using 
+  // declaration, which would preserve their visibility. However, many existing 
+  // tests rely on the fact that current implementation reexports protected 
+  // constructors as public. These tests would need to be cleaned up first. 
+ 
+  // Single argument constructor is special-cased so that it can be 
+  // made explicit. 
+  template <typename A> 
+  explicit NiceMock(A&& arg) : MockClass(std::forward<A>(arg)) { 
+    static_assert(sizeof(*this) == sizeof(MockClass), 
+                  "The impl subclass shouldn't introduce any padding"); 
+  } 
+ 
+  template <typename TArg1, typename TArg2, typename... An> 
+  NiceMock(TArg1&& arg1, TArg2&& arg2, An&&... args) 
+      : MockClass(std::forward<TArg1>(arg1), std::forward<TArg2>(arg2), 
+                  std::forward<An>(args)...) { 
+    static_assert(sizeof(*this) == sizeof(MockClass), 
+                  "The impl subclass shouldn't introduce any padding"); 
+  } 
+ 
+ private: 
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(NiceMock); 
+}; 
+ 
+template <class MockClass> 
+class GTEST_INTERNAL_EMPTY_BASE_CLASS NaggyMock 
+    : private internal::NaggyMockImpl<MockClass>, 
+      public MockClass { 
+  static_assert(!internal::HasStrictnessModifier<MockClass>(), 
+                "Can't apply NaggyMock to a class hierarchy that already has a " 
+                "strictness modifier. See " 
+                "https://google.github.io/googletest/" 
+                "gmock_cook_book.html#NiceStrictNaggy"); 
+ 
+ public: 
+  NaggyMock() : MockClass() { 
+    static_assert(sizeof(*this) == sizeof(MockClass), 
+                  "The impl subclass shouldn't introduce any padding"); 
+  } 
+ 
+  // Ideally, we would inherit base class's constructors through a using 
+  // declaration, which would preserve their visibility. However, many existing 
+  // tests rely on the fact that current implementation reexports protected 
+  // constructors as public. These tests would need to be cleaned up first. 
+ 
+  // Single argument constructor is special-cased so that it can be 
+  // made explicit. 
+  template <typename A> 
+  explicit NaggyMock(A&& arg) : MockClass(std::forward<A>(arg)) { 
+    static_assert(sizeof(*this) == sizeof(MockClass), 
+                  "The impl subclass shouldn't introduce any padding"); 
+  } 
+ 
+  template <typename TArg1, typename TArg2, typename... An> 
+  NaggyMock(TArg1&& arg1, TArg2&& arg2, An&&... args) 
+      : MockClass(std::forward<TArg1>(arg1), std::forward<TArg2>(arg2), 
+                  std::forward<An>(args)...) { 
+    static_assert(sizeof(*this) == sizeof(MockClass), 
+                  "The impl subclass shouldn't introduce any padding"); 
+  } 
+ 
+ private: 
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(NaggyMock); 
+}; 
+ 
+template <class MockClass> 
+class GTEST_INTERNAL_EMPTY_BASE_CLASS StrictMock 
+    : private internal::StrictMockImpl<MockClass>, 
+      public MockClass { 
+ public: 
+  static_assert( 
+      !internal::HasStrictnessModifier<MockClass>(), 
+      "Can't apply StrictMock to a class hierarchy that already has a " 
+      "strictness modifier. See " 
+      "https://google.github.io/googletest/" 
+      "gmock_cook_book.html#NiceStrictNaggy"); 
+  StrictMock() : MockClass() { 
+    static_assert(sizeof(*this) == sizeof(MockClass), 
+                  "The impl subclass shouldn't introduce any padding"); 
+  } 
+ 
+  // Ideally, we would inherit base class's constructors through a using 
+  // declaration, which would preserve their visibility. However, many existing 
+  // tests rely on the fact that current implementation reexports protected 
+  // constructors as public. These tests would need to be cleaned up first. 
+ 
+  // Single argument constructor is special-cased so that it can be 
+  // made explicit. 
+  template <typename A> 
+  explicit StrictMock(A&& arg) : MockClass(std::forward<A>(arg)) { 
+    static_assert(sizeof(*this) == sizeof(MockClass), 
+                  "The impl subclass shouldn't introduce any padding"); 
+  } 
+ 
+  template <typename TArg1, typename TArg2, typename... An> 
+  StrictMock(TArg1&& arg1, TArg2&& arg2, An&&... args) 
+      : MockClass(std::forward<TArg1>(arg1), std::forward<TArg2>(arg2), 
+                  std::forward<An>(args)...) { 
+    static_assert(sizeof(*this) == sizeof(MockClass), 
+                  "The impl subclass shouldn't introduce any padding"); 
+  } 
+ 
+ private: 
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(StrictMock); 
+}; 
+ 
+#undef GTEST_INTERNAL_EMPTY_BASE_CLASS 
+ 
+}  // namespace testing 
+ 
+#endif  // GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_NICE_STRICT_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 41323c1cc0..22c427de8c 100644
--- a/contrib/restricted/googletest/googlemock/include/gmock/gmock-spec-builders.h
+++ b/contrib/restricted/googletest/googlemock/include/gmock/gmock-spec-builders.h
@@ -27,7 +27,7 @@
 // (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.
@@ -56,19 +56,19 @@
 // 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_
+// GOOGLETEST_CM0002 DO NOT DELETE 
+ 
+#ifndef GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_SPEC_BUILDERS_H_ 
+#define GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_SPEC_BUILDERS_H_ 
 
-#include <functional>
+#include <functional> 
 #include <map>
-#include <memory>
+#include <memory> 
 #include <set>
 #include <sstream>
 #include <string>
-#include <type_traits>
-#include <utility>
+#include <type_traits> 
+#include <utility> 
 #include <vector>
 #include "gmock/gmock-actions.h"
 #include "gmock/gmock-cardinalities.h"
@@ -77,13 +77,13 @@
 #include "gmock/internal/gmock-port.h"
 #include "gtest/gtest.h"
 
-#if GTEST_HAS_EXCEPTIONS
-# include <stdexcept>  // NOLINT
-#endif
-
-GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
-/* class A needs to have dll-interface to be used by clients of class B */)
-
+#if GTEST_HAS_EXCEPTIONS 
+# include <stdexcept>  // NOLINT 
+#endif 
+ 
+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.
@@ -108,14 +108,14 @@ 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;
-template <typename MockClass>
-class StrictMockImpl;
-template <typename MockClass>
-class NaggyMockImpl;
-
+// Helper classes for implementing NiceMock, StrictMock, and NaggyMock. 
+template <typename MockClass> 
+class NiceMockImpl; 
+template <typename MockClass> 
+class StrictMockImpl; 
+template <typename MockClass> 
+class NaggyMockImpl; 
+ 
 // Protects the mock object registry (in class Mock), all function
 // mockers, and all expectations.
 //
@@ -132,9 +132,9 @@ 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
+// Abstract base class of FunctionMocker.  This is the 
 // type-agnostic part of the function mocker interface.  Its pure
-// virtual methods are implemented by FunctionMocker.
+// virtual methods are implemented by FunctionMocker. 
 class GTEST_API_ UntypedFunctionMockerBase {
  public:
   UntypedFunctionMockerBase();
@@ -160,13 +160,13 @@ class GTEST_API_ UntypedFunctionMockerBase {
   // action fails.
   // L = *
   virtual UntypedActionResultHolderBase* UntypedPerformDefaultAction(
-      void* untyped_args, const std::string& call_description) const = 0;
+      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(
-      const void* untyped_action, void* untyped_args) const = 0;
+      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
@@ -220,13 +220,13 @@ class GTEST_API_ UntypedFunctionMockerBase {
   // 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);
+  UntypedActionResultHolderBase* UntypedInvokeWith(void* untyped_args) 
+      GTEST_LOCK_EXCLUDED_(g_gmock_mutex); 
 
  protected:
   typedef std::vector<const void*> UntypedOnCallSpecs;
 
-  using UntypedExpectations = std::vector<std::shared_ptr<ExpectationBase>>;
+  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.
@@ -245,14 +245,14 @@ class GTEST_API_ UntypedFunctionMockerBase {
   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
-  // expectations is important.  Therefore it's a logic race condition
-  // to read/write untyped_expectations_ concurrently.  In order for
-  // tools like tsan to catch concurrent read/write accesses to
-  // untyped_expectations, we deliberately leave accesses to it
-  // unprotected.
+  // 
+  // It's undefined behavior to interleave expectations (EXPECT_CALLs 
+  // or ON_CALLs) and mock function calls.  Also, the order of 
+  // expectations is important.  Therefore it's a logic race condition 
+  // to read/write untyped_expectations_ concurrently.  In order for 
+  // tools like tsan to catch concurrent read/write accesses to 
+  // untyped_expectations, we deliberately leave accesses to it 
+  // unprotected. 
   UntypedExpectations untyped_expectations_;
 };  // class UntypedFunctionMockerBase
 
@@ -278,14 +278,14 @@ class UntypedOnCallSpecBase {
   };
 
   // Asserts that the ON_CALL() statement has a certain property.
-  void AssertSpecProperty(bool property,
-                          const std::string& failure_message) const {
+  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.
-  void ExpectSpecProperty(bool property,
-                          const std::string& failure_message) const {
+  void ExpectSpecProperty(bool property, 
+                          const std::string& failure_message) const { 
     Expect(property, file_, line_, failure_message);
   }
 
@@ -311,9 +311,9 @@ class OnCallSpec : public UntypedOnCallSpecBase {
       : 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&>()) {}
+        // 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) {
@@ -340,7 +340,7 @@ class OnCallSpec : public UntypedOnCallSpecBase {
     return *this;
   }
 
-  // Returns true if and only if the given arguments match the matchers.
+  // 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);
   }
@@ -398,35 +398,35 @@ class GTEST_API_ Mock {
       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
+  // 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);
 
-  // Returns whether the mock was created as a naggy mock (default)
-  static bool IsNaggy(void* mock_obj)
-      GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
-  // Returns whether the mock was created as a nice mock
-  static bool IsNice(void* mock_obj)
-      GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex);
-  // Returns whether the mock was created as a strict mock
-  static bool IsStrict(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); 
+  // Returns whether the mock was created as a nice mock 
+  static bool IsNice(void* mock_obj) 
+      GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex); 
+  // Returns whether the mock was created as a strict 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>
-  friend class internal::FunctionMocker;
+  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;
+  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.
@@ -480,7 +480,7 @@ class GTEST_API_ Mock {
   // 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.
+  // FunctionMocker. 
   static void UnregisterLocked(internal::UntypedFunctionMockerBase* mocker)
       GTEST_EXCLUSIVE_LOCK_REQUIRED_(internal::g_gmock_mutex);
 };  // class Mock
@@ -500,15 +500,15 @@ class GTEST_API_ Mock {
 //   - 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(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
@@ -525,8 +525,8 @@ class GTEST_API_ Expectation {
   // 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.
+  // 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_;
   }
@@ -540,7 +540,7 @@ class GTEST_API_ Expectation {
   friend class ::testing::internal::UntypedFunctionMockerBase;
 
   template <typename F>
-  friend class ::testing::internal::FunctionMocker;
+  friend class ::testing::internal::FunctionMocker; 
 
   template <typename F>
   friend class ::testing::internal::TypedExpectation;
@@ -556,15 +556,15 @@ class GTEST_API_ Expectation {
   typedef ::std::set<Expectation, Less> Set;
 
   Expectation(
-      const std::shared_ptr<internal::ExpectationBase>& expectation_base);
+      const std::shared_ptr<internal::ExpectationBase>& expectation_base); 
 
   // Returns the expectation this object references.
-  const std::shared_ptr<internal::ExpectationBase>& expectation_base() const {
+  const std::shared_ptr<internal::ExpectationBase>& expectation_base() const { 
     return expectation_base_;
   }
 
-  // A shared_ptr that co-owns the expectation this handle references.
-  std::shared_ptr<internal::ExpectationBase> 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
@@ -608,8 +608,8 @@ class ExpectationSet {
   // 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.
+  // 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_;
   }
@@ -646,8 +646,8 @@ class GTEST_API_ Sequence {
   void AddExpectation(const Expectation& expectation) const;
 
  private:
-  // The last expectation in this sequence.
-  std::shared_ptr<Expectation> last_expectation_;
+  // The last expectation in this sequence. 
+  std::shared_ptr<Expectation> last_expectation_; 
 };  // class Sequence
 
 // An object of this type causes all EXPECT_CALL() statements
@@ -707,7 +707,7 @@ GTEST_API_ extern ThreadLocal<Sequence*> g_gmock_implicit_sequence;
 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);
+  ExpectationBase(const char* file, int line, const std::string& source_text); 
 
   virtual ~ExpectationBase();
 
@@ -755,14 +755,14 @@ class GTEST_API_ ExpectationBase {
   virtual Expectation GetHandle() = 0;
 
   // Asserts that the EXPECT_CALL() statement has the given property.
-  void AssertSpecProperty(bool property,
-                          const std::string& failure_message) const {
+  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.
-  void ExpectSpecProperty(bool property,
-                          const std::string& failure_message) const {
+  void ExpectSpecProperty(bool property, 
+                          const std::string& failure_message) const { 
     Expect(property, file_, line_, failure_message);
   }
 
@@ -770,8 +770,8 @@ class GTEST_API_ ExpectationBase {
   // 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().
+  // 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.
@@ -787,7 +787,7 @@ class GTEST_API_ ExpectationBase {
   void RetireAllPreRequisites()
       GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex);
 
-  // Returns true if and only if this expectation is retired.
+  // 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();
@@ -801,29 +801,29 @@ class GTEST_API_ ExpectationBase {
     retired_ = true;
   }
 
-  // Returns true if and only if this expectation is satisfied.
+  // 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_);
   }
 
-  // Returns true if and only if this expectation is saturated.
+  // 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_);
   }
 
-  // Returns true if and only if this expectation is over-saturated.
+  // 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_);
   }
 
-  // Returns true if and only if all pre-requisites of this expectation are
-  // satisfied.
+  // Returns true if and only if all pre-requisites of this expectation are 
+  // satisfied. 
   bool AllPrerequisitesAreSatisfied() const
       GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex);
 
@@ -865,13 +865,13 @@ class GTEST_API_ ExpectationBase {
   // 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.
+  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
-  // expectation.  We use std::shared_ptr in the set because we want an
+  // 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.
@@ -880,7 +880,7 @@ class GTEST_API_ ExpectationBase {
   // 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.
+  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.
@@ -898,19 +898,19 @@ class TypedExpectation : public ExpectationBase {
   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,
+  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,
-        // we cannot initialize it with _ as that causes ambiguity between
-        // Matcher's copy and move constructor for some argument types.
+        // 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()) {}
 
-  ~TypedExpectation() override {
+  ~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();
@@ -1076,7 +1076,7 @@ class TypedExpectation : public ExpectationBase {
 
   // If this mock method has an extra matcher (i.e. .With(matcher)),
   // describes it to the ostream.
-  void MaybeDescribeExtraMatcherTo(::std::ostream* os) override {
+  void MaybeDescribeExtraMatcherTo(::std::ostream* os) override { 
     if (extra_matcher_specified_) {
       *os << "    Expected args: ";
       extra_matcher_.DescribeTo(os);
@@ -1086,25 +1086,25 @@ class TypedExpectation : public ExpectationBase {
 
  private:
   template <typename Function>
-  friend class FunctionMocker;
+  friend class FunctionMocker; 
 
   // Returns an Expectation object that references and co-owns this
   // expectation.
-  Expectation GetHandle() override { return owner_->GetHandleOf(this); }
+  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.
 
-  // Returns true if and only if this expectation matches the given arguments.
+  // 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);
   }
 
-  // Returns true if and only if this expectation should handle the given
-  // arguments.
+  // 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();
@@ -1164,9 +1164,9 @@ class TypedExpectation : public ExpectationBase {
   }
 
   // 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) {
+  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__,
@@ -1188,10 +1188,10 @@ class TypedExpectation : public ExpectationBase {
       Log(kWarning, ss.str(), 1);
     }
 
-    return count <= action_count
-               ? *static_cast<const Action<F>*>(
-                     untyped_actions_[static_cast<size_t>(count - 1)])
-               : repeated_action();
+    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
@@ -1201,11 +1201,11 @@ class TypedExpectation : public ExpectationBase {
   // 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) {
+  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.
@@ -1214,7 +1214,7 @@ class TypedExpectation : public ExpectationBase {
       mocker->DescribeDefaultActionTo(args, what);
       DescribeCallCountTo(why);
 
-      return nullptr;
+      return nullptr; 
     }
 
     IncrementCallCount();
@@ -1231,7 +1231,7 @@ class TypedExpectation : public ExpectationBase {
 
   // All the fields below won't change once the EXPECT_CALL()
   // statement finishes.
-  FunctionMocker<F>* const owner_;
+  FunctionMocker<F>* const owner_; 
   ArgumentMatcherTuple matchers_;
   Matcher<const ArgumentTuple&> extra_matcher_;
   Action<F> repeated_action_;
@@ -1252,7 +1252,7 @@ class TypedExpectation : public ExpectationBase {
 // 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);
+                                const std::string& message); 
 
 template <typename F>
 class MockSpec {
@@ -1263,16 +1263,16 @@ class MockSpec {
 
   // 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) {}
+  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,
-                    std::string("ON_CALL(") + obj + ", " + call + ") invoked");
+                    std::string("ON_CALL(") + obj + ", " + call + ") invoked"); 
     return function_mocker_->AddNewOnCallSpec(file, line, matchers_);
   }
 
@@ -1280,26 +1280,26 @@ class MockSpec {
   // 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 + ")");
+    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_);
   }
 
-  // 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.
-  MockSpec<F>& operator()(const internal::WithoutMatchers&, void* const) {
-    return *this;
-  }
-
+  // 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. 
+  MockSpec<F>& operator()(const internal::WithoutMatchers&, void* const) { 
+    return *this; 
+  } 
+ 
  private:
   template <typename Function>
   friend class internal::FunctionMocker;
 
   // The function mocker that owns this spec.
-  internal::FunctionMocker<F>* const function_mocker_;
+  internal::FunctionMocker<F>* const function_mocker_; 
   // The argument matchers specified in the spec.
   ArgumentMatcherTuple matchers_;
 };  // class MockSpec
@@ -1318,18 +1318,18 @@ class ReferenceOrValueWrapper {
  public:
   // Constructs a wrapper from the given value/reference.
   explicit ReferenceOrValueWrapper(T value)
-      : value_(std::move(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.
-  T Unwrap() { return std::move(value_); }
+  T Unwrap() { return std::move(value_); } 
 
   // 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 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_;
   }
@@ -1382,7 +1382,7 @@ class ActionResultHolder : public UntypedActionResultHolderBase {
   }
 
   // Prints the held value as an action's result to os.
-  void PrintAsActionResult(::std::ostream* os) const override {
+  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);
@@ -1392,27 +1392,27 @@ class ActionResultHolder : public UntypedActionResultHolderBase {
   // 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)));
+      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>
-  static ActionResultHolder* PerformAction(
-      const Action<F>& action, typename Function<F>::ArgumentTuple&& args) {
-    return new ActionResultHolder(
-        Wrapper(action.Perform(std::move(args))));
+  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)
-      : result_(std::move(result)) {
+      : result_(std::move(result)) { 
   }
 
   Wrapper result_;
@@ -1426,16 +1426,16 @@ class ActionResultHolder<void> : public UntypedActionResultHolderBase {
  public:
   void Unwrap() { }
 
-  void PrintAsActionResult(::std::ostream* /* os */) const override {}
+  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(
-      const FunctionMocker<F>* func_mocker,
-      typename Function<F>::ArgumentTuple&& args,
-      const std::string& call_description) {
-    func_mocker->PerformDefaultAction(std::move(args), call_description);
+      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;
   }
 
@@ -1443,8 +1443,8 @@ class ActionResultHolder<void> : public UntypedActionResultHolderBase {
   // ActionResultHolder*.
   template <typename F>
   static ActionResultHolder* PerformAction(
-      const Action<F>& action, typename Function<F>::ArgumentTuple&& args) {
-    action.Perform(std::move(args));
+      const Action<F>& action, typename Function<F>::ArgumentTuple&& args) { 
+    action.Perform(std::move(args)); 
     return new ActionResultHolder;
   }
 
@@ -1454,38 +1454,38 @@ class ActionResultHolder<void> : public UntypedActionResultHolderBase {
 };
 
 template <typename F>
-class FunctionMocker;
-
-template <typename R, typename... Args>
-class FunctionMocker<R(Args...)> final : public UntypedFunctionMockerBase {
-  using F = R(Args...);
-
+class FunctionMocker; 
+ 
+template <typename R, typename... Args> 
+class FunctionMocker<R(Args...)> final : public UntypedFunctionMockerBase { 
+  using F = R(Args...); 
+ 
  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
-  // wants to copy a mock object, they should implement their own copy
-  // operation, for example:
-  //
-  //   class MockFoo : public Foo {
-  //    public:
-  //     // Defines a copy constructor explicitly.
-  //     MockFoo(const MockFoo& src) {}
-  //     ...
-  //   };
-  FunctionMocker(const FunctionMocker&) = delete;
-  FunctionMocker& operator=(const FunctionMocker&) = delete;
-
+  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 
+  // wants to copy a mock object, they should implement their own copy 
+  // operation, for example: 
+  // 
+  //   class MockFoo : public Foo { 
+  //    public: 
+  //     // Defines a copy constructor explicitly. 
+  //     MockFoo(const MockFoo& src) {} 
+  //     ... 
+  //   }; 
+  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.
-  ~FunctionMocker() override GTEST_LOCK_EXCLUDED_(g_gmock_mutex) {
+  ~FunctionMocker() override GTEST_LOCK_EXCLUDED_(g_gmock_mutex) { 
     MutexLock l(&g_gmock_mutex);
     VerifyAndClearExpectationsLocked();
     Mock::UnregisterLocked(this);
@@ -1505,7 +1505,7 @@ class FunctionMocker<R(Args...)> final : public UntypedFunctionMockerBase {
         return spec;
     }
 
-    return nullptr;
+    return nullptr; 
   }
 
   // Performs the default action of this mock function on the given
@@ -1515,15 +1515,15 @@ class FunctionMocker<R(Args...)> final : public UntypedFunctionMockerBase {
   // mutable state of this object, and thus can be called concurrently
   // without locking.
   // L = *
-  Result PerformDefaultAction(ArgumentTuple&& args,
-                              const std::string& call_description) const {
+  Result PerformDefaultAction(ArgumentTuple&& args, 
+                              const std::string& call_description) const { 
     const OnCallSpec<F>* const spec =
         this->FindOnCallSpec(args);
-    if (spec != nullptr) {
-      return spec->GetAction().Perform(std::move(args));
+    if (spec != nullptr) { 
+      return spec->GetAction().Perform(std::move(args)); 
     }
-    const std::string message =
-        call_description +
+    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
@@ -1541,30 +1541,30 @@ class FunctionMocker<R(Args...)> final : public UntypedFunctionMockerBase {
   // 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);
+  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 = *
-  UntypedActionResultHolderBase* UntypedPerformAction(
-      const void* untyped_action, void* untyped_args) const override {
+  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);
-    ArgumentTuple* args = static_cast<ArgumentTuple*>(untyped_args);
-    return ResultHolder::PerformAction(action, std::move(*args));
+    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.
-  void ClearDefaultActionsLocked() override
+  void ClearDefaultActionsLocked() override 
       GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
     g_gmock_mutex.AssertHeld();
 
@@ -1590,20 +1590,20 @@ class FunctionMocker<R(Args...)> final : public UntypedFunctionMockerBase {
     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.
-  Result Invoke(Args... args) GTEST_LOCK_EXCLUDED_(g_gmock_mutex) {
-    ArgumentTuple tuple(std::forward<Args>(args)...);
-    std::unique_ptr<ResultHolder> holder(DownCast_<ResultHolder*>(
-        this->UntypedInvokeWith(static_cast<void*>(&tuple))));
-    return holder->Unwrap();
-  }
-
-  MockSpec<F> With(Matcher<Args>... m) {
-    return MockSpec<F>(this, ::std::make_tuple(std::move(m)...));
-  }
-
+  // Returns the result of invoking this mock function with the given 
+  // arguments.  This function can be safely called from multiple 
+  // threads concurrently. 
+  Result Invoke(Args... args) GTEST_LOCK_EXCLUDED_(g_gmock_mutex) { 
+    ArgumentTuple tuple(std::forward<Args>(args)...); 
+    std::unique_ptr<ResultHolder> holder(DownCast_<ResultHolder*>( 
+        this->UntypedInvokeWith(static_cast<void*>(&tuple)))); 
+    return holder->Unwrap(); 
+  } 
+ 
+  MockSpec<F> With(Matcher<Args>... m) { 
+    return MockSpec<F>(this, ::std::make_tuple(std::move(m)...)); 
+  } 
+ 
  protected:
   template <typename Function>
   friend class MockSpec;
@@ -1622,21 +1622,21 @@ class FunctionMocker<R(Args...)> final : public UntypedFunctionMockerBase {
   }
 
   // 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) {
+  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);
-    const std::shared_ptr<ExpectationBase> untyped_expectation(expectation);
-    // See the definition of untyped_expectations_ for why access to
-    // it is unprotected here.
+    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();
-    if (implicit_sequence != nullptr) {
+    if (implicit_sequence != nullptr) { 
       implicit_sequence->AddExpectation(Expectation(untyped_expectation));
     }
 
@@ -1655,9 +1655,9 @@ class FunctionMocker<R(Args...)> final : public UntypedFunctionMockerBase {
                                ::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");
+    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";
@@ -1667,9 +1667,9 @@ class FunctionMocker<R(Args...)> final : public UntypedFunctionMockerBase {
   // 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) {
+  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 - ";
@@ -1694,17 +1694,17 @@ class FunctionMocker<R(Args...)> final : public UntypedFunctionMockerBase {
   // 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 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);
-    if (exp == nullptr) {  // A match wasn't found.
+    if (exp == nullptr) {  // A match wasn't found. 
       this->FormatUnexpectedCallMessageLocked(args, what, why);
-      return nullptr;
+      return nullptr; 
     }
 
     // This line must be done before calling GetActionForArguments(),
@@ -1712,15 +1712,15 @@ class FunctionMocker<R(Args...)> final : public UntypedFunctionMockerBase {
     // 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.
+    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.
-  void UntypedPrintArgs(const void* untyped_args,
-                        ::std::ostream* os) const override {
+  void UntypedPrintArgs(const void* untyped_args, 
+                        ::std::ostream* os) const override { 
     const ArgumentTuple& args =
         *static_cast<const ArgumentTuple*>(untyped_args);
     UniversalPrint(args, os);
@@ -1732,8 +1732,8 @@ class FunctionMocker<R(Args...)> final : public UntypedFunctionMockerBase {
       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.
+    // 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) {
@@ -1743,7 +1743,7 @@ class FunctionMocker<R(Args...)> final : public UntypedFunctionMockerBase {
         return exp;
       }
     }
-    return nullptr;
+    return nullptr; 
   }
 
   // Returns a message that the arguments don't match any expectation.
@@ -1765,12 +1765,12 @@ class FunctionMocker<R(Args...)> final : public UntypedFunctionMockerBase {
       ::std::ostream* why) const
           GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
     g_gmock_mutex.AssertHeld();
-    const size_t count = untyped_expectations_.size();
+    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";
-    for (size_t i = 0; i < count; i++) {
+    for (size_t i = 0; i < count; i++) { 
       TypedExpectation<F>* const expectation =
           static_cast<TypedExpectation<F>*>(untyped_expectations_[i].get());
       *why << "\n";
@@ -1783,152 +1783,152 @@ class FunctionMocker<R(Args...)> final : public UntypedFunctionMockerBase {
       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>
-class MockFunction;
-
-template <typename R, typename... Args>
-class MockFunction<R(Args...)> {
- public:
-  MockFunction(const MockFunction&) = delete;
-  MockFunction& operator=(const MockFunction&) = delete;
-
-  std::function<R(Args...)> AsStdFunction() {
-    return [this](Args... args) -> R {
-      return this->Call(std::forward<Args>(args)...);
-    };
-  }
-
-  // Implementation detail: the expansion of the MOCK_METHOD macro.
-  R Call(Args... args) {
-    mock_.SetOwnerAndName(this, "Call");
-    return mock_.Invoke(std::forward<Args>(args)...);
-  }
-
-  MockSpec<R(Args...)> gmock_Call(Matcher<Args>... m) {
-    mock_.RegisterOwner(this);
-    return mock_.With(std::move(m)...);
-  }
-
-  MockSpec<R(Args...)> gmock_Call(const WithoutMatchers&, R (*)(Args...)) {
-    return this->gmock_Call(::testing::A<Args>()...);
-  }
-
- protected:
-  MockFunction() = default;
-  ~MockFunction() = default;
-
- private:
-  FunctionMocker<R(Args...)> mock_;
-};
-
-/*
-The SignatureOf<F> struct is a meta-function returning function signature
-corresponding to the provided F argument.
-
-It makes use of MockFunction easier by allowing it to accept more F arguments
-than just function signatures.
-
-Specializations provided here cover a signature type itself and any template
-that can be parameterized with a signature, including std::function and
-boost::function.
-*/
-
-template <typename F, typename = void>
-struct SignatureOf;
-
-template <typename R, typename... Args>
-struct SignatureOf<R(Args...)> {
-  using type = R(Args...);
-};
-
-template <template <typename> class C, typename F>
-struct SignatureOf<C<F>,
-                   typename std::enable_if<std::is_function<F>::value>::type>
-    : SignatureOf<F> {};
-
-template <typename F>
-using SignatureOfT = typename SignatureOf<F>::type;
-
-}  // namespace internal
-
-// A MockFunction<F> type has one mock method whose type is
-// internal::SignatureOfT<F>.  It is useful when you just want your
-// test code to emit some messages and have Google Mock verify the
-// right messages are sent (and perhaps at the right times).  For
-// example, if you are exercising code:
-//
-//   Foo(1);
-//   Foo(2);
-//   Foo(3);
-//
-// and want to verify that Foo(1) and Foo(3) both invoke
-// mock.Bar("a"), but Foo(2) doesn't invoke anything, you can write:
-//
-// TEST(FooTest, InvokesBarCorrectly) {
-//   MyMock mock;
-//   MockFunction<void(string check_point_name)> check;
-//   {
-//     InSequence s;
-//
-//     EXPECT_CALL(mock, Bar("a"));
-//     EXPECT_CALL(check, Call("1"));
-//     EXPECT_CALL(check, Call("2"));
-//     EXPECT_CALL(mock, Bar("a"));
-//   }
-//   Foo(1);
-//   check.Call("1");
-//   Foo(2);
-//   check.Call("2");
-//   Foo(3);
-// }
-//
-// The expectation spec says that the first Bar("a") must happen
-// before check point "1", the second Bar("a") must happen after check
-// point "2", and nothing should happen between the two check
-// points. The explicit check points make it easy to tell which
-// Bar("a") is called by which call to Foo().
-//
-// MockFunction<F> can also be used to exercise code that accepts
-// std::function<internal::SignatureOfT<F>> callbacks. To do so, use
-// AsStdFunction() method to create std::function proxy forwarding to
-// original object's Call. Example:
-//
-// TEST(FooTest, RunsCallbackWithBarArgument) {
-//   MockFunction<int(string)> callback;
-//   EXPECT_CALL(callback, Call("bar")).WillOnce(Return(1));
-//   Foo(callback.AsStdFunction());
-// }
-//
-// The internal::SignatureOfT<F> indirection allows to use other types
-// than just function signature type. This is typically useful when
-// providing a mock for a predefined std::function type. Example:
-//
-// using FilterPredicate = std::function<bool(string)>;
-// void MyFilterAlgorithm(FilterPredicate predicate);
-//
-// TEST(FooTest, FilterPredicateAlwaysAccepts) {
-//   MockFunction<FilterPredicate> predicateMock;
-//   EXPECT_CALL(predicateMock, Call(_)).WillRepeatedly(Return(true));
-//   MyFilterAlgorithm(predicateMock.AsStdFunction());
-// }
-template <typename F>
-class MockFunction : public internal::MockFunction<internal::SignatureOfT<F>> {
-  using Base = internal::MockFunction<internal::SignatureOfT<F>>;
-
- public:
-  using Base::Base;
-};
-
+};  // 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> 
+class MockFunction; 
+ 
+template <typename R, typename... Args> 
+class MockFunction<R(Args...)> { 
+ public: 
+  MockFunction(const MockFunction&) = delete; 
+  MockFunction& operator=(const MockFunction&) = delete; 
+ 
+  std::function<R(Args...)> AsStdFunction() { 
+    return [this](Args... args) -> R { 
+      return this->Call(std::forward<Args>(args)...); 
+    }; 
+  } 
+ 
+  // Implementation detail: the expansion of the MOCK_METHOD macro. 
+  R Call(Args... args) { 
+    mock_.SetOwnerAndName(this, "Call"); 
+    return mock_.Invoke(std::forward<Args>(args)...); 
+  } 
+ 
+  MockSpec<R(Args...)> gmock_Call(Matcher<Args>... m) { 
+    mock_.RegisterOwner(this); 
+    return mock_.With(std::move(m)...); 
+  } 
+ 
+  MockSpec<R(Args...)> gmock_Call(const WithoutMatchers&, R (*)(Args...)) { 
+    return this->gmock_Call(::testing::A<Args>()...); 
+  } 
+ 
+ protected: 
+  MockFunction() = default; 
+  ~MockFunction() = default; 
+ 
+ private: 
+  FunctionMocker<R(Args...)> mock_; 
+}; 
+ 
+/* 
+The SignatureOf<F> struct is a meta-function returning function signature 
+corresponding to the provided F argument. 
+ 
+It makes use of MockFunction easier by allowing it to accept more F arguments 
+than just function signatures. 
+ 
+Specializations provided here cover a signature type itself and any template 
+that can be parameterized with a signature, including std::function and 
+boost::function. 
+*/ 
+ 
+template <typename F, typename = void> 
+struct SignatureOf; 
+ 
+template <typename R, typename... Args> 
+struct SignatureOf<R(Args...)> { 
+  using type = R(Args...); 
+}; 
+ 
+template <template <typename> class C, typename F> 
+struct SignatureOf<C<F>, 
+                   typename std::enable_if<std::is_function<F>::value>::type> 
+    : SignatureOf<F> {}; 
+ 
+template <typename F> 
+using SignatureOfT = typename SignatureOf<F>::type; 
+ 
+}  // namespace internal 
+ 
+// A MockFunction<F> type has one mock method whose type is 
+// internal::SignatureOfT<F>.  It is useful when you just want your 
+// test code to emit some messages and have Google Mock verify the 
+// right messages are sent (and perhaps at the right times).  For 
+// example, if you are exercising code: 
+// 
+//   Foo(1); 
+//   Foo(2); 
+//   Foo(3); 
+// 
+// and want to verify that Foo(1) and Foo(3) both invoke 
+// mock.Bar("a"), but Foo(2) doesn't invoke anything, you can write: 
+// 
+// TEST(FooTest, InvokesBarCorrectly) { 
+//   MyMock mock; 
+//   MockFunction<void(string check_point_name)> check; 
+//   { 
+//     InSequence s; 
+// 
+//     EXPECT_CALL(mock, Bar("a")); 
+//     EXPECT_CALL(check, Call("1")); 
+//     EXPECT_CALL(check, Call("2")); 
+//     EXPECT_CALL(mock, Bar("a")); 
+//   } 
+//   Foo(1); 
+//   check.Call("1"); 
+//   Foo(2); 
+//   check.Call("2"); 
+//   Foo(3); 
+// } 
+// 
+// The expectation spec says that the first Bar("a") must happen 
+// before check point "1", the second Bar("a") must happen after check 
+// point "2", and nothing should happen between the two check 
+// points. The explicit check points make it easy to tell which 
+// Bar("a") is called by which call to Foo(). 
+// 
+// MockFunction<F> can also be used to exercise code that accepts 
+// std::function<internal::SignatureOfT<F>> callbacks. To do so, use 
+// AsStdFunction() method to create std::function proxy forwarding to 
+// original object's Call. Example: 
+// 
+// TEST(FooTest, RunsCallbackWithBarArgument) { 
+//   MockFunction<int(string)> callback; 
+//   EXPECT_CALL(callback, Call("bar")).WillOnce(Return(1)); 
+//   Foo(callback.AsStdFunction()); 
+// } 
+// 
+// The internal::SignatureOfT<F> indirection allows to use other types 
+// than just function signature type. This is typically useful when 
+// providing a mock for a predefined std::function type. Example: 
+// 
+// using FilterPredicate = std::function<bool(string)>; 
+// void MyFilterAlgorithm(FilterPredicate predicate); 
+// 
+// TEST(FooTest, FilterPredicateAlwaysAccepts) { 
+//   MockFunction<FilterPredicate> predicateMock; 
+//   EXPECT_CALL(predicateMock, Call(_)).WillRepeatedly(Return(true)); 
+//   MyFilterAlgorithm(predicateMock.AsStdFunction()); 
+// } 
+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
@@ -1960,79 +1960,79 @@ inline Expectation::Expectation(internal::ExpectationBase& exp)  // NOLINT
 
 }  // 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
-// tests in internal/gmock-spec-builders_test.cc for more details.
-//
-// This macro supports statements both with and without parameter matchers. If
-// the parameter list is omitted, gMock will accept any parameters, which allows
-// tests to be written that don't need to encode the number of method
-// parameter. This technique may only be used for non-overloaded methods.
-//
-//   // These are the same:
-//   ON_CALL(mock, NoArgsMethod()).WillByDefault(...);
-//   ON_CALL(mock, NoArgsMethod).WillByDefault(...);
-//
-//   // As are these:
-//   ON_CALL(mock, TwoArgsMethod(_, _)).WillByDefault(...);
-//   ON_CALL(mock, TwoArgsMethod).WillByDefault(...);
-//
-//   // Can also specify args if you want, of course:
-//   ON_CALL(mock, TwoArgsMethod(_, 45)).WillByDefault(...);
-//
-//   // Overloads work as long as you specify parameters:
-//   ON_CALL(mock, OverloadedMethod(_)).WillByDefault(...);
-//   ON_CALL(mock, OverloadedMethod(_, _)).WillByDefault(...);
-//
-//   // Oops! Which overload did you want?
-//   ON_CALL(mock, OverloadedMethod).WillByDefault(...);
-//     => ERROR: call to member function 'gmock_OverloadedMethod' is ambiguous
-//
-// How this works: The mock class uses two overloads of the gmock_Method
-// expectation setter method plus an operator() overload on the MockSpec object.
-// In the matcher list form, the macro expands to:
-//
-//   // This statement:
-//   ON_CALL(mock, TwoArgsMethod(_, 45))...
-//
-//   // ...expands to:
-//   mock.gmock_TwoArgsMethod(_, 45)(WithoutMatchers(), nullptr)...
-//   |-------------v---------------||------------v-------------|
-//       invokes first overload        swallowed by operator()
-//
-//   // ...which is essentially:
-//   mock.gmock_TwoArgsMethod(_, 45)...
-//
-// Whereas the form without a matcher list:
-//
-//   // This statement:
-//   ON_CALL(mock, TwoArgsMethod)...
-//
-//   // ...expands to:
-//   mock.gmock_TwoArgsMethod(WithoutMatchers(), nullptr)...
-//   |-----------------------v--------------------------|
-//                 invokes second overload
-//
-//   // ...which is essentially:
-//   mock.gmock_TwoArgsMethod(_, _)...
-//
-// The WithoutMatchers() argument is used to disambiguate overloads and to
-// block the caller from accidentally invoking the second overload directly. The
-// second argument is an internal type derived from the method signature. The
-// failure to disambiguate two overloads of this method in the ON_CALL statement
-// is how we block callers from setting expectations on overloaded methods.
-#define GMOCK_ON_CALL_IMPL_(mock_expr, Setter, call)                    \
-  ((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)
-
-#define EXPECT_CALL(obj, call) \
-  GMOCK_ON_CALL_IMPL_(obj, InternalExpectedAt, call)
-
-#endif  // GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_SPEC_BUILDERS_H_
+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 
+// tests in internal/gmock-spec-builders_test.cc for more details. 
+// 
+// This macro supports statements both with and without parameter matchers. If 
+// the parameter list is omitted, gMock will accept any parameters, which allows 
+// tests to be written that don't need to encode the number of method 
+// parameter. This technique may only be used for non-overloaded methods. 
+// 
+//   // These are the same: 
+//   ON_CALL(mock, NoArgsMethod()).WillByDefault(...); 
+//   ON_CALL(mock, NoArgsMethod).WillByDefault(...); 
+// 
+//   // As are these: 
+//   ON_CALL(mock, TwoArgsMethod(_, _)).WillByDefault(...); 
+//   ON_CALL(mock, TwoArgsMethod).WillByDefault(...); 
+// 
+//   // Can also specify args if you want, of course: 
+//   ON_CALL(mock, TwoArgsMethod(_, 45)).WillByDefault(...); 
+// 
+//   // Overloads work as long as you specify parameters: 
+//   ON_CALL(mock, OverloadedMethod(_)).WillByDefault(...); 
+//   ON_CALL(mock, OverloadedMethod(_, _)).WillByDefault(...); 
+// 
+//   // Oops! Which overload did you want? 
+//   ON_CALL(mock, OverloadedMethod).WillByDefault(...); 
+//     => ERROR: call to member function 'gmock_OverloadedMethod' is ambiguous 
+// 
+// How this works: The mock class uses two overloads of the gmock_Method 
+// expectation setter method plus an operator() overload on the MockSpec object. 
+// In the matcher list form, the macro expands to: 
+// 
+//   // This statement: 
+//   ON_CALL(mock, TwoArgsMethod(_, 45))... 
+// 
+//   // ...expands to: 
+//   mock.gmock_TwoArgsMethod(_, 45)(WithoutMatchers(), nullptr)... 
+//   |-------------v---------------||------------v-------------| 
+//       invokes first overload        swallowed by operator() 
+// 
+//   // ...which is essentially: 
+//   mock.gmock_TwoArgsMethod(_, 45)... 
+// 
+// Whereas the form without a matcher list: 
+// 
+//   // This statement: 
+//   ON_CALL(mock, TwoArgsMethod)... 
+// 
+//   // ...expands to: 
+//   mock.gmock_TwoArgsMethod(WithoutMatchers(), nullptr)... 
+//   |-----------------------v--------------------------| 
+//                 invokes second overload 
+// 
+//   // ...which is essentially: 
+//   mock.gmock_TwoArgsMethod(_, _)... 
+// 
+// The WithoutMatchers() argument is used to disambiguate overloads and to 
+// block the caller from accidentally invoking the second overload directly. The 
+// second argument is an internal type derived from the method signature. The 
+// failure to disambiguate two overloads of this method in the ON_CALL statement 
+// is how we block callers from setting expectations on overloaded methods. 
+#define GMOCK_ON_CALL_IMPL_(mock_expr, Setter, call)                    \ 
+  ((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) 
+ 
+#define EXPECT_CALL(obj, call) \ 
+  GMOCK_ON_CALL_IMPL_(obj, InternalExpectedAt, call) 
+ 
+#endif  // GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_SPEC_BUILDERS_H_ 
diff --git a/contrib/restricted/googletest/googlemock/include/gmock/gmock.h b/contrib/restricted/googletest/googlemock/include/gmock/gmock.h
index 12469bc466..148f508c30 100644
--- a/contrib/restricted/googletest/googlemock/include/gmock/gmock.h
+++ b/contrib/restricted/googletest/googlemock/include/gmock/gmock.h
@@ -27,26 +27,26 @@
 // (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 is the main header file a user should include.
 
-// GOOGLETEST_CM0002 DO NOT DELETE
-
-#ifndef GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_H_
-#define GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_H_
+// GOOGLETEST_CM0002 DO NOT DELETE 
+ 
+#ifndef GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_H_ 
+#define GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_H_ 
 
 // This file implements the following syntax:
 //
-//   ON_CALL(mock_object, Method(...))
+//   ON_CALL(mock_object, Method(...)) 
 //     .With(...) ?
 //     .WillByDefault(...);
 //
 // where With() is optional and WillByDefault() must appear exactly
 // once.
 //
-//   EXPECT_CALL(mock_object, Method(...))
+//   EXPECT_CALL(mock_object, Method(...)) 
 //     .With(...) ?
 //     .Times(...) ?
 //     .InSequence(...) *
@@ -58,11 +58,11 @@
 
 #include "gmock/gmock-actions.h"
 #include "gmock/gmock-cardinalities.h"
-#include "gmock/gmock-function-mocker.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-nice-strict.h"
+#include "gmock/gmock-nice-strict.h" 
 #include "gmock/internal/gmock-internal-utils.h"
 
 namespace testing {
@@ -70,7 +70,7 @@ namespace testing {
 // Declares Google Mock flags that we want a user to use programmatically.
 GMOCK_DECLARE_bool_(catch_leaked_mocks);
 GMOCK_DECLARE_string_(verbose);
-GMOCK_DECLARE_int32_(default_mock_behavior);
+GMOCK_DECLARE_int32_(default_mock_behavior); 
 
 // Initializes Google Mock.  This must be called before running the
 // tests.  In particular, it parses the command line for the flags
@@ -89,10 +89,10 @@ GTEST_API_ void InitGoogleMock(int* argc, char** argv);
 // UNICODE mode.
 GTEST_API_ void InitGoogleMock(int* argc, wchar_t** argv);
 
-// This overloaded version can be used on Arduino/embedded platforms where
-// there is no argc/argv.
-GTEST_API_ void InitGoogleMock();
-
+// This overloaded version can be used on Arduino/embedded platforms where 
+// there is no argc/argv. 
+GTEST_API_ void InitGoogleMock(); 
+ 
 }  // namespace testing
 
-#endif  // GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_H_
+#endif  // GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_H_ 
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 63f899962e..d1ebfb912e 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
@@ -1,6 +1,6 @@
-// GOOGLETEST_CM0002 DO NOT DELETE
+// GOOGLETEST_CM0002 DO NOT DELETE 
+ 
+#ifndef GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_GENERATED_ACTIONS_H_ 
+#define GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_GENERATED_ACTIONS_H_ 
 
-#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_
+#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 638429488e..f7d0e2d33b 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
@@ -27,10 +27,10 @@
 // (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
+// Injection point for custom user configurations. See README for details 
 //
-// GOOGLETEST_CM0002 DO NOT DELETE
+// 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_
+#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 14378692ae..932b74eedc 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
@@ -27,13 +27,13 @@
 // (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
+// Injection point for custom user configurations. See README for details 
 //
 // ** Custom implementation starts here **
 
-// GOOGLETEST_CM0002 DO NOT DELETE
+// GOOGLETEST_CM0002 DO NOT DELETE 
+ 
+#ifndef GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_PORT_H_ 
+#define GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_PORT_H_ 
 
-#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_
+#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 317544a7da..67b56f9510 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
@@ -27,49 +27,49 @@
 // (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_
+// 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 <type_traits>
+#include <type_traits> 
 #include "gmock/internal/gmock-port.h"
 #include "gtest/gtest.h"
 
 namespace testing {
-
-template <typename>
-class Matcher;
-
+ 
+template <typename> 
+class Matcher; 
+ 
 namespace internal {
 
-// Silence MSVC C4100 (unreferenced formal parameter) and
-// C4805('==': unsafe mix of type 'const int' and type 'const bool')
-#ifdef _MSC_VER
-# pragma warning(push)
-# pragma warning(disable:4100)
-# pragma warning(disable:4805)
-#endif
-
-// Joins a vector of strings as if they are fields of a tuple; returns
-// the joined string.
-GTEST_API_ std::string JoinAsTuple(const Strings& fields);
-
+// Silence MSVC C4100 (unreferenced formal parameter) and 
+// C4805('==': unsafe mix of type 'const int' and type 'const bool') 
+#ifdef _MSC_VER 
+# pragma warning(push) 
+# pragma warning(disable:4100) 
+# pragma warning(disable:4805) 
+#endif 
+ 
+// Joins a vector of strings as if they are fields of a tuple; returns 
+// 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".
-GTEST_API_ std::string ConvertIdentifierNameToWords(const char* id_name);
+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.
@@ -86,7 +86,7 @@ inline Element* GetRawPointer(Element* p) { return p; }
 // 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)
+#if defined(_MSC_VER) && !defined(_NATIVE_WCHAR_T_DEFINED) 
 // wchar_t is a typedef.
 #else
 # define GMOCK_WCHAR_T_IS_NATIVE_ 1
@@ -122,8 +122,8 @@ 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
+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);
@@ -142,7 +142,7 @@ GMOCK_DECLARE_KIND_(long double, kFloatingPoint);
       ::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
+// 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
@@ -151,42 +151,42 @@ GMOCK_DECLARE_KIND_(long double, kFloatingPoint);
 // 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
-      // Converting from bool is always lossless
-      (kFromKind == kBool) ? true
-      // Converting between any other type kinds will be lossy if the type
-      // kinds are not the same.
-    : (kFromKind != kToKind) ? false
-    : (kFromKind == kInteger &&
-       // Converting between integers of different widths is allowed so long
-       // as the conversion does not go from signed to unsigned.
-      (((sizeof(From) < sizeof(To)) &&
-        !(std::is_signed<From>::value && !std::is_signed<To>::value)) ||
-       // Converting between integers of the same width only requires the
-       // two types to have the same signedness.
-       ((sizeof(From) == sizeof(To)) &&
-        (std::is_signed<From>::value == std::is_signed<To>::value)))
-       ) ? true
-      // Floating point conversions are lossless if and only if `To` is at least
-      // as wide as `From`.
-    : (kFromKind == kFloatingPoint && (sizeof(From) <= sizeof(To))) ? true
-    : 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.
+using LosslessArithmeticConvertibleImpl = std::integral_constant< 
+    bool, 
+    // clang-format off 
+      // Converting from bool is always lossless 
+      (kFromKind == kBool) ? true 
+      // Converting between any other type kinds will be lossy if the type 
+      // kinds are not the same. 
+    : (kFromKind != kToKind) ? false 
+    : (kFromKind == kInteger && 
+       // Converting between integers of different widths is allowed so long 
+       // as the conversion does not go from signed to unsigned. 
+      (((sizeof(From) < sizeof(To)) && 
+        !(std::is_signed<From>::value && !std::is_signed<To>::value)) || 
+       // Converting between integers of the same width only requires the 
+       // two types to have the same signedness. 
+       ((sizeof(From) == sizeof(To)) && 
+        (std::is_signed<From>::value == std::is_signed<To>::value))) 
+       ) ? true 
+      // Floating point conversions are lossless if and only if `To` is at least 
+      // as wide as `From`. 
+    : (kFromKind == kFloatingPoint && (sizeof(From) <= sizeof(To))) ? true 
+    : 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>
-using LosslessArithmeticConvertible =
-    LosslessArithmeticConvertibleImpl<GMOCK_KIND_OF_(From), From,
-                                      GMOCK_KIND_OF_(To), 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).
@@ -201,7 +201,7 @@ class 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;
+                             const std::string& message) = 0; 
 };
 
 // Returns the failure reporter used by Google Mock.
@@ -213,7 +213,7 @@ GTEST_API_ FailureReporterInterface* GetFailureReporter();
 // 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) {
+                   const std::string& msg) { 
   if (!condition) {
     GetFailureReporter()->ReportFailure(FailureReporterInterface::kFatal,
                                         file, line, msg);
@@ -226,7 +226,7 @@ inline void Assert(bool condition, const char* file, int line) {
 // 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) {
+                   const std::string& msg) { 
   if (!condition) {
     GetFailureReporter()->ReportFailure(FailureReporterInterface::kNonfatal,
                                         file, line, msg);
@@ -251,35 +251,35 @@ 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.
+// 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);
 
-// Prints the given message to stdout if and only if 'severity' >= the level
+// 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.
-GTEST_API_ void Log(LogSeverity severity, const std::string& message,
+GTEST_API_ void Log(LogSeverity severity, const std::string& message, 
                     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:
-//
-//    ON_CALL(mock, Method({}, nullptr))...
-//
-class WithoutMatchers {
- private:
-  WithoutMatchers() {}
-  friend GTEST_API_ WithoutMatchers GetWithoutMatchers();
-};
-
-// Internal use only: access the singleton instance of WithoutMatchers.
-GTEST_API_ WithoutMatchers GetWithoutMatchers();
-
+// 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: 
+// 
+//    ON_CALL(mock, Method({}, nullptr))... 
+// 
+class WithoutMatchers { 
+ private: 
+  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
@@ -328,8 +328,8 @@ class StlContainerView {
   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");
+    static_assert(!std::is_const<RawContainer>::value, 
+                  "RawContainer type must not be const"); 
     return container;
   }
   static type Copy(const RawContainer& container) { return container; }
@@ -339,7 +339,7 @@ class StlContainerView {
 template <typename Element, size_t N>
 class StlContainerView<Element[N]> {
  public:
-  typedef typename std::remove_const<Element>::type RawElement;
+  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'
@@ -349,8 +349,8 @@ class StlContainerView<Element[N]> {
   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");
+    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]) {
@@ -361,21 +361,21 @@ class StlContainerView<Element[N]> {
 // 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> > {
+class StlContainerView< ::std::tuple<ElementPointer, Size> > { 
  public:
-  typedef typename std::remove_const<
-      typename std::pointer_traits<ElementPointer>::element_type>::type
-      RawElement;
+  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(
-      const ::std::tuple<ElementPointer, Size>& array) {
-    return type(std::get<0>(array), std::get<1>(array),
-                RelationToSourceReference());
+      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());
+  static type Copy(const ::std::tuple<ElementPointer, Size>& array) { 
+    return type(std::get<0>(array), std::get<1>(array), RelationToSourceCopy()); 
   }
 };
 
@@ -397,63 +397,63 @@ 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))...)) {
-  return std::forward<F>(f)(std::get<Idx>(std::forward<Tuple>(args))...);
-}
-
-// Apply the function to a tuple of arguments.
-template <typename F, typename Tuple>
-auto Apply(F&& f, Tuple&& args) -> decltype(
-    ApplyImpl(std::forward<F>(f), std::forward<Tuple>(args),
-              MakeIndexSequence<std::tuple_size<
-                  typename std::remove_reference<Tuple>::type>::value>())) {
-  return ApplyImpl(std::forward<F>(f), std::forward<Tuple>(args),
-                   MakeIndexSequence<std::tuple_size<
-                       typename std::remove_reference<Tuple>::type>::value>());
-}
-
-// Template struct Function<F>, where F must be a function type, contains
-// the following typedefs:
-//
-//   Result:               the function's return type.
-//   Arg<N>:               the type of the N-th argument, where N starts with 0.
-//   ArgumentTuple:        the tuple type consisting of all parameters of F.
-//   ArgumentMatcherTuple: the tuple type consisting of Matchers for all
-//                         parameters of F.
-//   MakeResultVoid:       the function type obtained by substituting void
-//                         for the return type of F.
-//   MakeResultIgnoredValue:
-//                         the function type obtained by substituting Something
-//                         for the return type of F.
-template <typename T>
-struct Function;
-
-template <typename R, typename... Args>
-struct Function<R(Args...)> {
-  using Result = R;
-  static constexpr size_t ArgumentCount = sizeof...(Args);
-  template <size_t I>
-  using Arg = ElemFromList<I, Args...>;
-  using ArgumentTuple = std::tuple<Args...>;
-  using ArgumentMatcherTuple = std::tuple<Matcher<Args>...>;
-  using MakeResultVoid = void(Args...);
-  using MakeResultIgnoredValue = IgnoredValue(Args...);
-};
-
-template <typename R, typename... Args>
-constexpr size_t Function<R(Args...)>::ArgumentCount;
-
-#ifdef _MSC_VER
-# pragma warning(pop)
-#endif
-
+// 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))...)) { 
+  return std::forward<F>(f)(std::get<Idx>(std::forward<Tuple>(args))...); 
+} 
+ 
+// Apply the function to a tuple of arguments. 
+template <typename F, typename Tuple> 
+auto Apply(F&& f, Tuple&& args) -> decltype( 
+    ApplyImpl(std::forward<F>(f), std::forward<Tuple>(args), 
+              MakeIndexSequence<std::tuple_size< 
+                  typename std::remove_reference<Tuple>::type>::value>())) { 
+  return ApplyImpl(std::forward<F>(f), std::forward<Tuple>(args), 
+                   MakeIndexSequence<std::tuple_size< 
+                       typename std::remove_reference<Tuple>::type>::value>()); 
+} 
+ 
+// Template struct Function<F>, where F must be a function type, contains 
+// the following typedefs: 
+// 
+//   Result:               the function's return type. 
+//   Arg<N>:               the type of the N-th argument, where N starts with 0. 
+//   ArgumentTuple:        the tuple type consisting of all parameters of F. 
+//   ArgumentMatcherTuple: the tuple type consisting of Matchers for all 
+//                         parameters of F. 
+//   MakeResultVoid:       the function type obtained by substituting void 
+//                         for the return type of F. 
+//   MakeResultIgnoredValue: 
+//                         the function type obtained by substituting Something 
+//                         for the return type of F. 
+template <typename T> 
+struct Function; 
+ 
+template <typename R, typename... Args> 
+struct Function<R(Args...)> { 
+  using Result = R; 
+  static constexpr size_t ArgumentCount = sizeof...(Args); 
+  template <size_t I> 
+  using Arg = ElemFromList<I, Args...>; 
+  using ArgumentTuple = std::tuple<Args...>; 
+  using ArgumentMatcherTuple = std::tuple<Matcher<Args>...>; 
+  using MakeResultVoid = void(Args...); 
+  using MakeResultIgnoredValue = IgnoredValue(Args...); 
+}; 
+ 
+template <typename R, typename... Args> 
+constexpr size_t Function<R(Args...)>::ArgumentCount; 
+ 
+#ifdef _MSC_VER 
+# pragma warning(pop) 
+#endif 
+ 
 }  // namespace internal
 }  // namespace testing
 
-#endif  // GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_INTERNAL_UTILS_H_
+#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 367a44d366..f0ff449600 100644
--- a/contrib/restricted/googletest/googlemock/include/gmock/internal/gmock-port.h
+++ b/contrib/restricted/googletest/googlemock/include/gmock/internal/gmock-port.h
@@ -26,7 +26,7 @@
 // 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
@@ -35,14 +35,14 @@
 // 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_
+// 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 <cstdint>
+#include <cstdint> 
 #include <iostream>
 
 // Most of the utilities needed for porting Google Mock are also
@@ -52,14 +52,14 @@
 // 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"
 
-// For MS Visual C++, check the compiler version. At least VS 2015 is
+// For MS Visual C++, check the compiler version. At least VS 2015 is 
 // 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."
+#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
@@ -69,19 +69,19 @@
 #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) \
+# 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.
-# define GMOCK_DEFINE_bool_(name, default_val, doc) \
+# define GMOCK_DEFINE_bool_(name, default_val, doc) \ 
     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) \
+# 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_)
 
-#endif  // GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_PORT_H_
+#endif  // GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_PORT_H_ 
diff --git a/contrib/restricted/googletest/googlemock/include/gmock/internal/gmock-pp.h b/contrib/restricted/googletest/googlemock/include/gmock/internal/gmock-pp.h
index 94d61c09c8..8b32dc7199 100644
--- a/contrib/restricted/googletest/googlemock/include/gmock/internal/gmock-pp.h
+++ b/contrib/restricted/googletest/googlemock/include/gmock/internal/gmock-pp.h
@@ -1,279 +1,279 @@
-#ifndef GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_PP_H_
-#define GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_PP_H_
-
-// Expands and concatenates the arguments. Constructed macros reevaluate.
-#define GMOCK_PP_CAT(_1, _2) GMOCK_PP_INTERNAL_CAT(_1, _2)
-
-// Expands and stringifies the only argument.
-#define GMOCK_PP_STRINGIZE(...) GMOCK_PP_INTERNAL_STRINGIZE(__VA_ARGS__)
-
-// Returns empty. Given a variadic number of arguments.
-#define GMOCK_PP_EMPTY(...)
-
-// Returns a comma. Given a variadic number of arguments.
-#define GMOCK_PP_COMMA(...) ,
-
-// Returns the only argument.
-#define GMOCK_PP_IDENTITY(_1) _1
-
-// Evaluates to the number of arguments after expansion.
-//
-//   #define PAIR x, y
-//
-//   GMOCK_PP_NARG() => 1
-//   GMOCK_PP_NARG(x) => 1
-//   GMOCK_PP_NARG(x, y) => 2
-//   GMOCK_PP_NARG(PAIR) => 2
-//
-// Requires: the number of arguments after expansion is at most 15.
-#define GMOCK_PP_NARG(...) \
-  GMOCK_PP_INTERNAL_16TH(  \
-      (__VA_ARGS__, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0))
-
-// Returns 1 if the expansion of arguments has an unprotected comma. Otherwise
-// returns 0. Requires no more than 15 unprotected commas.
-#define GMOCK_PP_HAS_COMMA(...) \
-  GMOCK_PP_INTERNAL_16TH(       \
-      (__VA_ARGS__, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0))
-
-// Returns the first argument.
-#define GMOCK_PP_HEAD(...) GMOCK_PP_INTERNAL_HEAD((__VA_ARGS__, unusedArg))
-
-// Returns the tail. A variadic list of all arguments minus the first. Requires
-// at least one argument.
-#define GMOCK_PP_TAIL(...) GMOCK_PP_INTERNAL_TAIL((__VA_ARGS__))
-
-// Calls CAT(_Macro, NARG(__VA_ARGS__))(__VA_ARGS__)
-#define GMOCK_PP_VARIADIC_CALL(_Macro, ...) \
-  GMOCK_PP_IDENTITY(                        \
-      GMOCK_PP_CAT(_Macro, GMOCK_PP_NARG(__VA_ARGS__))(__VA_ARGS__))
-
-// If the arguments after expansion have no tokens, evaluates to `1`. Otherwise
-// evaluates to `0`.
-//
-// Requires: * the number of arguments after expansion is at most 15.
-//           * If the argument is a macro, it must be able to be called with one
-//             argument.
-//
-// Implementation details:
-//
-// There is one case when it generates a compile error: if the argument is macro
-// that cannot be called with one argument.
-//
-//   #define M(a, b)  // it doesn't matter what it expands to
-//
-//   // Expected: expands to `0`.
-//   // Actual: compile error.
-//   GMOCK_PP_IS_EMPTY(M)
-//
-// There are 4 cases tested:
-//
-// * __VA_ARGS__ possible expansion has no unparen'd commas. Expected 0.
-// * __VA_ARGS__ possible expansion is not enclosed in parenthesis. Expected 0.
-// * __VA_ARGS__ possible expansion is not a macro that ()-evaluates to a comma.
-//   Expected 0
-// * __VA_ARGS__ is empty, or has unparen'd commas, or is enclosed in
-//   parenthesis, or is a macro that ()-evaluates to comma. Expected 1.
-//
-// We trigger detection on '0001', i.e. on empty.
-#define GMOCK_PP_IS_EMPTY(...)                                               \
-  GMOCK_PP_INTERNAL_IS_EMPTY(GMOCK_PP_HAS_COMMA(__VA_ARGS__),                \
-                             GMOCK_PP_HAS_COMMA(GMOCK_PP_COMMA __VA_ARGS__), \
-                             GMOCK_PP_HAS_COMMA(__VA_ARGS__()),              \
-                             GMOCK_PP_HAS_COMMA(GMOCK_PP_COMMA __VA_ARGS__()))
-
-// Evaluates to _Then if _Cond is 1 and _Else if _Cond is 0.
-#define GMOCK_PP_IF(_Cond, _Then, _Else) \
-  GMOCK_PP_CAT(GMOCK_PP_INTERNAL_IF_, _Cond)(_Then, _Else)
-
-// Similar to GMOCK_PP_IF but takes _Then and _Else in parentheses.
-//
-// GMOCK_PP_GENERIC_IF(1, (a, b, c), (d, e, f)) => a, b, c
-// GMOCK_PP_GENERIC_IF(0, (a, b, c), (d, e, f)) => d, e, f
-//
-#define GMOCK_PP_GENERIC_IF(_Cond, _Then, _Else) \
-  GMOCK_PP_REMOVE_PARENS(GMOCK_PP_IF(_Cond, _Then, _Else))
-
-// Evaluates to the number of arguments after expansion. Identifies 'empty' as
-// 0.
-//
-//   #define PAIR x, y
-//
-//   GMOCK_PP_NARG0() => 0
-//   GMOCK_PP_NARG0(x) => 1
-//   GMOCK_PP_NARG0(x, y) => 2
-//   GMOCK_PP_NARG0(PAIR) => 2
-//
-// Requires: * the number of arguments after expansion is at most 15.
-//           * If the argument is a macro, it must be able to be called with one
-//             argument.
-#define GMOCK_PP_NARG0(...) \
-  GMOCK_PP_IF(GMOCK_PP_IS_EMPTY(__VA_ARGS__), 0, GMOCK_PP_NARG(__VA_ARGS__))
-
-// Expands to 1 if the first argument starts with something in parentheses,
-// otherwise to 0.
-#define GMOCK_PP_IS_BEGIN_PARENS(...)                              \
-  GMOCK_PP_HEAD(GMOCK_PP_CAT(GMOCK_PP_INTERNAL_IBP_IS_VARIADIC_R_, \
-                             GMOCK_PP_INTERNAL_IBP_IS_VARIADIC_C __VA_ARGS__))
-
-// Expands to 1 is there is only one argument and it is enclosed in parentheses.
-#define GMOCK_PP_IS_ENCLOSED_PARENS(...)             \
-  GMOCK_PP_IF(GMOCK_PP_IS_BEGIN_PARENS(__VA_ARGS__), \
-              GMOCK_PP_IS_EMPTY(GMOCK_PP_EMPTY __VA_ARGS__), 0)
-
-// Remove the parens, requires GMOCK_PP_IS_ENCLOSED_PARENS(args) => 1.
-#define GMOCK_PP_REMOVE_PARENS(...) GMOCK_PP_INTERNAL_REMOVE_PARENS __VA_ARGS__
-
-// Expands to _Macro(0, _Data, e1) _Macro(1, _Data, e2) ... _Macro(K -1, _Data,
-// eK) as many of GMOCK_INTERNAL_NARG0 _Tuple.
-// Requires: * |_Macro| can be called with 3 arguments.
-//           * |_Tuple| expansion has no more than 15 elements.
-#define GMOCK_PP_FOR_EACH(_Macro, _Data, _Tuple)                        \
-  GMOCK_PP_CAT(GMOCK_PP_INTERNAL_FOR_EACH_IMPL_, GMOCK_PP_NARG0 _Tuple) \
-  (0, _Macro, _Data, _Tuple)
-
-// Expands to _Macro(0, _Data, ) _Macro(1, _Data, ) ... _Macro(K - 1, _Data, )
-// Empty if _K = 0.
-// Requires: * |_Macro| can be called with 3 arguments.
-//           * |_K| literal between 0 and 15
-#define GMOCK_PP_REPEAT(_Macro, _Data, _N)           \
-  GMOCK_PP_CAT(GMOCK_PP_INTERNAL_FOR_EACH_IMPL_, _N) \
-  (0, _Macro, _Data, GMOCK_PP_INTENRAL_EMPTY_TUPLE)
-
-// Increments the argument, requires the argument to be between 0 and 15.
-#define GMOCK_PP_INC(_i) GMOCK_PP_CAT(GMOCK_PP_INTERNAL_INC_, _i)
-
-// Returns comma if _i != 0. Requires _i to be between 0 and 15.
-#define GMOCK_PP_COMMA_IF(_i) GMOCK_PP_CAT(GMOCK_PP_INTERNAL_COMMA_IF_, _i)
-
-// Internal details follow. Do not use any of these symbols outside of this
-// file or we will break your code.
-#define GMOCK_PP_INTENRAL_EMPTY_TUPLE (, , , , , , , , , , , , , , , )
-#define GMOCK_PP_INTERNAL_CAT(_1, _2) _1##_2
-#define GMOCK_PP_INTERNAL_STRINGIZE(...) #__VA_ARGS__
-#define GMOCK_PP_INTERNAL_CAT_5(_1, _2, _3, _4, _5) _1##_2##_3##_4##_5
-#define GMOCK_PP_INTERNAL_IS_EMPTY(_1, _2, _3, _4)                             \
-  GMOCK_PP_HAS_COMMA(GMOCK_PP_INTERNAL_CAT_5(GMOCK_PP_INTERNAL_IS_EMPTY_CASE_, \
-                                             _1, _2, _3, _4))
-#define GMOCK_PP_INTERNAL_IS_EMPTY_CASE_0001 ,
-#define GMOCK_PP_INTERNAL_IF_1(_Then, _Else) _Then
-#define GMOCK_PP_INTERNAL_IF_0(_Then, _Else) _Else
-
-// Because of MSVC treating a token with a comma in it as a single token when
-// passed to another macro, we need to force it to evaluate it as multiple
-// tokens. We do that by using a "IDENTITY(MACRO PARENTHESIZED_ARGS)" macro. We
-// define one per possible macro that relies on this behavior. Note "_Args" must
-// be parenthesized.
-#define GMOCK_PP_INTERNAL_INTERNAL_16TH(_1, _2, _3, _4, _5, _6, _7, _8, _9, \
-                                        _10, _11, _12, _13, _14, _15, _16,  \
-                                        ...)                                \
-  _16
-#define GMOCK_PP_INTERNAL_16TH(_Args) \
-  GMOCK_PP_IDENTITY(GMOCK_PP_INTERNAL_INTERNAL_16TH _Args)
-#define GMOCK_PP_INTERNAL_INTERNAL_HEAD(_1, ...) _1
-#define GMOCK_PP_INTERNAL_HEAD(_Args) \
-  GMOCK_PP_IDENTITY(GMOCK_PP_INTERNAL_INTERNAL_HEAD _Args)
-#define GMOCK_PP_INTERNAL_INTERNAL_TAIL(_1, ...) __VA_ARGS__
-#define GMOCK_PP_INTERNAL_TAIL(_Args) \
-  GMOCK_PP_IDENTITY(GMOCK_PP_INTERNAL_INTERNAL_TAIL _Args)
-
-#define GMOCK_PP_INTERNAL_IBP_IS_VARIADIC_C(...) 1 _
-#define GMOCK_PP_INTERNAL_IBP_IS_VARIADIC_R_1 1,
-#define GMOCK_PP_INTERNAL_IBP_IS_VARIADIC_R_GMOCK_PP_INTERNAL_IBP_IS_VARIADIC_C \
-  0,
-#define GMOCK_PP_INTERNAL_REMOVE_PARENS(...) __VA_ARGS__
-#define GMOCK_PP_INTERNAL_INC_0 1
-#define GMOCK_PP_INTERNAL_INC_1 2
-#define GMOCK_PP_INTERNAL_INC_2 3
-#define GMOCK_PP_INTERNAL_INC_3 4
-#define GMOCK_PP_INTERNAL_INC_4 5
-#define GMOCK_PP_INTERNAL_INC_5 6
-#define GMOCK_PP_INTERNAL_INC_6 7
-#define GMOCK_PP_INTERNAL_INC_7 8
-#define GMOCK_PP_INTERNAL_INC_8 9
-#define GMOCK_PP_INTERNAL_INC_9 10
-#define GMOCK_PP_INTERNAL_INC_10 11
-#define GMOCK_PP_INTERNAL_INC_11 12
-#define GMOCK_PP_INTERNAL_INC_12 13
-#define GMOCK_PP_INTERNAL_INC_13 14
-#define GMOCK_PP_INTERNAL_INC_14 15
-#define GMOCK_PP_INTERNAL_INC_15 16
-#define GMOCK_PP_INTERNAL_COMMA_IF_0
-#define GMOCK_PP_INTERNAL_COMMA_IF_1 ,
-#define GMOCK_PP_INTERNAL_COMMA_IF_2 ,
-#define GMOCK_PP_INTERNAL_COMMA_IF_3 ,
-#define GMOCK_PP_INTERNAL_COMMA_IF_4 ,
-#define GMOCK_PP_INTERNAL_COMMA_IF_5 ,
-#define GMOCK_PP_INTERNAL_COMMA_IF_6 ,
-#define GMOCK_PP_INTERNAL_COMMA_IF_7 ,
-#define GMOCK_PP_INTERNAL_COMMA_IF_8 ,
-#define GMOCK_PP_INTERNAL_COMMA_IF_9 ,
-#define GMOCK_PP_INTERNAL_COMMA_IF_10 ,
-#define GMOCK_PP_INTERNAL_COMMA_IF_11 ,
-#define GMOCK_PP_INTERNAL_COMMA_IF_12 ,
-#define GMOCK_PP_INTERNAL_COMMA_IF_13 ,
-#define GMOCK_PP_INTERNAL_COMMA_IF_14 ,
-#define GMOCK_PP_INTERNAL_COMMA_IF_15 ,
-#define GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, _element) \
-  _Macro(_i, _Data, _element)
-#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_0(_i, _Macro, _Data, _Tuple)
-#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_1(_i, _Macro, _Data, _Tuple) \
-  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple)
-#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_2(_i, _Macro, _Data, _Tuple)    \
-  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \
-  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_1(GMOCK_PP_INC(_i), _Macro, _Data,    \
-                                    (GMOCK_PP_TAIL _Tuple))
-#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_3(_i, _Macro, _Data, _Tuple)    \
-  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \
-  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_2(GMOCK_PP_INC(_i), _Macro, _Data,    \
-                                    (GMOCK_PP_TAIL _Tuple))
-#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_4(_i, _Macro, _Data, _Tuple)    \
-  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \
-  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_3(GMOCK_PP_INC(_i), _Macro, _Data,    \
-                                    (GMOCK_PP_TAIL _Tuple))
-#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_5(_i, _Macro, _Data, _Tuple)    \
-  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \
-  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_4(GMOCK_PP_INC(_i), _Macro, _Data,    \
-                                    (GMOCK_PP_TAIL _Tuple))
-#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_6(_i, _Macro, _Data, _Tuple)    \
-  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \
-  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_5(GMOCK_PP_INC(_i), _Macro, _Data,    \
-                                    (GMOCK_PP_TAIL _Tuple))
-#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_7(_i, _Macro, _Data, _Tuple)    \
-  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \
-  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_6(GMOCK_PP_INC(_i), _Macro, _Data,    \
-                                    (GMOCK_PP_TAIL _Tuple))
-#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_8(_i, _Macro, _Data, _Tuple)    \
-  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \
-  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_7(GMOCK_PP_INC(_i), _Macro, _Data,    \
-                                    (GMOCK_PP_TAIL _Tuple))
-#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_9(_i, _Macro, _Data, _Tuple)    \
-  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \
-  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_8(GMOCK_PP_INC(_i), _Macro, _Data,    \
-                                    (GMOCK_PP_TAIL _Tuple))
-#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_10(_i, _Macro, _Data, _Tuple)   \
-  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \
-  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_9(GMOCK_PP_INC(_i), _Macro, _Data,    \
-                                    (GMOCK_PP_TAIL _Tuple))
-#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_11(_i, _Macro, _Data, _Tuple)   \
-  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \
-  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_10(GMOCK_PP_INC(_i), _Macro, _Data,   \
-                                     (GMOCK_PP_TAIL _Tuple))
-#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_12(_i, _Macro, _Data, _Tuple)   \
-  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \
-  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_11(GMOCK_PP_INC(_i), _Macro, _Data,   \
-                                     (GMOCK_PP_TAIL _Tuple))
-#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_13(_i, _Macro, _Data, _Tuple)   \
-  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \
-  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_12(GMOCK_PP_INC(_i), _Macro, _Data,   \
-                                     (GMOCK_PP_TAIL _Tuple))
-#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_14(_i, _Macro, _Data, _Tuple)   \
-  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \
-  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_13(GMOCK_PP_INC(_i), _Macro, _Data,   \
-                                     (GMOCK_PP_TAIL _Tuple))
-#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_15(_i, _Macro, _Data, _Tuple)   \
-  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \
-  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_14(GMOCK_PP_INC(_i), _Macro, _Data,   \
-                                     (GMOCK_PP_TAIL _Tuple))
-
-#endif  // GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_PP_H_
+#ifndef GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_PP_H_ 
+#define GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_PP_H_ 
+ 
+// Expands and concatenates the arguments. Constructed macros reevaluate. 
+#define GMOCK_PP_CAT(_1, _2) GMOCK_PP_INTERNAL_CAT(_1, _2) 
+ 
+// Expands and stringifies the only argument. 
+#define GMOCK_PP_STRINGIZE(...) GMOCK_PP_INTERNAL_STRINGIZE(__VA_ARGS__) 
+ 
+// Returns empty. Given a variadic number of arguments. 
+#define GMOCK_PP_EMPTY(...) 
+ 
+// Returns a comma. Given a variadic number of arguments. 
+#define GMOCK_PP_COMMA(...) , 
+ 
+// Returns the only argument. 
+#define GMOCK_PP_IDENTITY(_1) _1 
+ 
+// Evaluates to the number of arguments after expansion. 
+// 
+//   #define PAIR x, y 
+// 
+//   GMOCK_PP_NARG() => 1 
+//   GMOCK_PP_NARG(x) => 1 
+//   GMOCK_PP_NARG(x, y) => 2 
+//   GMOCK_PP_NARG(PAIR) => 2 
+// 
+// Requires: the number of arguments after expansion is at most 15. 
+#define GMOCK_PP_NARG(...) \ 
+  GMOCK_PP_INTERNAL_16TH(  \ 
+      (__VA_ARGS__, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0)) 
+ 
+// Returns 1 if the expansion of arguments has an unprotected comma. Otherwise 
+// returns 0. Requires no more than 15 unprotected commas. 
+#define GMOCK_PP_HAS_COMMA(...) \ 
+  GMOCK_PP_INTERNAL_16TH(       \ 
+      (__VA_ARGS__, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0)) 
+ 
+// Returns the first argument. 
+#define GMOCK_PP_HEAD(...) GMOCK_PP_INTERNAL_HEAD((__VA_ARGS__, unusedArg)) 
+ 
+// Returns the tail. A variadic list of all arguments minus the first. Requires 
+// at least one argument. 
+#define GMOCK_PP_TAIL(...) GMOCK_PP_INTERNAL_TAIL((__VA_ARGS__)) 
+ 
+// Calls CAT(_Macro, NARG(__VA_ARGS__))(__VA_ARGS__) 
+#define GMOCK_PP_VARIADIC_CALL(_Macro, ...) \ 
+  GMOCK_PP_IDENTITY(                        \ 
+      GMOCK_PP_CAT(_Macro, GMOCK_PP_NARG(__VA_ARGS__))(__VA_ARGS__)) 
+ 
+// If the arguments after expansion have no tokens, evaluates to `1`. Otherwise 
+// evaluates to `0`. 
+// 
+// Requires: * the number of arguments after expansion is at most 15. 
+//           * If the argument is a macro, it must be able to be called with one 
+//             argument. 
+// 
+// Implementation details: 
+// 
+// There is one case when it generates a compile error: if the argument is macro 
+// that cannot be called with one argument. 
+// 
+//   #define M(a, b)  // it doesn't matter what it expands to 
+// 
+//   // Expected: expands to `0`. 
+//   // Actual: compile error. 
+//   GMOCK_PP_IS_EMPTY(M) 
+// 
+// There are 4 cases tested: 
+// 
+// * __VA_ARGS__ possible expansion has no unparen'd commas. Expected 0. 
+// * __VA_ARGS__ possible expansion is not enclosed in parenthesis. Expected 0. 
+// * __VA_ARGS__ possible expansion is not a macro that ()-evaluates to a comma. 
+//   Expected 0 
+// * __VA_ARGS__ is empty, or has unparen'd commas, or is enclosed in 
+//   parenthesis, or is a macro that ()-evaluates to comma. Expected 1. 
+// 
+// We trigger detection on '0001', i.e. on empty. 
+#define GMOCK_PP_IS_EMPTY(...)                                               \ 
+  GMOCK_PP_INTERNAL_IS_EMPTY(GMOCK_PP_HAS_COMMA(__VA_ARGS__),                \ 
+                             GMOCK_PP_HAS_COMMA(GMOCK_PP_COMMA __VA_ARGS__), \ 
+                             GMOCK_PP_HAS_COMMA(__VA_ARGS__()),              \ 
+                             GMOCK_PP_HAS_COMMA(GMOCK_PP_COMMA __VA_ARGS__())) 
+ 
+// Evaluates to _Then if _Cond is 1 and _Else if _Cond is 0. 
+#define GMOCK_PP_IF(_Cond, _Then, _Else) \ 
+  GMOCK_PP_CAT(GMOCK_PP_INTERNAL_IF_, _Cond)(_Then, _Else) 
+ 
+// Similar to GMOCK_PP_IF but takes _Then and _Else in parentheses. 
+// 
+// GMOCK_PP_GENERIC_IF(1, (a, b, c), (d, e, f)) => a, b, c 
+// GMOCK_PP_GENERIC_IF(0, (a, b, c), (d, e, f)) => d, e, f 
+// 
+#define GMOCK_PP_GENERIC_IF(_Cond, _Then, _Else) \ 
+  GMOCK_PP_REMOVE_PARENS(GMOCK_PP_IF(_Cond, _Then, _Else)) 
+ 
+// Evaluates to the number of arguments after expansion. Identifies 'empty' as 
+// 0. 
+// 
+//   #define PAIR x, y 
+// 
+//   GMOCK_PP_NARG0() => 0 
+//   GMOCK_PP_NARG0(x) => 1 
+//   GMOCK_PP_NARG0(x, y) => 2 
+//   GMOCK_PP_NARG0(PAIR) => 2 
+// 
+// Requires: * the number of arguments after expansion is at most 15. 
+//           * If the argument is a macro, it must be able to be called with one 
+//             argument. 
+#define GMOCK_PP_NARG0(...) \ 
+  GMOCK_PP_IF(GMOCK_PP_IS_EMPTY(__VA_ARGS__), 0, GMOCK_PP_NARG(__VA_ARGS__)) 
+ 
+// Expands to 1 if the first argument starts with something in parentheses, 
+// otherwise to 0. 
+#define GMOCK_PP_IS_BEGIN_PARENS(...)                              \ 
+  GMOCK_PP_HEAD(GMOCK_PP_CAT(GMOCK_PP_INTERNAL_IBP_IS_VARIADIC_R_, \ 
+                             GMOCK_PP_INTERNAL_IBP_IS_VARIADIC_C __VA_ARGS__)) 
+ 
+// Expands to 1 is there is only one argument and it is enclosed in parentheses. 
+#define GMOCK_PP_IS_ENCLOSED_PARENS(...)             \ 
+  GMOCK_PP_IF(GMOCK_PP_IS_BEGIN_PARENS(__VA_ARGS__), \ 
+              GMOCK_PP_IS_EMPTY(GMOCK_PP_EMPTY __VA_ARGS__), 0) 
+ 
+// Remove the parens, requires GMOCK_PP_IS_ENCLOSED_PARENS(args) => 1. 
+#define GMOCK_PP_REMOVE_PARENS(...) GMOCK_PP_INTERNAL_REMOVE_PARENS __VA_ARGS__ 
+ 
+// Expands to _Macro(0, _Data, e1) _Macro(1, _Data, e2) ... _Macro(K -1, _Data, 
+// eK) as many of GMOCK_INTERNAL_NARG0 _Tuple. 
+// Requires: * |_Macro| can be called with 3 arguments. 
+//           * |_Tuple| expansion has no more than 15 elements. 
+#define GMOCK_PP_FOR_EACH(_Macro, _Data, _Tuple)                        \ 
+  GMOCK_PP_CAT(GMOCK_PP_INTERNAL_FOR_EACH_IMPL_, GMOCK_PP_NARG0 _Tuple) \ 
+  (0, _Macro, _Data, _Tuple) 
+ 
+// Expands to _Macro(0, _Data, ) _Macro(1, _Data, ) ... _Macro(K - 1, _Data, ) 
+// Empty if _K = 0. 
+// Requires: * |_Macro| can be called with 3 arguments. 
+//           * |_K| literal between 0 and 15 
+#define GMOCK_PP_REPEAT(_Macro, _Data, _N)           \ 
+  GMOCK_PP_CAT(GMOCK_PP_INTERNAL_FOR_EACH_IMPL_, _N) \ 
+  (0, _Macro, _Data, GMOCK_PP_INTENRAL_EMPTY_TUPLE) 
+ 
+// Increments the argument, requires the argument to be between 0 and 15. 
+#define GMOCK_PP_INC(_i) GMOCK_PP_CAT(GMOCK_PP_INTERNAL_INC_, _i) 
+ 
+// Returns comma if _i != 0. Requires _i to be between 0 and 15. 
+#define GMOCK_PP_COMMA_IF(_i) GMOCK_PP_CAT(GMOCK_PP_INTERNAL_COMMA_IF_, _i) 
+ 
+// Internal details follow. Do not use any of these symbols outside of this 
+// file or we will break your code. 
+#define GMOCK_PP_INTENRAL_EMPTY_TUPLE (, , , , , , , , , , , , , , , ) 
+#define GMOCK_PP_INTERNAL_CAT(_1, _2) _1##_2 
+#define GMOCK_PP_INTERNAL_STRINGIZE(...) #__VA_ARGS__ 
+#define GMOCK_PP_INTERNAL_CAT_5(_1, _2, _3, _4, _5) _1##_2##_3##_4##_5 
+#define GMOCK_PP_INTERNAL_IS_EMPTY(_1, _2, _3, _4)                             \ 
+  GMOCK_PP_HAS_COMMA(GMOCK_PP_INTERNAL_CAT_5(GMOCK_PP_INTERNAL_IS_EMPTY_CASE_, \ 
+                                             _1, _2, _3, _4)) 
+#define GMOCK_PP_INTERNAL_IS_EMPTY_CASE_0001 , 
+#define GMOCK_PP_INTERNAL_IF_1(_Then, _Else) _Then 
+#define GMOCK_PP_INTERNAL_IF_0(_Then, _Else) _Else 
+ 
+// Because of MSVC treating a token with a comma in it as a single token when 
+// passed to another macro, we need to force it to evaluate it as multiple 
+// tokens. We do that by using a "IDENTITY(MACRO PARENTHESIZED_ARGS)" macro. We 
+// define one per possible macro that relies on this behavior. Note "_Args" must 
+// be parenthesized. 
+#define GMOCK_PP_INTERNAL_INTERNAL_16TH(_1, _2, _3, _4, _5, _6, _7, _8, _9, \ 
+                                        _10, _11, _12, _13, _14, _15, _16,  \ 
+                                        ...)                                \ 
+  _16 
+#define GMOCK_PP_INTERNAL_16TH(_Args) \ 
+  GMOCK_PP_IDENTITY(GMOCK_PP_INTERNAL_INTERNAL_16TH _Args) 
+#define GMOCK_PP_INTERNAL_INTERNAL_HEAD(_1, ...) _1 
+#define GMOCK_PP_INTERNAL_HEAD(_Args) \ 
+  GMOCK_PP_IDENTITY(GMOCK_PP_INTERNAL_INTERNAL_HEAD _Args) 
+#define GMOCK_PP_INTERNAL_INTERNAL_TAIL(_1, ...) __VA_ARGS__ 
+#define GMOCK_PP_INTERNAL_TAIL(_Args) \ 
+  GMOCK_PP_IDENTITY(GMOCK_PP_INTERNAL_INTERNAL_TAIL _Args) 
+ 
+#define GMOCK_PP_INTERNAL_IBP_IS_VARIADIC_C(...) 1 _ 
+#define GMOCK_PP_INTERNAL_IBP_IS_VARIADIC_R_1 1, 
+#define GMOCK_PP_INTERNAL_IBP_IS_VARIADIC_R_GMOCK_PP_INTERNAL_IBP_IS_VARIADIC_C \ 
+  0, 
+#define GMOCK_PP_INTERNAL_REMOVE_PARENS(...) __VA_ARGS__ 
+#define GMOCK_PP_INTERNAL_INC_0 1 
+#define GMOCK_PP_INTERNAL_INC_1 2 
+#define GMOCK_PP_INTERNAL_INC_2 3 
+#define GMOCK_PP_INTERNAL_INC_3 4 
+#define GMOCK_PP_INTERNAL_INC_4 5 
+#define GMOCK_PP_INTERNAL_INC_5 6 
+#define GMOCK_PP_INTERNAL_INC_6 7 
+#define GMOCK_PP_INTERNAL_INC_7 8 
+#define GMOCK_PP_INTERNAL_INC_8 9 
+#define GMOCK_PP_INTERNAL_INC_9 10 
+#define GMOCK_PP_INTERNAL_INC_10 11 
+#define GMOCK_PP_INTERNAL_INC_11 12 
+#define GMOCK_PP_INTERNAL_INC_12 13 
+#define GMOCK_PP_INTERNAL_INC_13 14 
+#define GMOCK_PP_INTERNAL_INC_14 15 
+#define GMOCK_PP_INTERNAL_INC_15 16 
+#define GMOCK_PP_INTERNAL_COMMA_IF_0 
+#define GMOCK_PP_INTERNAL_COMMA_IF_1 , 
+#define GMOCK_PP_INTERNAL_COMMA_IF_2 , 
+#define GMOCK_PP_INTERNAL_COMMA_IF_3 , 
+#define GMOCK_PP_INTERNAL_COMMA_IF_4 , 
+#define GMOCK_PP_INTERNAL_COMMA_IF_5 , 
+#define GMOCK_PP_INTERNAL_COMMA_IF_6 , 
+#define GMOCK_PP_INTERNAL_COMMA_IF_7 , 
+#define GMOCK_PP_INTERNAL_COMMA_IF_8 , 
+#define GMOCK_PP_INTERNAL_COMMA_IF_9 , 
+#define GMOCK_PP_INTERNAL_COMMA_IF_10 , 
+#define GMOCK_PP_INTERNAL_COMMA_IF_11 , 
+#define GMOCK_PP_INTERNAL_COMMA_IF_12 , 
+#define GMOCK_PP_INTERNAL_COMMA_IF_13 , 
+#define GMOCK_PP_INTERNAL_COMMA_IF_14 , 
+#define GMOCK_PP_INTERNAL_COMMA_IF_15 , 
+#define GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, _element) \ 
+  _Macro(_i, _Data, _element) 
+#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_0(_i, _Macro, _Data, _Tuple) 
+#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_1(_i, _Macro, _Data, _Tuple) \ 
+  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) 
+#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_2(_i, _Macro, _Data, _Tuple)    \ 
+  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \ 
+  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_1(GMOCK_PP_INC(_i), _Macro, _Data,    \ 
+                                    (GMOCK_PP_TAIL _Tuple)) 
+#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_3(_i, _Macro, _Data, _Tuple)    \ 
+  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \ 
+  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_2(GMOCK_PP_INC(_i), _Macro, _Data,    \ 
+                                    (GMOCK_PP_TAIL _Tuple)) 
+#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_4(_i, _Macro, _Data, _Tuple)    \ 
+  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \ 
+  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_3(GMOCK_PP_INC(_i), _Macro, _Data,    \ 
+                                    (GMOCK_PP_TAIL _Tuple)) 
+#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_5(_i, _Macro, _Data, _Tuple)    \ 
+  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \ 
+  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_4(GMOCK_PP_INC(_i), _Macro, _Data,    \ 
+                                    (GMOCK_PP_TAIL _Tuple)) 
+#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_6(_i, _Macro, _Data, _Tuple)    \ 
+  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \ 
+  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_5(GMOCK_PP_INC(_i), _Macro, _Data,    \ 
+                                    (GMOCK_PP_TAIL _Tuple)) 
+#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_7(_i, _Macro, _Data, _Tuple)    \ 
+  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \ 
+  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_6(GMOCK_PP_INC(_i), _Macro, _Data,    \ 
+                                    (GMOCK_PP_TAIL _Tuple)) 
+#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_8(_i, _Macro, _Data, _Tuple)    \ 
+  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \ 
+  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_7(GMOCK_PP_INC(_i), _Macro, _Data,    \ 
+                                    (GMOCK_PP_TAIL _Tuple)) 
+#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_9(_i, _Macro, _Data, _Tuple)    \ 
+  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \ 
+  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_8(GMOCK_PP_INC(_i), _Macro, _Data,    \ 
+                                    (GMOCK_PP_TAIL _Tuple)) 
+#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_10(_i, _Macro, _Data, _Tuple)   \ 
+  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \ 
+  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_9(GMOCK_PP_INC(_i), _Macro, _Data,    \ 
+                                    (GMOCK_PP_TAIL _Tuple)) 
+#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_11(_i, _Macro, _Data, _Tuple)   \ 
+  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \ 
+  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_10(GMOCK_PP_INC(_i), _Macro, _Data,   \ 
+                                     (GMOCK_PP_TAIL _Tuple)) 
+#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_12(_i, _Macro, _Data, _Tuple)   \ 
+  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \ 
+  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_11(GMOCK_PP_INC(_i), _Macro, _Data,   \ 
+                                     (GMOCK_PP_TAIL _Tuple)) 
+#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_13(_i, _Macro, _Data, _Tuple)   \ 
+  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \ 
+  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_12(GMOCK_PP_INC(_i), _Macro, _Data,   \ 
+                                     (GMOCK_PP_TAIL _Tuple)) 
+#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_14(_i, _Macro, _Data, _Tuple)   \ 
+  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \ 
+  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_13(GMOCK_PP_INC(_i), _Macro, _Data,   \ 
+                                     (GMOCK_PP_TAIL _Tuple)) 
+#define GMOCK_PP_INTERNAL_FOR_EACH_IMPL_15(_i, _Macro, _Data, _Tuple)   \ 
+  GMOCK_PP_INTERNAL_CALL_MACRO(_Macro, _i, _Data, GMOCK_PP_HEAD _Tuple) \ 
+  GMOCK_PP_INTERNAL_FOR_EACH_IMPL_14(GMOCK_PP_INC(_i), _Macro, _Data,   \ 
+                                     (GMOCK_PP_TAIL _Tuple)) 
+ 
+#endif  // GOOGLEMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_PP_H_