eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix Clang's -Wdeprecated-copy warnings in C++20.

Browse Source 
This is a more aggressively "modern" approach than my first few attempts.
Apparently we can't just follow the Rule of Zero for the `Ne` matcher in
particular, because if we do, one of the unit tests hits
"recursive template instantiation exceeded maximum depth of 256"
on Clang.

Fixes #1305.
This commit is contained in:
Arthur O'Dwyer 2020-03-23 13:55:59 -04:00
parent 749148f1ac
commit 7f1baa3768
11 changed files with 92 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
googlemock/include/gmock/gmock-actions.h
View File

@ -571,12 +571,12 @@ class PolymorphicAction {
private: private:
Impl impl_; Impl impl_;
GTEST_DISALLOW_ASSIGN_(MonomorphicImpl); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(MonomorphicImpl);
}; };
Impl impl_; Impl impl_;
GTEST_DISALLOW_ASSIGN_(PolymorphicAction); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(PolymorphicAction);
}; };
// Creates an Action from its implementation and returns it. The // Creates an Action from its implementation and returns it. The
@ -718,12 +718,12 @@ class ReturnAction {
bool performed_; bool performed_;
const std::shared_ptr<R> wrapper_; const std::shared_ptr<R> wrapper_;
GTEST_DISALLOW_ASSIGN_(Impl); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(Impl);
}; };
const std::shared_ptr<R> value_; const std::shared_ptr<R> value_;
GTEST_DISALLOW_ASSIGN_(ReturnAction); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(ReturnAction);
}; };
// Implements the ReturnNull() action. // Implements the ReturnNull() action.
@ -785,12 +785,12 @@ class ReturnRefAction {
private: private:
T& ref_; T& ref_;
GTEST_DISALLOW_ASSIGN_(Impl); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(Impl);
}; };
T& ref_; T& ref_;
GTEST_DISALLOW_ASSIGN_(ReturnRefAction); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(ReturnRefAction);
}; };
// Implements the polymorphic ReturnRefOfCopy(x) action, which can be // Implements the polymorphic ReturnRefOfCopy(x) action, which can be
@ -832,12 +832,12 @@ class ReturnRefOfCopyAction {
private: private:
T value_; T value_;
GTEST_DISALLOW_ASSIGN_(Impl); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(Impl);
}; };
const T value_; const T value_;
GTEST_DISALLOW_ASSIGN_(ReturnRefOfCopyAction); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(ReturnRefOfCopyAction);
}; };
// Implements the polymorphic ReturnRoundRobin(v) action, which can be // Implements the polymorphic ReturnRoundRobin(v) action, which can be
@ -895,7 +895,7 @@ class AssignAction {
T1* const ptr_; T1* const ptr_;
const T2 value_; const T2 value_;
GTEST_DISALLOW_ASSIGN_(AssignAction); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(AssignAction);
}; };
#if !GTEST_OS_WINDOWS_MOBILE #if !GTEST_OS_WINDOWS_MOBILE
@ -918,7 +918,7 @@ class SetErrnoAndReturnAction {
const int errno_; const int errno_;
const T result_; const T result_;
GTEST_DISALLOW_ASSIGN_(SetErrnoAndReturnAction); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(SetErrnoAndReturnAction);
}; };
#endif // !GTEST_OS_WINDOWS_MOBILE #endif // !GTEST_OS_WINDOWS_MOBILE
@ -1024,12 +1024,12 @@ class IgnoreResultAction {
const Action<OriginalFunction> action_; const Action<OriginalFunction> action_;
GTEST_DISALLOW_ASSIGN_(Impl); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(Impl);
}; };
const A action_; const A action_;
GTEST_DISALLOW_ASSIGN_(IgnoreResultAction); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(IgnoreResultAction);
}; };
template <typename InnerAction, size_t... I> template <typename InnerAction, size_t... I>
@ -1468,11 +1468,11 @@ auto InvokeArgumentAdl(AdlTag, F f, Args... args) -> decltype(f(args...)) {
GMOCK_ACTION_FIELD_PARAMS_(params) \ GMOCK_ACTION_FIELD_PARAMS_(params) \
\ \
private: \ private: \
GTEST_DISALLOW_ASSIGN_(gmock_Impl); \ GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(gmock_Impl); \
}; \ }; \
\ \
private: \ private: \
GTEST_DISALLOW_ASSIGN_(full_name); \ GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(full_name); \
}; \ }; \
template <GMOCK_ACTION_TYPENAME_PARAMS_(params)> \ template <GMOCK_ACTION_TYPENAME_PARAMS_(params)> \
inline full_name<GMOCK_ACTION_TYPE_PARAMS_(params)> name( \ inline full_name<GMOCK_ACTION_TYPE_PARAMS_(params)> name( \
@ -1511,13 +1511,7 @@ auto InvokeArgumentAdl(AdlTag, F f, Args... args) -> decltype(f(args...)) {
} \ } \
template <GMOCK_ACTION_TEMPLATE_ARGS_NAMES_> \ template <GMOCK_ACTION_TEMPLATE_ARGS_NAMES_> \
return_type gmock_PerformImpl(GMOCK_ACTION_ARG_TYPES_AND_NAMES_) const; \ return_type gmock_PerformImpl(GMOCK_ACTION_ARG_TYPES_AND_NAMES_) const; \
\
private: \
GTEST_DISALLOW_ASSIGN_(gmock_Impl); \
}; \ }; \
\
private: \
GTEST_DISALLOW_ASSIGN_(name##Action); \
}; \ }; \
inline name##Action name() { return name##Action(); } \ inline name##Action name() { return name##Action(); } \
template <typename F> \ template <typename F> \

