summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkosak@google.com <kosak@google.com@8415998a-534a-0410-bf83-d39667b30386>2015-07-13 21:19:43 +0000
committerkosak@google.com <kosak@google.com@8415998a-534a-0410-bf83-d39667b30386>2015-07-13 21:19:43 +0000
commit2a9e2583086a3607784a0a555db3bd5c7acc039b (patch)
tree40f1ea74e3780f0150439662d44e0e7e1f5270a3
parent7fd56c69b120a4c0b273fea74748d0da9a19ceef (diff)
downloadgooglemock-2a9e2583086a3607784a0a555db3bd5c7acc039b.tar.gz
Mark the default constructor of Matcher<> explicit.
This prevents implicitly constructing a matcher from {}. git-svn-id: http://googlemock.googlecode.com/svn/trunk@520 8415998a-534a-0410-bf83-d39667b30386
-rw-r--r--include/gmock/gmock-matchers.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/gmock/gmock-matchers.h b/include/gmock/gmock-matchers.h
index 58fe3b6..67cbe0f 100644
--- a/include/gmock/gmock-matchers.h
+++ b/include/gmock/gmock-matchers.h
@@ -321,7 +321,7 @@ class Matcher : public internal::MatcherBase<T> {
// Constructs a null matcher. Needed for storing Matcher objects in STL
// containers. A default-constructed matcher is not yet initialized. You
// cannot use it until a valid value has been assigned to it.
- Matcher() {}
+ explicit Matcher() {} // NOLINT
// Constructs a matcher from its implementation.
explicit Matcher(const MatcherInterface<T>* impl)