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

Eliminate GTEST_DISALLOW_ASSIGN_ from classes that are naturally not assignable.

Browse Source 
Any class with a data member that's `const` or of reference type
has no `operator=` by definition; we don't have to redundantly
specify it. Therefore this commit has no functional change.
(But the next one will have.)
This commit is contained in:
Arthur O'Dwyer 2020-03-27 23:29:36 -04:00
parent 9199f8feaf
commit df1df951e6
6 changed files with 0 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -717,13 +717,9 @@ class ReturnAction {
private: private:
bool performed_; bool performed_;
const std::shared_ptr<R> wrapper_; const std::shared_ptr<R> wrapper_;
GTEST_DISALLOW_ASSIGN_(Impl);
}; };
const std::shared_ptr<R> value_; const std::shared_ptr<R> value_;
GTEST_DISALLOW_ASSIGN_(ReturnAction);
}; };
// Implements the ReturnNull() action. // Implements the ReturnNull() action.
@ -784,13 +780,9 @@ class ReturnRefAction {
private: private:
T& ref_; T& ref_;
GTEST_DISALLOW_ASSIGN_(Impl);
}; };
T& ref_; T& ref_;
GTEST_DISALLOW_ASSIGN_(ReturnRefAction);
}; };
// Implements the polymorphic ReturnRefOfCopy(x) action, which can be // Implements the polymorphic ReturnRefOfCopy(x) action, which can be
@ -836,8 +828,6 @@ class ReturnRefOfCopyAction {
}; };
const T value_; const T value_;
GTEST_DISALLOW_ASSIGN_(ReturnRefOfCopyAction);
}; };
// Implements the polymorphic ReturnRoundRobin(v) action, which can be // Implements the polymorphic ReturnRoundRobin(v) action, which can be
@ -894,8 +884,6 @@ class AssignAction {
private: private:
T1* const ptr_; T1* const ptr_;
const T2 value_; const T2 value_;
GTEST_DISALLOW_ASSIGN_(AssignAction);
}; };
#if !GTEST_OS_WINDOWS_MOBILE #if !GTEST_OS_WINDOWS_MOBILE
@ -917,8 +905,6 @@ class SetErrnoAndReturnAction {
private: private:
const int errno_; const int errno_;
const T result_; const T result_;
GTEST_DISALLOW_ASSIGN_(SetErrnoAndReturnAction);
}; };
#endif // !GTEST_OS_WINDOWS_MOBILE #endif // !GTEST_OS_WINDOWS_MOBILE
@ -1023,13 +1009,9 @@ class IgnoreResultAction {
OriginalFunction; OriginalFunction;
const Action<OriginalFunction> action_; const Action<OriginalFunction> action_;
GTEST_DISALLOW_ASSIGN_(Impl);
}; };
const A action_; const A action_;
GTEST_DISALLOW_ASSIGN_(IgnoreResultAction);
}; };
template <typename InnerAction, size_t... I> template <typename InnerAction, size_t... I>

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