4
googlemock/include/gmock/gmock-generated-actions.h
View File

@ -435,16 +435,12 @@
template <GMOCK_ACTION_TEMPLATE_ARGS_NAMES_>\ template <GMOCK_ACTION_TEMPLATE_ARGS_NAMES_>\
return_type gmock_PerformImpl(GMOCK_ACTION_ARG_TYPES_AND_NAMES_) const;\ return_type gmock_PerformImpl(GMOCK_ACTION_ARG_TYPES_AND_NAMES_) const;\
GMOCK_INTERNAL_DEFN_##value_params\ GMOCK_INTERNAL_DEFN_##value_params\
private:\
GTEST_DISALLOW_ASSIGN_(gmock_Impl);\
};\ };\
template <typename F> operator ::testing::Action<F>() const {\ template <typename F> operator ::testing::Action<F>() const {\
return ::testing::Action<F>(\ return ::testing::Action<F>(\
new gmock_Impl<F>(GMOCK_INTERNAL_LIST_##value_params));\ new gmock_Impl<F>(GMOCK_INTERNAL_LIST_##value_params));\
}\ }\
GMOCK_INTERNAL_DEFN_##value_params\ GMOCK_INTERNAL_DEFN_##value_params\
private:\
GTEST_DISALLOW_ASSIGN_(GMOCK_ACTION_CLASS_(name, value_params));\
};\ };\
template <GMOCK_INTERNAL_DECL_##template_params\ template <GMOCK_INTERNAL_DECL_##template_params\
GMOCK_INTERNAL_DECL_TYPE_##value_params>\ GMOCK_INTERNAL_DECL_TYPE_##value_params>\

4
googlemock/include/gmock/gmock-generated-actions.h.pump
View File

@ -254,7 +254,7 @@ $range k 0..n-1
return_type gmock_PerformImpl(GMOCK_ACTION_ARG_TYPES_AND_NAMES_) const;\ return_type gmock_PerformImpl(GMOCK_ACTION_ARG_TYPES_AND_NAMES_) const;\
GMOCK_INTERNAL_DEFN_##value_params\ GMOCK_INTERNAL_DEFN_##value_params\
private:\ private:\
GTEST_DISALLOW_ASSIGN_(gmock_Impl);\ GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(gmock_Impl);\
};\ };\
template <typename F> operator ::testing::Action<F>() const {\ template <typename F> operator ::testing::Action<F>() const {\
return ::testing::Action<F>(\ return ::testing::Action<F>(\
@ -262,7 +262,7 @@ $range k 0..n-1
}\ }\
GMOCK_INTERNAL_DEFN_##value_params\ GMOCK_INTERNAL_DEFN_##value_params\
private:\ private:\
GTEST_DISALLOW_ASSIGN_(GMOCK_ACTION_CLASS_(name, value_params));\ GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(GMOCK_ACTION_CLASS_(name, value_params));\
};\ };\
template <GMOCK_INTERNAL_DECL_##template_params\ template <GMOCK_INTERNAL_DECL_##template_params\
GMOCK_INTERNAL_DECL_TYPE_##value_params>\ GMOCK_INTERNAL_DECL_TYPE_##value_params>\

104
googlemock/include/gmock/gmock-matchers.h
View File

