diff options
author | jgm <jgm@google.com> | 2012-04-10 16:02:11 +0000 |
---|---|---|
committer | jgm <jgm@google.com> | 2012-04-10 16:02:11 +0000 |
commit | 79a367eb217fcd47e2beaf8c0f87fe6d5926f739 (patch) | |
tree | 148e73f4c3b6354f900cae94be5e9495e04d7efa /include/gmock/internal/gmock-generated-internal-utils.h | |
parent | 9bcb5f9146db42bc38b6bb744fb0cf518a0205be (diff) | |
download | googletest-79a367eb217fcd47e2beaf8c0f87fe6d5926f739.tar.gz googletest-79a367eb217fcd47e2beaf8c0f87fe6d5926f739.tar.bz2 googletest-79a367eb217fcd47e2beaf8c0f87fe6d5926f739.zip |
Reduced template instantiation depth for the AllOf and AnyOf matchers. Also some formatting changes.
Diffstat (limited to 'include/gmock/internal/gmock-generated-internal-utils.h')
-rw-r--r-- | include/gmock/internal/gmock-generated-internal-utils.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/gmock/internal/gmock-generated-internal-utils.h b/include/gmock/internal/gmock-generated-internal-utils.h index 1b52dceb..02258451 100644 --- a/include/gmock/internal/gmock-generated-internal-utils.h +++ b/include/gmock/internal/gmock-generated-internal-utils.h @@ -1,4 +1,6 @@ -// This file was GENERATED by a script. DO NOT EDIT BY HAND!!! +// This file was GENERATED by command: +// pump.py gmock-generated-internal-utils.h.pump +// DO NOT EDIT BY HAND!!! // Copyright 2007, Google Inc. // All rights reserved. @@ -58,7 +60,7 @@ class IgnoredValue { // deliberately omit the 'explicit' keyword in order to allow the // conversion to be implicit. template <typename T> - IgnoredValue(const T&) {} + IgnoredValue(const T& /* ignored */) {} // NOLINT(runtime/explicit) }; // MatcherTuple<T>::type is a tuple type where each field is a Matcher |