@ -444,8 +444,6 @@ class MatcherCastImpl<T, Matcher<U> > {
private: private:
const Matcher<U> source_matcher_; const Matcher<U> source_matcher_;
GTEST_DISALLOW_ASSIGN_(Impl);
}; };
}; };
@ -861,13 +859,9 @@ class RefMatcher<T&> {
private: private:
const Super& object_; const Super& object_;
GTEST_DISALLOW_ASSIGN_(Impl);
}; };
T& object_; T& object_;
GTEST_DISALLOW_ASSIGN_(RefMatcher);
}; };
// Polymorphic helper functions for narrow and wide string matchers. // Polymorphic helper functions for narrow and wide string matchers.
@ -970,8 +964,6 @@ class StrEqualityMatcher {
const StringType string_; const StringType string_;
const bool expect_eq_; const bool expect_eq_;
const bool case_sensitive_; const bool case_sensitive_;
GTEST_DISALLOW_ASSIGN_(StrEqualityMatcher);
}; };
// Implements the polymorphic HasSubstr(substring) matcher, which // Implements the polymorphic HasSubstr(substring) matcher, which
@ -1026,8 +1018,6 @@ class HasSubstrMatcher {
private: private:
const StringType substring_; const StringType substring_;
GTEST_DISALLOW_ASSIGN_(HasSubstrMatcher);
}; };
// Implements the polymorphic StartsWith(substring) matcher, which // Implements the polymorphic StartsWith(substring) matcher, which
@ -1083,8 +1073,6 @@ class StartsWithMatcher {
private: private:
const StringType prefix_; const StringType prefix_;
GTEST_DISALLOW_ASSIGN_(StartsWithMatcher);
}; };
// Implements the polymorphic EndsWith(substring) matcher, which // Implements the polymorphic EndsWith(substring) matcher, which
@ -1139,8 +1127,6 @@ class EndsWithMatcher {
private: private:
const StringType suffix_; const StringType suffix_;
GTEST_DISALLOW_ASSIGN_(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
@ -1234,8 +1220,6 @@ class NotMatcherImpl : public MatcherInterface<const T&> {
private: private:
const Matcher<T> matcher_; const Matcher<T> matcher_;
GTEST_DISALLOW_ASSIGN_(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
@ -1317,8 +1301,6 @@ class AllOfMatcherImpl : public MatcherInterface<const T&> {
private: private:
const std::vector<Matcher<T> > matchers_; const std::vector<Matcher<T> > matchers_;
GTEST_DISALLOW_ASSIGN_(AllOfMatcherImpl);
}; };
// VariadicMatcher is used for the variadic implementation of // VariadicMatcher is used for the variadic implementation of
@ -1423,8 +1405,6 @@ class AnyOfMatcherImpl : public MatcherInterface<const T&> {
private: private:
const std::vector<Matcher<T> > matchers_; const std::vector<Matcher<T> > matchers_;
GTEST_DISALLOW_ASSIGN_(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, ...).
@ -1452,8 +1432,6 @@ class SomeOfArrayMatcher {
private: private:
const ::std::vector<T> matchers_; const ::std::vector<T> matchers_;
GTEST_DISALLOW_ASSIGN_(SomeOfArrayMatcher);
}; };
template <typename T> template <typename T>
@ -1587,8 +1565,6 @@ class PredicateFormatterFromMatcher {
private: private:
const M matcher_; const M matcher_;
GTEST_DISALLOW_ASSIGN_(PredicateFormatterFromMatcher);
}; };
// A helper function for converting a matcher to a predicate-formatter // A helper function for converting a matcher to a predicate-formatter
@ -1740,8 +1716,6 @@ class FloatingEqMatcher {
const bool nan_eq_nan_; const bool nan_eq_nan_;
// 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);
}; };
// The following 3 type conversion operators allow FloatEq(expected) and // The following 3 type conversion operators allow FloatEq(expected) and
@ -1770,8 +1744,6 @@ class FloatingEqMatcher {
const bool nan_eq_nan_; const bool nan_eq_nan_;
// 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);
}; };
// A 2-tuple ("binary") wrapper around FloatingEqMatcher: // A 2-tuple ("binary") wrapper around FloatingEqMatcher:
@ -1901,13 +1873,9 @@ class PointeeMatcher {
private: private:
const Matcher<const Pointee&> matcher_; const Matcher<const Pointee&> matcher_;
GTEST_DISALLOW_ASSIGN_(Impl);
}; };
const InnerMatcher matcher_; const InnerMatcher matcher_;
GTEST_DISALLOW_ASSIGN_(PointeeMatcher);
}; };
#if GTEST_HAS_RTTI #if GTEST_HAS_RTTI
@ -1944,8 +1912,6 @@ class WhenDynamicCastToMatcherBase {
static void GetCastTypeDescription(::std::ostream* os) { static void GetCastTypeDescription(::std::ostream* os) {
*os << "when dynamic_cast to " << GetToName() << ", "; *os << "when dynamic_cast to " << GetToName() << ", ";
} }
GTEST_DISALLOW_ASSIGN_(WhenDynamicCastToMatcherBase);
}; };
// Primary template. // Primary template.
@ -2043,8 +2009,6 @@ class FieldMatcher {
// Contains either "whose given field " if the name of the field is unknown // Contains either "whose given field " if the name of the field is unknown
// 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);
}; };
// Implements the Property() matcher for matching a property // Implements the Property() matcher for matching a property
@ -2113,8 +2077,6 @@ class PropertyMatcher {
// Contains either "whose given property " if the name of the property is // Contains either "whose given property " if the name of the property is
// 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);
}; };
// Type traits specifying various features of different functors for ResultOf. // Type traits specifying various features of different functors for ResultOf.
@ -2204,14 +2166,10 @@ class ResultOfMatcher {
// how many times the callable will be invoked. // how many times the callable will be invoked.
mutable CallableStorageType callable_; mutable CallableStorageType callable_;
const Matcher<ResultType> matcher_; const Matcher<ResultType> matcher_;
GTEST_DISALLOW_ASSIGN_(Impl);
}; // class Impl }; // class Impl
const CallableStorageType callable_; const CallableStorageType callable_;
const InnerMatcher matcher_; const InnerMatcher matcher_;
GTEST_DISALLOW_ASSIGN_(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 +2214,10 @@ class SizeIsMatcher {
private: private:
const Matcher<SizeType> size_matcher_; const Matcher<SizeType> size_matcher_;
GTEST_DISALLOW_ASSIGN_(Impl);
}; };
private: private:
const SizeMatcher size_matcher_; const SizeMatcher size_matcher_;
GTEST_DISALLOW_ASSIGN_(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 +2269,10 @@ class BeginEndDistanceIsMatcher {
private: private:
const Matcher<DistanceType> distance_matcher_; const Matcher<DistanceType> distance_matcher_;
GTEST_DISALLOW_ASSIGN_(Impl);
}; };
private: private:
const DistanceMatcher distance_matcher_; const DistanceMatcher distance_matcher_;
GTEST_DISALLOW_ASSIGN_(BeginEndDistanceIsMatcher);
}; };
// Implements an equality matcher for any STL-style container whose elements // Implements an equality matcher for any STL-style container whose elements
@ -2411,8 +2365,6 @@ class ContainerEqMatcher {
private: private:
const StlContainer expected_; const StlContainer expected_;
GTEST_DISALLOW_ASSIGN_(ContainerEqMatcher);
}; };
// A comparator functor that uses the < operator to compare two values. // A comparator functor that uses the < operator to compare two values.
@ -2494,8 +2446,6 @@ class WhenSortedByMatcher {
private: private:
const Comparator comparator_; const Comparator comparator_;
const ContainerMatcher matcher_; const ContainerMatcher matcher_;
GTEST_DISALLOW_ASSIGN_(WhenSortedByMatcher);
}; };
// Implements Pointwise(tuple_matcher, rhs_container). tuple_matcher // Implements Pointwise(tuple_matcher, rhs_container). tuple_matcher
@ -2611,15 +2561,11 @@ class PointwiseMatcher {
private: private:
const Matcher<InnerMatcherArg> mono_tuple_matcher_; const Matcher<InnerMatcherArg> mono_tuple_matcher_;
const RhsStlContainer rhs_; const RhsStlContainer rhs_;
GTEST_DISALLOW_ASSIGN_(Impl);
}; };
private: private:
const TupleMatcher tuple_matcher_; const TupleMatcher tuple_matcher_;
const RhsStlContainer rhs_; const RhsStlContainer rhs_;
GTEST_DISALLOW_ASSIGN_(PointwiseMatcher);
}; };
// Holds the logic common to ContainsMatcherImpl and EachMatcherImpl. // Holds the logic common to ContainsMatcherImpl and EachMatcherImpl.
@ -2662,8 +2608,6 @@ class QuantifierMatcherImpl : public MatcherInterface<Container> {
protected: protected:
const Matcher<const Element&> inner_matcher_; const Matcher<const Element&> inner_matcher_;
GTEST_DISALLOW_ASSIGN_(QuantifierMatcherImpl);
}; };
// Implements Contains(element_matcher) for the given argument type Container. // Implements Contains(element_matcher) for the given argument type Container.
@ -2738,8 +2682,6 @@ class ContainsMatcher {
private: private:
const M inner_matcher_; const M inner_matcher_;
GTEST_DISALLOW_ASSIGN_(ContainsMatcher);
}; };
// Implements polymorphic Each(element_matcher). // Implements polymorphic Each(element_matcher).
@ -2756,8 +2698,6 @@ class EachMatcher {
private: private:
const M inner_matcher_; const M inner_matcher_;
GTEST_DISALLOW_ASSIGN_(EachMatcher);
}; };
struct Rank1 {}; struct Rank1 {};
@ -2828,8 +2768,6 @@ class KeyMatcherImpl : public MatcherInterface<PairType> {
private: private:
const Matcher<const KeyType&> inner_matcher_; const Matcher<const KeyType&> inner_matcher_;
GTEST_DISALLOW_ASSIGN_(KeyMatcherImpl);
}; };
// Implements polymorphic Key(matcher_for_key). // Implements polymorphic Key(matcher_for_key).
@ -2846,8 +2784,6 @@ class KeyMatcher {
private: private:
const M matcher_for_key_; const M matcher_for_key_;
GTEST_DISALLOW_ASSIGN_(KeyMatcher);
}; };
// Implements Pair(first_matcher, second_matcher) for the given argument pair // Implements Pair(first_matcher, second_matcher) for the given argument pair
@ -2933,8 +2869,6 @@ 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);
}; };
// Implements polymorphic Pair(first_matcher, second_matcher). // Implements polymorphic Pair(first_matcher, second_matcher).
@ -2953,8 +2887,6 @@ class PairMatcher {
private: private:
const FirstMatcher first_matcher_; const FirstMatcher first_matcher_;
const SecondMatcher second_matcher_; const SecondMatcher second_matcher_;
GTEST_DISALLOW_ASSIGN_(PairMatcher);
}; };
// Implements ElementsAre() and ElementsAreArray(). // Implements ElementsAre() and ElementsAreArray().
@ -3340,7 +3272,6 @@ class UnorderedElementsAreMatcher {
private: private:
const MatcherTuple matchers_; const MatcherTuple matchers_;
GTEST_DISALLOW_ASSIGN_(UnorderedElementsAreMatcher);
}; };
// Implements ElementsAre. // Implements ElementsAre.
@ -3370,7 +3301,6 @@ class ElementsAreMatcher {
private: private:
const MatcherTuple matchers_; const MatcherTuple matchers_;
GTEST_DISALLOW_ASSIGN_(ElementsAreMatcher);
}; };
// Implements UnorderedElementsAreArray(), IsSubsetOf(), and IsSupersetOf(). // Implements UnorderedElementsAreArray(), IsSubsetOf(), and IsSupersetOf().
@ -3415,8 +3345,6 @@ class ElementsAreArrayMatcher {
private: private:
const ::std::vector<T> matchers_; const ::std::vector<T> matchers_;
GTEST_DISALLOW_ASSIGN_(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
@ -3478,8 +3406,6 @@ class BoundSecondMatcher {
private: private:
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);
}; };
const Tuple2Matcher tuple2_matcher_; const Tuple2Matcher tuple2_matcher_;
@ -3552,12 +3478,10 @@ class OptionalMatcher {
private: private:
const Matcher<ValueType> value_matcher_; const Matcher<ValueType> value_matcher_;
GTEST_DISALLOW_ASSIGN_(Impl);
}; };
private: private:
const ValueMatcher value_matcher_; const ValueMatcher value_matcher_;
GTEST_DISALLOW_ASSIGN_(OptionalMatcher);
}; };
namespace variant_matcher { namespace variant_matcher {

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

@ -877,8 +877,6 @@ class GTEST_API_ ExpectationBase {
Clause last_clause_; Clause last_clause_;
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);
}; // class ExpectationBase }; // class ExpectationBase
// Impements an expectation for the given function type. // Impements an expectation for the given function type.
@ -1293,8 +1291,6 @@ class MockSpec {
internal::FunctionMocker<F>* const function_mocker_; internal::FunctionMocker<F>* const function_mocker_;
// The argument matchers specified in the spec. // The argument matchers specified in the spec.
ArgumentMatcherTuple matchers_; ArgumentMatcherTuple matchers_;
GTEST_DISALLOW_ASSIGN_(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.

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

@ -575,8 +575,6 @@ class FromType {
private: private:
bool* const converted_; bool* const converted_;
GTEST_DISALLOW_ASSIGN_(FromType);
}; };
class ToType { class ToType {
@ -1515,4 +1513,3 @@ TEST(MoveOnlyArgumentsTest, ReturningActions) {
# pragma warning(pop) # pragma warning(pop)
#endif #endif
#endif #endif

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

@ -3746,17 +3746,11 @@ struct AStruct {
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.

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

@ -1180,8 +1180,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;