@ -445,7 +445,7 @@ class MatcherCastImpl<T, Matcher<U> > {
private: private:
const Matcher<U> source_matcher_; const Matcher<U> source_matcher_;
GTEST_DISALLOW_ASSIGN_(Impl); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(Impl);
}; };
}; };
@ -862,12 +862,12 @@ class RefMatcher<T&> {
private: private:
const Super& object_; const Super& object_;
GTEST_DISALLOW_ASSIGN_(Impl); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(Impl);
}; };
T& object_; T& object_;
GTEST_DISALLOW_ASSIGN_(RefMatcher); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(RefMatcher);
}; };
// Polymorphic helper functions for narrow and wide string matchers. // Polymorphic helper functions for narrow and wide string matchers.
@ -971,7 +971,7 @@ class StrEqualityMatcher {
const bool expect_eq_; const bool expect_eq_;
const bool case_sensitive_; const bool case_sensitive_;
GTEST_DISALLOW_ASSIGN_(StrEqualityMatcher); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(StrEqualityMatcher);
}; };
// Implements the polymorphic HasSubstr(substring) matcher, which // Implements the polymorphic HasSubstr(substring) matcher, which
@ -1027,7 +1027,7 @@ class HasSubstrMatcher {
private: private:
const StringType substring_; const StringType substring_;
GTEST_DISALLOW_ASSIGN_(HasSubstrMatcher); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(HasSubstrMatcher);
}; };
// Implements the polymorphic StartsWith(substring) matcher, which // Implements the polymorphic StartsWith(substring) matcher, which
@ -1084,7 +1084,7 @@ class StartsWithMatcher {
private: private:
const StringType prefix_; const StringType prefix_;
GTEST_DISALLOW_ASSIGN_(StartsWithMatcher); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(StartsWithMatcher);
}; };
// Implements the polymorphic EndsWith(substring) matcher, which // Implements the polymorphic EndsWith(substring) matcher, which
@ -1140,7 +1140,7 @@ class EndsWithMatcher {
private: private:
const StringType suffix_; const StringType suffix_;
GTEST_DISALLOW_ASSIGN_(EndsWithMatcher); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(EndsWithMatcher);
}; };
// Implements a matcher that compares the two fields of a 2-tuple // Implements a matcher that compares the two fields of a 2-tuple
@ -1235,7 +1235,7 @@ class NotMatcherImpl : public MatcherInterface<const T&> {
private: private:
const Matcher<T> matcher_; const Matcher<T> matcher_;
GTEST_DISALLOW_ASSIGN_(NotMatcherImpl); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(NotMatcherImpl);
}; };
// Implements the Not(m) matcher, which matches a value that doesn't // Implements the Not(m) matcher, which matches a value that doesn't
@ -1255,7 +1255,7 @@ class NotMatcher {
private: private:
InnerMatcher matcher_; InnerMatcher matcher_;
GTEST_DISALLOW_ASSIGN_(NotMatcher); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(NotMatcher);
}; };
// Implements the AllOf(m1, m2) matcher for a particular argument type // Implements the AllOf(m1, m2) matcher for a particular argument type
@ -1318,7 +1318,7 @@ class AllOfMatcherImpl : public MatcherInterface<const T&> {
private: private:
const std::vector<Matcher<T> > matchers_; const std::vector<Matcher<T> > matchers_;
GTEST_DISALLOW_ASSIGN_(AllOfMatcherImpl); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(AllOfMatcherImpl);
}; };
// VariadicMatcher is used for the variadic implementation of // VariadicMatcher is used for the variadic implementation of
@ -1358,7 +1358,7 @@ class VariadicMatcher {
std::tuple<Args...> matchers_; std::tuple<Args...> matchers_;
GTEST_DISALLOW_ASSIGN_(VariadicMatcher); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(VariadicMatcher);
}; };
template <typename... Args> template <typename... Args>
@ -1424,7 +1424,7 @@ class AnyOfMatcherImpl : public MatcherInterface<const T&> {
private: private:
const std::vector<Matcher<T> > matchers_; const std::vector<Matcher<T> > matchers_;
GTEST_DISALLOW_ASSIGN_(AnyOfMatcherImpl); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(AnyOfMatcherImpl);
}; };
// AnyOfMatcher is used for the variadic implementation of AnyOf(m_1, m_2, ...). // AnyOfMatcher is used for the variadic implementation of AnyOf(m_1, m_2, ...).
@ -1453,7 +1453,7 @@ class SomeOfArrayMatcher {
private: private:
const ::std::vector<T> matchers_; const ::std::vector<T> matchers_;
GTEST_DISALLOW_ASSIGN_(SomeOfArrayMatcher); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(SomeOfArrayMatcher);
}; };
template <typename T> template <typename T>
@ -1498,7 +1498,7 @@ class TrulyMatcher {
private: private:
Predicate predicate_; Predicate predicate_;
GTEST_DISALLOW_ASSIGN_(TrulyMatcher); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(TrulyMatcher);
}; };
// Used for implementing Matches(matcher), which turns a matcher into // Used for implementing Matches(matcher), which turns a matcher into
@ -1536,7 +1536,7 @@ class MatcherAsPredicate {
private: private:
M matcher_; M matcher_;
GTEST_DISALLOW_ASSIGN_(MatcherAsPredicate); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(MatcherAsPredicate);
}; };
// For implementing ASSERT_THAT() and EXPECT_THAT(). The template // For implementing ASSERT_THAT() and EXPECT_THAT(). The template
@ -1588,7 +1588,7 @@ class PredicateFormatterFromMatcher {
private: private:
const M matcher_; const M matcher_;
GTEST_DISALLOW_ASSIGN_(PredicateFormatterFromMatcher); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(PredicateFormatterFromMatcher);
}; };
// A helper function for converting a matcher to a predicate-formatter // A helper function for converting a matcher to a predicate-formatter
@ -1741,7 +1741,7 @@ class FloatingEqMatcher {
// max_abs_error will be used for value comparison when >= 0. // max_abs_error will be used for value comparison when >= 0.
const FloatType max_abs_error_; const FloatType max_abs_error_;
GTEST_DISALLOW_ASSIGN_(Impl); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(Impl);
}; };
// The following 3 type conversion operators allow FloatEq(expected) and // The following 3 type conversion operators allow FloatEq(expected) and
@ -1771,7 +1771,7 @@ class FloatingEqMatcher {
// max_abs_error will be used for value comparison when >= 0. // max_abs_error will be used for value comparison when >= 0.
const FloatType max_abs_error_; const FloatType max_abs_error_;
GTEST_DISALLOW_ASSIGN_(FloatingEqMatcher); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(FloatingEqMatcher);
}; };
// A 2-tuple ("binary") wrapper around FloatingEqMatcher: // A 2-tuple ("binary") wrapper around FloatingEqMatcher:
@ -1902,12 +1902,12 @@ class PointeeMatcher {
private: private:
const Matcher<const Pointee&> matcher_; const Matcher<const Pointee&> matcher_;
GTEST_DISALLOW_ASSIGN_(Impl); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(Impl);
}; };
const InnerMatcher matcher_; const InnerMatcher matcher_;
GTEST_DISALLOW_ASSIGN_(PointeeMatcher); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(PointeeMatcher);
}; };
#if GTEST_HAS_RTTI #if GTEST_HAS_RTTI
@ -1945,7 +1945,7 @@ class WhenDynamicCastToMatcherBase {
*os << "when dynamic_cast to " << GetToName() << ", "; *os << "when dynamic_cast to " << GetToName() << ", ";
} }
GTEST_DISALLOW_ASSIGN_(WhenDynamicCastToMatcherBase); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(WhenDynamicCastToMatcherBase);
}; };
// Primary template. // Primary template.
@ -2044,7 +2044,7 @@ class FieldMatcher {
// or "whose field `name_of_field` " if the name is known. // or "whose field `name_of_field` " if the name is known.
const std::string whose_field_; const std::string whose_field_;
GTEST_DISALLOW_ASSIGN_(FieldMatcher); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(FieldMatcher);
}; };
// Implements the Property() matcher for matching a property // Implements the Property() matcher for matching a property
@ -2114,7 +2114,7 @@ class PropertyMatcher {
// unknown or "whose property `name_of_property` " if the name is known. // unknown or "whose property `name_of_property` " if the name is known.
const std::string whose_property_; const std::string whose_property_;
GTEST_DISALLOW_ASSIGN_(PropertyMatcher); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(PropertyMatcher);
}; };
// Type traits specifying various features of different functors for ResultOf. // Type traits specifying various features of different functors for ResultOf.
@ -2205,13 +2205,13 @@ class ResultOfMatcher {
mutable CallableStorageType callable_; mutable CallableStorageType callable_;
const Matcher<ResultType> matcher_; const Matcher<ResultType> matcher_;
GTEST_DISALLOW_ASSIGN_(Impl); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(Impl);
}; // class Impl }; // class Impl
const CallableStorageType callable_; const CallableStorageType callable_;
const InnerMatcher matcher_; const InnerMatcher matcher_;
GTEST_DISALLOW_ASSIGN_(ResultOfMatcher); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(ResultOfMatcher);
}; };
// Implements a matcher that checks the size of an STL-style container. // Implements a matcher that checks the size of an STL-style container.
@ -2256,12 +2256,12 @@ class SizeIsMatcher {
private: private:
const Matcher<SizeType> size_matcher_; const Matcher<SizeType> size_matcher_;
GTEST_DISALLOW_ASSIGN_(Impl); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(Impl);
}; };
private: private:
const SizeMatcher size_matcher_; const SizeMatcher size_matcher_;
GTEST_DISALLOW_ASSIGN_(SizeIsMatcher); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(SizeIsMatcher);
}; };
// Implements a matcher that checks the begin()..end() distance of an STL-style // Implements a matcher that checks the begin()..end() distance of an STL-style
@ -2313,12 +2313,12 @@ class BeginEndDistanceIsMatcher {
private: private:
const Matcher<DistanceType> distance_matcher_; const Matcher<DistanceType> distance_matcher_;
GTEST_DISALLOW_ASSIGN_(Impl); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(Impl);
}; };
private: private:
const DistanceMatcher distance_matcher_; const DistanceMatcher distance_matcher_;
GTEST_DISALLOW_ASSIGN_(BeginEndDistanceIsMatcher); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(BeginEndDistanceIsMatcher);
}; };
// Implements an equality matcher for any STL-style container whose elements // Implements an equality matcher for any STL-style container whose elements
@ -2412,7 +2412,7 @@ class ContainerEqMatcher {
private: private:
const StlContainer expected_; const StlContainer expected_;
GTEST_DISALLOW_ASSIGN_(ContainerEqMatcher); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(ContainerEqMatcher);
}; };
// A comparator functor that uses the < operator to compare two values. // A comparator functor that uses the < operator to compare two values.
@ -2495,7 +2495,7 @@ class WhenSortedByMatcher {
const Comparator comparator_; const Comparator comparator_;
const ContainerMatcher matcher_; const ContainerMatcher matcher_;
GTEST_DISALLOW_ASSIGN_(WhenSortedByMatcher); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(WhenSortedByMatcher);
}; };
// Implements Pointwise(tuple_matcher, rhs_container). tuple_matcher // Implements Pointwise(tuple_matcher, rhs_container). tuple_matcher
@ -2612,14 +2612,14 @@ class PointwiseMatcher {
const Matcher<InnerMatcherArg> mono_tuple_matcher_; const Matcher<InnerMatcherArg> mono_tuple_matcher_;
const RhsStlContainer rhs_; const RhsStlContainer rhs_;
GTEST_DISALLOW_ASSIGN_(Impl); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(Impl);
}; };
private: private:
const TupleMatcher tuple_matcher_; const TupleMatcher tuple_matcher_;
const RhsStlContainer rhs_; const RhsStlContainer rhs_;
GTEST_DISALLOW_ASSIGN_(PointwiseMatcher); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(PointwiseMatcher);
}; };
// Holds the logic common to ContainsMatcherImpl and EachMatcherImpl. // Holds the logic common to ContainsMatcherImpl and EachMatcherImpl.
@ -2663,7 +2663,7 @@ class QuantifierMatcherImpl : public MatcherInterface<Container> {
protected: protected:
const Matcher<const Element&> inner_matcher_; const Matcher<const Element&> inner_matcher_;
GTEST_DISALLOW_ASSIGN_(QuantifierMatcherImpl); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(QuantifierMatcherImpl);
}; };
// Implements Contains(element_matcher) for the given argument type Container. // Implements Contains(element_matcher) for the given argument type Container.
@ -2692,7 +2692,7 @@ class ContainsMatcherImpl : public QuantifierMatcherImpl<Container> {
} }
private: private:
GTEST_DISALLOW_ASSIGN_(ContainsMatcherImpl); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(ContainsMatcherImpl);
}; };
// Implements Each(element_matcher) for the given argument type Container. // Implements Each(element_matcher) for the given argument type Container.
@ -2721,7 +2721,7 @@ class EachMatcherImpl : public QuantifierMatcherImpl<Container> {
} }
private: private:
GTEST_DISALLOW_ASSIGN_(EachMatcherImpl); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(EachMatcherImpl);
}; };
// Implements polymorphic Contains(element_matcher). // Implements polymorphic Contains(element_matcher).
@ -2739,7 +2739,7 @@ class ContainsMatcher {
private: private:
const M inner_matcher_; const M inner_matcher_;
GTEST_DISALLOW_ASSIGN_(ContainsMatcher); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(ContainsMatcher);
}; };
// Implements polymorphic Each(element_matcher). // Implements polymorphic Each(element_matcher).
@ -2757,7 +2757,7 @@ class EachMatcher {
private: private:
const M inner_matcher_; const M inner_matcher_;
GTEST_DISALLOW_ASSIGN_(EachMatcher); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(EachMatcher);
}; };
struct Rank1 {}; struct Rank1 {};
@ -2829,7 +2829,7 @@ class KeyMatcherImpl : public MatcherInterface<PairType> {
private: private:
const Matcher<const KeyType&> inner_matcher_; const Matcher<const KeyType&> inner_matcher_;
GTEST_DISALLOW_ASSIGN_(KeyMatcherImpl); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(KeyMatcherImpl);
}; };
// Implements polymorphic Key(matcher_for_key). // Implements polymorphic Key(matcher_for_key).
@ -2847,7 +2847,7 @@ class KeyMatcher {
private: private:
const M matcher_for_key_; const M matcher_for_key_;
GTEST_DISALLOW_ASSIGN_(KeyMatcher); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(KeyMatcher);
}; };
// Implements Pair(first_matcher, second_matcher) for the given argument pair // Implements Pair(first_matcher, second_matcher) for the given argument pair
@ -2934,7 +2934,7 @@ class PairMatcherImpl : public MatcherInterface<PairType> {
const Matcher<const FirstType&> first_matcher_; const Matcher<const FirstType&> first_matcher_;
const Matcher<const SecondType&> second_matcher_; const Matcher<const SecondType&> second_matcher_;
GTEST_DISALLOW_ASSIGN_(PairMatcherImpl); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(PairMatcherImpl);
}; };
// Implements polymorphic Pair(first_matcher, second_matcher). // Implements polymorphic Pair(first_matcher, second_matcher).
@ -2954,7 +2954,7 @@ class PairMatcher {
const FirstMatcher first_matcher_; const FirstMatcher first_matcher_;
const SecondMatcher second_matcher_; const SecondMatcher second_matcher_;
GTEST_DISALLOW_ASSIGN_(PairMatcher); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(PairMatcher);
}; };
// Implements ElementsAre() and ElementsAreArray(). // Implements ElementsAre() and ElementsAreArray().
@ -3101,7 +3101,7 @@ class ElementsAreMatcherImpl : public MatcherInterface<Container> {
::std::vector<Matcher<const Element&> > matchers_; ::std::vector<Matcher<const Element&> > matchers_;
GTEST_DISALLOW_ASSIGN_(ElementsAreMatcherImpl); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(ElementsAreMatcherImpl);
}; };
// Connectivity matrix of (elements X matchers), in element-major order. // Connectivity matrix of (elements X matchers), in element-major order.
@ -3205,7 +3205,7 @@ class GTEST_API_ UnorderedElementsAreMatcherImplBase {
UnorderedMatcherRequire::Flags match_flags_; UnorderedMatcherRequire::Flags match_flags_;
MatcherDescriberVec matcher_describers_; MatcherDescriberVec matcher_describers_;
GTEST_DISALLOW_ASSIGN_(UnorderedElementsAreMatcherImplBase); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(UnorderedElementsAreMatcherImplBase);
}; };
// Implements UnorderedElementsAre, UnorderedElementsAreArray, IsSubsetOf, and // Implements UnorderedElementsAre, UnorderedElementsAreArray, IsSubsetOf, and
@ -3302,7 +3302,7 @@ class UnorderedElementsAreMatcherImpl
::std::vector<Matcher<const Element&> > matchers_; ::std::vector<Matcher<const Element&> > matchers_;
GTEST_DISALLOW_ASSIGN_(UnorderedElementsAreMatcherImpl); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(UnorderedElementsAreMatcherImpl);
}; };
// Functor for use in TransformTuple. // Functor for use in TransformTuple.
@ -3340,7 +3340,7 @@ class UnorderedElementsAreMatcher {
private: private:
const MatcherTuple matchers_; const MatcherTuple matchers_;
GTEST_DISALLOW_ASSIGN_(UnorderedElementsAreMatcher); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(UnorderedElementsAreMatcher);
}; };
// Implements ElementsAre. // Implements ElementsAre.
@ -3370,7 +3370,7 @@ class ElementsAreMatcher {
private: private:
const MatcherTuple matchers_; const MatcherTuple matchers_;
GTEST_DISALLOW_ASSIGN_(ElementsAreMatcher); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(ElementsAreMatcher);
}; };
// Implements UnorderedElementsAreArray(), IsSubsetOf(), and IsSupersetOf(). // Implements UnorderedElementsAreArray(), IsSubsetOf(), and IsSupersetOf().
@ -3393,7 +3393,7 @@ class UnorderedElementsAreArrayMatcher {
UnorderedMatcherRequire::Flags match_flags_; UnorderedMatcherRequire::Flags match_flags_;
::std::vector<T> matchers_; ::std::vector<T> matchers_;
GTEST_DISALLOW_ASSIGN_(UnorderedElementsAreArrayMatcher); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(UnorderedElementsAreArrayMatcher);
}; };
// Implements ElementsAreArray(). // Implements ElementsAreArray().
@ -3416,7 +3416,7 @@ class ElementsAreArrayMatcher {
private: private:
const ::std::vector<T> matchers_; const ::std::vector<T> matchers_;
GTEST_DISALLOW_ASSIGN_(ElementsAreArrayMatcher); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(ElementsAreArrayMatcher);
}; };
// Given a 2-tuple matcher tm of type Tuple2Matcher and a value second // Given a 2-tuple matcher tm of type Tuple2Matcher and a value second
@ -3479,7 +3479,7 @@ class BoundSecondMatcher {
const Matcher<const ArgTuple&> mono_tuple2_matcher_; const Matcher<const ArgTuple&> mono_tuple2_matcher_;
const Second second_value_; const Second second_value_;
GTEST_DISALLOW_ASSIGN_(Impl); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(Impl);
}; };
const Tuple2Matcher tuple2_matcher_; const Tuple2Matcher tuple2_matcher_;
@ -3552,12 +3552,12 @@ class OptionalMatcher {
private: private:
const Matcher<ValueType> value_matcher_; const Matcher<ValueType> value_matcher_;
GTEST_DISALLOW_ASSIGN_(Impl); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(Impl);
}; };
private: private:
const ValueMatcher value_matcher_; const ValueMatcher value_matcher_;
GTEST_DISALLOW_ASSIGN_(OptionalMatcher); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(OptionalMatcher);
}; };
namespace variant_matcher { namespace variant_matcher {

4
googlemock/include/gmock/gmock-spec-builders.h
View File

@ -880,7 +880,7 @@ class GTEST_API_ ExpectationBase {
mutable bool action_count_checked_; // Under mutex_. mutable bool action_count_checked_; // Under mutex_.
mutable Mutex mutex_; // Protects action_count_checked_. mutable Mutex mutex_; // Protects action_count_checked_.
GTEST_DISALLOW_ASSIGN_(ExpectationBase); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(ExpectationBase);
}; // class ExpectationBase }; // class ExpectationBase
// Impements an expectation for the given function type. // Impements an expectation for the given function type.
@ -1296,7 +1296,7 @@ class MockSpec {
// The argument matchers specified in the spec. // The argument matchers specified in the spec.
ArgumentMatcherTuple matchers_; ArgumentMatcherTuple matchers_;
GTEST_DISALLOW_ASSIGN_(MockSpec); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(MockSpec);
}; // class MockSpec }; // class MockSpec
// Wrapper type for generically holding an ordinary value or lvalue reference. // Wrapper type for generically holding an ordinary value or lvalue reference.

2
googlemock/src/gmock-matchers.cc
View File

@ -219,7 +219,7 @@ class MaxBipartiteMatchState {
::std::vector<size_t> left_; ::std::vector<size_t> left_;
::std::vector<size_t> right_; ::std::vector<size_t> right_;
GTEST_DISALLOW_ASSIGN_(MaxBipartiteMatchState); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(MaxBipartiteMatchState);
}; };
const size_t MaxBipartiteMatchState::kUnused; const size_t MaxBipartiteMatchState::kUnused;

2
googlemock/test/gmock-actions_test.cc
View File

@ -576,7 +576,7 @@ class FromType {
private: private:
bool* const converted_; bool* const converted_;
GTEST_DISALLOW_ASSIGN_(FromType); GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(FromType);
}; };
class ToType { class ToType {

28
googlemock/test/gmock-matchers_test.cc
View File

@ -705,8 +705,8 @@ class Base {
public: public:
virtual ~Base() {} virtual ~Base() {}
Base() {} Base() {}
private: Base(const Base&) = delete;
GTEST_DISALLOW_COPY_AND_ASSIGN_(Base); Base& operator=(const Base&) = delete;
}; };
class Derived : public Base { class Derived : public Base {
@ -2941,11 +2941,10 @@ TEST(AllArgsTest, WorksForNonTuple) {
class AllArgsHelper { class AllArgsHelper {
public: public:
AllArgsHelper() {} AllArgsHelper() {}
AllArgsHelper(const AllArgsHelper&) = delete;
AllArgsHelper& operator=(const AllArgsHelper&) = delete;
MOCK_METHOD2(Helper, int(char x, int y)); MOCK_METHOD2(Helper, int(char x, int y));
private:
GTEST_DISALLOW_COPY_AND_ASSIGN_(AllArgsHelper);
}; };
TEST(AllArgsTest, WorksInWithClause) { TEST(AllArgsTest, WorksInWithClause) {
@ -2965,6 +2964,8 @@ TEST(AllArgsTest, WorksInWithClause) {
class OptionalMatchersHelper { class OptionalMatchersHelper {
public: public:
OptionalMatchersHelper() {} OptionalMatchersHelper() {}
OptionalMatchersHelper(const OptionalMatchersHelper&) = delete;
OptionalMatchersHelper& operator=(const OptionalMatchersHelper&) = delete;
MOCK_METHOD0(NoArgs, int()); MOCK_METHOD0(NoArgs, int());
@ -2974,9 +2975,6 @@ class OptionalMatchersHelper {
MOCK_METHOD1(Overloaded, int(char x)); MOCK_METHOD1(Overloaded, int(char x));
MOCK_METHOD2(Overloaded, int(char x, int y)); MOCK_METHOD2(Overloaded, int(char x, int y));
private:
GTEST_DISALLOW_COPY_AND_ASSIGN_(OptionalMatchersHelper);
}; };
TEST(AllArgsTest, WorksWithoutMatchers) { TEST(AllArgsTest, WorksWithoutMatchers) {
@ -3720,13 +3718,14 @@ class Uncopyable {
public: public:
Uncopyable() : value_(-1) {} Uncopyable() : value_(-1) {}
explicit Uncopyable(int a_value) : value_(a_value) {} explicit Uncopyable(int a_value) : value_(a_value) {}
Uncopyable(const Uncopyable&) = delete;
Uncopyable& operator=(const Uncopyable&) = delete;
int value() const { return value_; } int value() const { return value_; }
void set_value(int i) { value_ = i; } void set_value(int i) { value_ = i; }
private: private:
int value_; int value_;
GTEST_DISALLOW_COPY_AND_ASSIGN_(Uncopyable);
}; };
// Returns true if and only if x.value() is positive. // Returns true if and only if x.value() is positive.
@ -3741,22 +3740,17 @@ struct AStruct {
AStruct() : x(0), y(1.0), z(5), p(nullptr) {} AStruct() : x(0), y(1.0), z(5), p(nullptr) {}
AStruct(const AStruct& rhs) AStruct(const AStruct& rhs)
: x(rhs.x), y(rhs.y), z(rhs.z.value()), p(rhs.p) {} : x(rhs.x), y(rhs.y), z(rhs.z.value()), p(rhs.p) {}
AStruct& operator=(const AStruct&) = delete;
int x; // A non-const field. int x; // A non-const field.
const double y; // A const field. const double y; // A const field.
Uncopyable z; // An uncopyable field. Uncopyable z; // An uncopyable field.
const char* p; // A pointer field. const char* p; // A pointer field.
private:
GTEST_DISALLOW_ASSIGN_(AStruct);
}; };
// A derived struct for testing Field(). // A derived struct for testing Field().
struct DerivedStruct : public AStruct { struct DerivedStruct : public AStruct {
char ch; char ch;
private:
GTEST_DISALLOW_ASSIGN_(DerivedStruct);
}; };
// Tests that Field(&Foo::field, ...) works when field is non-const. // Tests that Field(&Foo::field, ...) works when field is non-const.
@ -4559,6 +4553,8 @@ TEST(ExplainmatcherResultTest, MonomorphicMatcher) {
class NotCopyable { class NotCopyable {
public: public:
explicit NotCopyable(int a_value) : value_(a_value) {} explicit NotCopyable(int a_value) : value_(a_value) {}
NotCopyable(const NotCopyable&) = delete;
NotCopyable& operator=(const NotCopyable&) = delete;
int value() const { return value_; } int value() const { return value_; }
@ -4571,8 +4567,6 @@ class NotCopyable {
} }
private: private:
int value_; int value_;
GTEST_DISALLOW_COPY_AND_ASSIGN_(NotCopyable);
}; };
TEST(ByRefTest, AllowsNotCopyableConstValueInMatchers) { TEST(ByRefTest, AllowsNotCopyableConstValueInMatchers) {

5
googletest/include/gtest/internal/gtest-internal.h
View File

@ -1079,6 +1079,7 @@ class NativeArray {
NativeArray(const NativeArray& rhs) { NativeArray(const NativeArray& rhs) {
(this->*rhs.clone_)(rhs.array_, rhs.size_); (this->*rhs.clone_)(rhs.array_, rhs.size_);
} }
NativeArray& operator=(const NativeArray&) = delete;
~NativeArray() { ~NativeArray() {
if (clone_ != &NativeArray::InitRef) if (clone_ != &NativeArray::InitRef)
@ -1118,8 +1119,6 @@ class NativeArray {
const Element* array_; const Element* array_;
size_t size_; size_t size_;
void (NativeArray::*clone_)(const Element*, size_t); void (NativeArray::*clone_)(const Element*, size_t);
GTEST_DISALLOW_ASSIGN_(NativeArray);
}; };
// Backport of std::index_sequence. // Backport of std::index_sequence.
@ -1408,8 +1407,6 @@ constexpr bool InstantiateTypedTestCase_P_IsDeprecated() { return true; }
~GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)() override = default; \ ~GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)() override = default; \
GTEST_DISALLOW_COPY_AND_ASSIGN_(GTEST_TEST_CLASS_NAME_(test_suite_name, \ GTEST_DISALLOW_COPY_AND_ASSIGN_(GTEST_TEST_CLASS_NAME_(test_suite_name, \
test_name)); \ test_name)); \
GTEST_DISALLOW_MOVE_AND_ASSIGN_(GTEST_TEST_CLASS_NAME_(test_suite_name, \
test_name)); \
\ \
private: \ private: \
void TestBody() override; \ void TestBody() override; \

25
googletest/include/gtest/internal/gtest-port.h
View File

@ -190,10 +190,8 @@
// GTEST_AMBIGUOUS_ELSE_BLOCKER_ - for disabling a gcc warning. // GTEST_AMBIGUOUS_ELSE_BLOCKER_ - for disabling a gcc warning.
// GTEST_ATTRIBUTE_UNUSED_ - declares that a class' instances or a // GTEST_ATTRIBUTE_UNUSED_ - declares that a class' instances or a
// variable don't have to be used. // variable don't have to be used.
// GTEST_DISALLOW_ASSIGN_ - disables copy operator=. // GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_ - disables copy operator=.
// GTEST_DISALLOW_COPY_AND_ASSIGN_ - disables copy ctor and operator=. // GTEST_DISALLOW_COPY_AND_ASSIGN_ - disables copy ctor and operator=.
// GTEST_DISALLOW_MOVE_ASSIGN_ - disables move operator=.
// GTEST_DISALLOW_MOVE_AND_ASSIGN_ - disables move ctor and operator=.
// GTEST_MUST_USE_RESULT_ - declares that a function's result must be used. // GTEST_MUST_USE_RESULT_ - declares that a function's result must be used.
// GTEST_INTENTIONAL_CONST_COND_PUSH_ - start code section where MSVC C4127 is // GTEST_INTENTIONAL_CONST_COND_PUSH_ - start code section where MSVC C4127 is
// suppressed (constant conditional). // suppressed (constant conditional).
@ -675,25 +673,17 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
// A macro to disallow copy operator= // A macro to disallow copy operator=
// This should be used in the private: declarations for a class. // This should be used in the private: declarations for a class.
#define GTEST_DISALLOW_ASSIGN_(type) \ #define GTEST_DISALLOW_ASSIGN_BUT_DEFAULT_COPY_(type) \
public: \
type(type const &) = default; \
private: \
type& operator=(type const &) = delete type& operator=(type const &) = delete
// A macro to disallow copy constructor and operator= // A macro to disallow copy constructor and operator=
// This should be used in the private: declarations for a class. // This should be used in the private: declarations for a class.
#define GTEST_DISALLOW_COPY_AND_ASSIGN_(type) \ #define GTEST_DISALLOW_COPY_AND_ASSIGN_(type) \
type(type const &) = delete; \ type(type const &) = delete; \
GTEST_DISALLOW_ASSIGN_(type) type& operator=(type const &) = delete
// A macro to disallow move operator=
// This should be used in the private: declarations for a class.
#define GTEST_DISALLOW_MOVE_ASSIGN_(type) \
type& operator=(type &&) noexcept = delete
// A macro to disallow move constructor and operator=
// This should be used in the private: declarations for a class.
#define GTEST_DISALLOW_MOVE_AND_ASSIGN_(type) \
type(type &&) noexcept = delete; \
GTEST_DISALLOW_MOVE_ASSIGN_(type)
// Tell the compiler to warn about unused return values for functions declared // Tell the compiler to warn about unused return values for functions declared
// with this macro. The macro should be used on function declarations // with this macro. The macro should be used on function declarations
@ -881,6 +871,7 @@ class GTEST_API_ RE {
// A copy constructor is required by the Standard to initialize object // A copy constructor is required by the Standard to initialize object
// references from r-values. // references from r-values.
RE(const RE& other) { Init(other.pattern()); } RE(const RE& other) { Init(other.pattern()); }
RE& operator=(const RE&) = delete;
// Constructs an RE from a string. // Constructs an RE from a string.
RE(const ::std::string& regex) { Init(regex.c_str()); } // NOLINT RE(const ::std::string& regex) { Init(regex.c_str()); } // NOLINT
@ -920,8 +911,6 @@ class GTEST_API_ RE {
const char* full_pattern_; // For FullMatch(); const char* full_pattern_; // For FullMatch();
# endif # endif
GTEST_DISALLOW_ASSIGN_(RE);
}; };
#endif // GTEST_USES_PCRE #endif // GTEST_USES_PCRE

3
googletest/test/googletest-port-test.cc
View File

@ -1168,6 +1168,7 @@ class DestructorTracker {
DestructorTracker() : index_(GetNewIndex()) {} DestructorTracker() : index_(GetNewIndex()) {}
DestructorTracker(const DestructorTracker& /* rhs */) DestructorTracker(const DestructorTracker& /* rhs */)
: index_(GetNewIndex()) {} : index_(GetNewIndex()) {}
DestructorTracker& operator=(const DestructorTracker&) = delete;
~DestructorTracker() { ~DestructorTracker() {
// We never access DestructorCall::List() concurrently, so we don't need // We never access DestructorCall::List() concurrently, so we don't need
// to protect this access with a mutex. // to protect this access with a mutex.
@ -1180,8 +1181,6 @@ class DestructorTracker {
return DestructorCall::List().size() - 1; return DestructorCall::List().size() - 1;
} }
const size_t index_; const size_t index_;
GTEST_DISALLOW_ASSIGN_(DestructorTracker);
}; };
typedef ThreadLocal<DestructorTracker>* ThreadParam; typedef ThreadLocal<DestructorTracker>* ThreadParam;