Index: include/llvm/ADT/STLExtras.h =================================================================== --- include/llvm/ADT/STLExtras.h +++ include/llvm/ADT/STLExtras.h @@ -1274,11 +1274,8 @@ result_pair(std::size_t Index, IterOfRange Iter) : Index(Index), Iter(Iter) {} - result_pair &operator=(const result_pair &Other) { - Index = Other.Index; - Iter = Other.Iter; - return *this; - } + result_pair(const result_pair &) = default; + result_pair &operator=(const result_pair &) = default; std::size_t index() const { return Index; } const ValueOfRange &value() const { return *Iter; } @@ -1322,10 +1319,8 @@ return Result.Iter == RHS.Result.Iter; } - enumerator_iter &operator=(const enumerator_iter &Other) { - Result = Other.Result; - return *this; - } + enumerator_iter(const enumerator_iter &) = default; + enumerator_iter &operator=(const enumerator_iter &) = default; private: result_type Result; Index: include/llvm/DebugInfo/CodeView/DebugSubsection.h =================================================================== --- include/llvm/DebugInfo/CodeView/DebugSubsection.h +++ include/llvm/DebugInfo/CodeView/DebugSubsection.h @@ -20,7 +20,7 @@ class DebugSubsectionRef { public: explicit DebugSubsectionRef(DebugSubsectionKind Kind) : Kind(Kind) {} - virtual ~DebugSubsectionRef(); + virtual ~DebugSubsectionRef() = default; static bool classof(const DebugSubsectionRef *S) { return true; } @@ -33,7 +33,7 @@ class DebugSubsection { public: explicit DebugSubsection(DebugSubsectionKind Kind) : Kind(Kind) {} - virtual ~DebugSubsection(); + virtual ~DebugSubsection() = default; static bool classof(const DebugSubsection *S) { return true; } Index: include/llvm/DebugInfo/PDB/Native/DbiModuleDescriptor.h =================================================================== --- include/llvm/DebugInfo/PDB/Native/DbiModuleDescriptor.h +++ include/llvm/DebugInfo/PDB/Native/DbiModuleDescriptor.h @@ -26,9 +26,9 @@ friend class DbiStreamBuilder; public: - DbiModuleDescriptor(); - DbiModuleDescriptor(const DbiModuleDescriptor &Info); - ~DbiModuleDescriptor(); + DbiModuleDescriptor() = default; + DbiModuleDescriptor(const DbiModuleDescriptor &Info) = default; + ~DbiModuleDescriptor() = default; static Error initialize(BinaryStreamRef Stream, DbiModuleDescriptor &Info); Index: include/llvm/DebugInfo/PDB/Native/HashTable.h =================================================================== --- include/llvm/DebugInfo/PDB/Native/HashTable.h +++ include/llvm/DebugInfo/PDB/Native/HashTable.h @@ -57,10 +57,9 @@ } } - HashTableIterator &operator=(const HashTableIterator &R) { - Map = R.Map; - return *this; - } + HashTableIterator &operator=(const HashTableIterator &R) = default; + HashTableIterator(const HashTableIterator &R) = default; + bool operator==(const HashTableIterator &R) const { if (IsEnd && R.IsEnd) return true; Index: include/llvm/MC/StringTableBuilder.h =================================================================== --- include/llvm/MC/StringTableBuilder.h +++ include/llvm/MC/StringTableBuilder.h @@ -37,7 +37,7 @@ public: StringTableBuilder(Kind K, unsigned Alignment = 1); - ~StringTableBuilder(); + ~StringTableBuilder() = default; /// Add a string to the builder. Returns the position of S in the /// table. The position will be changed if finalize is used. Index: include/llvm/ObjectYAML/MachOYAML.h =================================================================== --- include/llvm/ObjectYAML/MachOYAML.h +++ include/llvm/ObjectYAML/MachOYAML.h @@ -54,7 +54,7 @@ }; struct LoadCommand { - virtual ~LoadCommand(); + virtual ~LoadCommand() = default; llvm::MachO::macho_load_command Data; std::vector
Sections; Index: include/llvm/ProfileData/Coverage/CoverageMappingReader.h =================================================================== --- include/llvm/ProfileData/Coverage/CoverageMappingReader.h +++ include/llvm/ProfileData/Coverage/CoverageMappingReader.h @@ -59,6 +59,9 @@ increment(); } + CoverageMappingIterator(const CoverageMappingIterator &) = default; + CoverageMappingIterator &operator=(const CoverageMappingIterator &) = default; + ~CoverageMappingIterator() { if (ReadErr != coveragemap_error::success) llvm_unreachable("Unexpected error in coverage mapping iterator"); Index: include/llvm/Support/BinaryStreamArray.h =================================================================== --- include/llvm/Support/BinaryStreamArray.h +++ include/llvm/Support/BinaryStreamArray.h @@ -311,12 +311,9 @@ FixedStreamArrayIterator(const FixedStreamArray &Array, uint32_t Index) : Array(Array), Index(Index) {} + FixedStreamArrayIterator(const FixedStreamArrayIterator &) = default; FixedStreamArrayIterator & - operator=(const FixedStreamArrayIterator &Other) { - Array = Other.Array; - Index = Other.Index; - return *this; - } + operator=(const FixedStreamArrayIterator &) = default; const T &operator*() const { return Array[Index]; } const T &operator*() { return Array[Index]; } Index: include/llvm/Support/FormatVariadicDetails.h =================================================================== --- include/llvm/Support/FormatVariadicDetails.h +++ include/llvm/Support/FormatVariadicDetails.h @@ -22,7 +22,7 @@ namespace detail { class format_adapter { protected: - virtual ~format_adapter() {} + virtual ~format_adapter() = default; public: virtual void format(raw_ostream &S, StringRef Options) = 0; Index: include/llvm/Support/WithColor.h =================================================================== --- include/llvm/Support/WithColor.h +++ include/llvm/Support/WithColor.h @@ -42,6 +42,7 @@ public: /// To be used like this: WithColor(OS, HighlightColor::String) << "text"; WithColor(raw_ostream &OS, HighlightColor S); + WithColor(const WithColor &) = default; ~WithColor(); raw_ostream &get() { return OS; } Index: lib/DebugInfo/CodeView/DebugSubsection.cpp =================================================================== --- lib/DebugInfo/CodeView/DebugSubsection.cpp +++ lib/DebugInfo/CodeView/DebugSubsection.cpp @@ -10,7 +10,3 @@ #include "llvm/DebugInfo/CodeView/DebugSubsection.h" using namespace llvm::codeview; - -DebugSubsectionRef::~DebugSubsectionRef() {} - -DebugSubsection::~DebugSubsection() {} Index: lib/DebugInfo/PDB/Native/DbiModuleDescriptor.cpp =================================================================== --- lib/DebugInfo/PDB/Native/DbiModuleDescriptor.cpp +++ lib/DebugInfo/PDB/Native/DbiModuleDescriptor.cpp @@ -19,13 +19,6 @@ using namespace llvm::pdb; using namespace llvm::support; -DbiModuleDescriptor::DbiModuleDescriptor() = default; - -DbiModuleDescriptor::DbiModuleDescriptor(const DbiModuleDescriptor &Info) = - default; - -DbiModuleDescriptor::~DbiModuleDescriptor() = default; - Error DbiModuleDescriptor::initialize(BinaryStreamRef Stream, DbiModuleDescriptor &Info) { BinaryStreamReader Reader(Stream); Index: lib/MC/StringTableBuilder.cpp =================================================================== --- lib/MC/StringTableBuilder.cpp +++ lib/MC/StringTableBuilder.cpp @@ -24,8 +24,6 @@ using namespace llvm; -StringTableBuilder::~StringTableBuilder() = default; - void StringTableBuilder::initSize() { // Account for leading bytes in table so that offsets returned from add are // correct. Index: lib/ObjectYAML/MachOYAML.cpp =================================================================== --- lib/ObjectYAML/MachOYAML.cpp +++ lib/ObjectYAML/MachOYAML.cpp @@ -24,8 +24,6 @@ namespace llvm { -MachOYAML::LoadCommand::~LoadCommand() = default; - bool MachOYAML::LinkEditData::isEmpty() const { return 0 == RebaseOpcodes.size() + BindOpcodes.size() + WeakBindOpcodes.size() + Index: lib/Target/AMDGPU/AMDGPULibFunc.h =================================================================== --- lib/Target/AMDGPU/AMDGPULibFunc.h +++ lib/Target/AMDGPU/AMDGPULibFunc.h @@ -324,7 +324,7 @@ class AMDGPULibFuncImpl : public AMDGPULibFuncBase { public: AMDGPULibFuncImpl() {} - virtual ~AMDGPULibFuncImpl() {} + virtual ~AMDGPULibFuncImpl() = default; /// Get unmangled name for mangled library function and name for unmangled /// library function. Index: lib/Target/Hexagon/HexagonConstPropagation.cpp =================================================================== --- lib/Target/Hexagon/HexagonConstPropagation.cpp +++ lib/Target/Hexagon/HexagonConstPropagation.cpp @@ -132,6 +132,16 @@ uint32_t properties() const; unsigned size() const { return Size; } + LatticeCell(const LatticeCell &L) { + // This memcpy also copies Properties (when L.Size == 0). + uint32_t N = + L.IsSpecial ? sizeof L.Properties : L.Size * sizeof(const Constant *); + memcpy(Values, L.Values, N); + Kind = L.Kind; + Size = L.Size; + IsSpecial = L.IsSpecial; + } + LatticeCell &operator= (const LatticeCell &L) { if (this != &L) { // This memcpy also copies Properties (when L.Size == 0). Index: lib/Target/Hexagon/HexagonGenInsert.cpp =================================================================== --- lib/Target/Hexagon/HexagonGenInsert.cpp +++ lib/Target/Hexagon/HexagonGenInsert.cpp @@ -92,7 +92,8 @@ struct RegisterSet : private BitVector { RegisterSet() = default; explicit RegisterSet(unsigned s, bool t = false) : BitVector(s, t) {} - RegisterSet(const RegisterSet &RS) : BitVector(RS) {} + RegisterSet(const RegisterSet &RS) = default; + RegisterSet &operator=(const RegisterSet &RS) = default; using BitVector::clear; Index: tools/llvm-cov/CoverageExporter.h =================================================================== --- tools/llvm-cov/CoverageExporter.h +++ tools/llvm-cov/CoverageExporter.h @@ -38,7 +38,7 @@ : Coverage(CoverageMapping), Options(Options), OS(OS) {} public: - virtual ~CoverageExporter(){}; + virtual ~CoverageExporter() = default; /// Render the CoverageMapping object. virtual void renderRoot(const CoverageFilters &IgnoreFilters) = 0; Index: tools/llvm-rc/ResourceScriptStmt.h =================================================================== --- tools/llvm-rc/ResourceScriptStmt.h +++ tools/llvm-rc/ResourceScriptStmt.h @@ -167,7 +167,7 @@ }; RCResource() {} RCResource(uint16_t Flags) : MemoryFlags(Flags) {} - virtual ~RCResource() {} + virtual ~RCResource() = default; virtual Error visit(Visitor *) const { llvm_unreachable("This is unable to call methods from Visitor base"); @@ -431,7 +431,7 @@ virtual raw_ostream &log(raw_ostream &OS) const { return OS << "Base menu definition\n"; } - virtual ~MenuDefinition() {} + virtual ~MenuDefinition() = default; virtual uint16_t getResFlags() const { return 0; } virtual MenuDefKind getKind() const { return MkBase; } @@ -680,7 +680,7 @@ enum StmtKind { StBase = 0, StBlock = 1, StValue = 2 }; virtual raw_ostream &log(raw_ostream &OS) const { return OS << "VI stmt\n"; } - virtual ~VersionInfoStmt() {} + virtual ~VersionInfoStmt() = default; virtual StmtKind getKind() const { return StBase; } static bool classof(const VersionInfoStmt *S) { Index: unittests/ADT/BumpPtrListTest.cpp =================================================================== --- unittests/ADT/BumpPtrListTest.cpp +++ unittests/ADT/BumpPtrListTest.cpp @@ -17,6 +17,8 @@ struct CountsDestructors { static unsigned NumCalls; + CountsDestructors() = default; + CountsDestructors(const CountsDestructors &) = default; ~CountsDestructors() { ++NumCalls; } }; unsigned CountsDestructors::NumCalls = 0; Index: unittests/ADT/TestGraph.h =================================================================== --- unittests/ADT/TestGraph.h +++ unittests/ADT/TestGraph.h @@ -176,8 +176,8 @@ public: /// ChildIterator - Copy constructor. - ChildIterator(const ChildIterator& other) : FirstNode(other.FirstNode), - Children(other.Children) {} + ChildIterator(const ChildIterator& other) = default; + ChildIterator &operator=(const ChildIterator& other) = default; /// Comparison operators. bool operator==(const ChildIterator &other) const { Index: utils/unittest/googlemock/include/gmock/gmock-actions.h =================================================================== --- utils/unittest/googlemock/include/gmock/gmock-actions.h +++ utils/unittest/googlemock/include/gmock/gmock-actions.h @@ -366,7 +366,8 @@ explicit Action(ActionInterface* impl) : impl_(impl) {} // Copy constructor. - Action(const Action& action) : impl_(action.impl_) {} + Action(const Action &action) = default; + Action &operator=(const Action &action) = default; // This constructor allows us to turn an Action object into an // Action, as long as F's arguments can be implicitly converted Index: utils/unittest/googlemock/include/gmock/gmock-matchers.h =================================================================== --- utils/unittest/googlemock/include/gmock/gmock-matchers.h +++ utils/unittest/googlemock/include/gmock/gmock-matchers.h @@ -291,7 +291,7 @@ explicit MatcherBase(const MatcherInterface* impl) : impl_(impl) {} - virtual ~MatcherBase() {} + virtual ~MatcherBase() = default; private: // shared_ptr (util/gtl/shared_ptr.h) and linked_ptr have similar Index: utils/unittest/googlemock/include/gmock/gmock-spec-builders.h =================================================================== --- utils/unittest/googlemock/include/gmock/gmock-spec-builders.h +++ utils/unittest/googlemock/include/gmock/gmock-spec-builders.h @@ -487,9 +487,9 @@ class GTEST_API_ Expectation { public: // Constructs a null object that doesn't reference any expectation. - Expectation(); + Expectation() = default; - ~Expectation(); + ~Expectation() = default; // This single-argument ctor must not be explicit, in order to support the // Expectation e = EXPECT_CALL(...); Index: utils/unittest/googlemock/src/gmock-spec-builders.cc =================================================================== --- utils/unittest/googlemock/src/gmock-spec-builders.cc +++ utils/unittest/googlemock/src/gmock-spec-builders.cc @@ -782,14 +782,10 @@ // needed by VerifyAndClearExpectationsLocked(). } -Expectation::Expectation() {} - Expectation::Expectation( const internal::linked_ptr& an_expectation_base) : expectation_base_(an_expectation_base) {} -Expectation::~Expectation() {} - // Adds an expectation to a sequence. void Sequence::AddExpectation(const Expectation& expectation) const { if (*last_expectation_ != expectation) { Index: utils/unittest/googletest/include/gtest/internal/gtest-param-util-generated.h =================================================================== --- utils/unittest/googletest/include/gtest/internal/gtest-param-util-generated.h +++ utils/unittest/googletest/include/gtest/internal/gtest-param-util-generated.h @@ -86,7 +86,7 @@ private: // No implementation - assignment is unsupported. - void operator=(const ValueArray1& other); + void operator=(const ValueArray1& other) = delete; const T1 v1_; }; @@ -104,7 +104,7 @@ private: // No implementation - assignment is unsupported. - void operator=(const ValueArray2& other); + void operator=(const ValueArray2& other) = delete; const T1 v1_; const T2 v2_; @@ -124,7 +124,7 @@ private: // No implementation - assignment is unsupported. - void operator=(const ValueArray3& other); + void operator=(const ValueArray3& other) = delete; const T1 v1_; const T2 v2_; @@ -146,7 +146,7 @@ private: // No implementation - assignment is unsupported. - void operator=(const ValueArray4& other); + void operator=(const ValueArray4& other) = delete; const T1 v1_; const T2 v2_; @@ -169,7 +169,7 @@ private: // No implementation - assignment is unsupported. - void operator=(const ValueArray5& other); + void operator=(const ValueArray5& other) = delete; const T1 v1_; const T2 v2_; @@ -195,7 +195,7 @@ private: // No implementation - assignment is unsupported. - void operator=(const ValueArray6& other); + void operator=(const ValueArray6& other) = delete; const T1 v1_; const T2 v2_; @@ -222,7 +222,7 @@ private: // No implementation - assignment is unsupported. - void operator=(const ValueArray7& other); + void operator=(const ValueArray7& other) = delete; const T1 v1_; const T2 v2_; @@ -251,7 +251,7 @@ private: // No implementation - assignment is unsupported. - void operator=(const ValueArray8& other); + void operator=(const ValueArray8& other) = delete; const T1 v1_; const T2 v2_; @@ -282,7 +282,7 @@ private: // No implementation - assignment is unsupported. - void operator=(const ValueArray9& other); + void operator=(const ValueArray9& other) = delete; const T1 v1_; const T2 v2_; @@ -314,7 +314,7 @@ private: // No implementation - assignment is unsupported. - void operator=(const ValueArray10& other); + void operator=(const ValueArray10& other) = delete; const T1 v1_; const T2 v2_; @@ -348,7 +348,7 @@ private: // No implementation - assignment is unsupported. - void operator=(const ValueArray11& other); + void operator=(const ValueArray11& other) = delete; const T1 v1_; const T2 v2_; @@ -384,7 +384,7 @@ private: // No implementation - assignment is unsupported. - void operator=(const ValueArray12& other); + void operator=(const ValueArray12& other) = delete; const T1 v1_; const T2 v2_; @@ -422,7 +422,7 @@ private: // No implementation - assignment is unsupported. - void operator=(const ValueArray13& other); + void operator=(const ValueArray13& other) = delete; const T1 v1_; const T2 v2_; @@ -461,7 +461,7 @@ private: // No implementation - assignment is unsupported. - void operator=(const ValueArray14& other); + void operator=(const ValueArray14& other) = delete; const T1 v1_; const T2 v2_; @@ -502,7 +502,7 @@ private: // No implementation - assignment is unsupported. - void operator=(const ValueArray15& other); + void operator=(const ValueArray15& other) = delete; const T1 v1_; const T2 v2_; @@ -546,7 +546,7 @@ private: // No implementation - assignment is unsupported. - void operator=(const ValueArray16& other); + void operator=(const ValueArray16& other) = delete; const T1 v1_; const T2 v2_; @@ -591,7 +591,7 @@ private: // No implementation - assignment is unsupported. - void operator=(const ValueArray17& other); + void operator=(const ValueArray17& other) = delete; const T1 v1_; const T2 v2_; @@ -638,7 +638,7 @@ private: // No implementation - assignment is unsupported. - void operator=(const ValueArray18& other); + void operator=(const ValueArray18& other) = delete; const T1 v1_; const T2 v2_; @@ -686,7 +686,7 @@ private: // No implementation - assignment is unsupported. - void operator=(const ValueArray19& other); + void operator=(const ValueArray19& other) = delete; const T1 v1_; const T2 v2_; @@ -736,7 +736,7 @@ private: // No implementation - assignment is unsupported. - void operator=(const ValueArray20& other); + void operator=(const ValueArray20& other) = delete; const T1 v1_; const T2 v2_; @@ -789,7 +789,7 @@ private: // No implementation - assignment is unsupported. - void operator=(const ValueArray21& other); + void operator=(const ValueArray21& other) = delete; const T1 v1_; const T2 v2_; @@ -843,7 +843,7 @@ private: // No implementation - assignment is unsupported. - void operator=(const ValueArray22& other); + void operator=(const ValueArray22& other) = delete; const T1 v1_; const T2 v2_; @@ -899,7 +899,7 @@ private: // No implementation - assignment is unsupported. - void operator=(const ValueArray23& other); + void operator=(const ValueArray23& other) = delete; const T1 v1_; const T2 v2_; @@ -957,7 +957,7 @@ private: // No implementation - assignment is unsupported. - void operator=(const ValueArray24& other); + void operator=(const ValueArray24& other) = delete; const T1 v1_; const T2 v2_; @@ -1016,7 +1016,7 @@ private: // No implementation - assignment is unsupported. - void operator=(const ValueArray25& other); + void operator=(const ValueArray25& other) = delete; const T1 v1_; const T2 v2_; @@ -1077,7 +1077,7 @@ private: // No implementation - assignment is unsupported. - void operator=(const ValueArray26& other); + void operator=(const ValueArray26& other) = delete; const T1 v1_; const T2 v2_; @@ -1141,7 +1141,7 @@ private: // No implementation - assignment is unsupported. - void operator=(const ValueArray27& other); + void operator=(const ValueArray27& other) = delete; const T1 v1_; const T2 v2_; @@ -1206,7 +1206,7 @@ private: // No implementation - assignment is unsupported. - void operator=(const ValueArray28& other); + void operator=(const ValueArray28& other) = delete; const T1 v1_; const T2 v2_; @@ -1272,7 +1272,7 @@ private: // No implementation - assignment is unsupported. - void operator=(const ValueArray29& other); + void operator=(const ValueArray29& other) = delete; const T1 v1_; const T2 v2_; @@ -1341,7 +1341,7 @@ private: // No implementation - assignment is unsupported. - void operator=(const ValueArray30& other); + void operator=(const ValueArray30& other) = delete; const T1 v1_; const T2 v2_; @@ -1412,7 +1412,7 @@ private: // No implementation - assignment is unsupported. - void operator=(const ValueArray31& other); + void operator=(const ValueArray31& other) = delete; const T1 v1_; const T2 v2_; @@ -1484,7 +1484,7 @@ private: // No implementation - assignment is unsupported. - void operator=(const ValueArray32& other); + void operator=(const ValueArray32& other) = delete; const T1 v1_; const T2 v2_; @@ -1559,7 +1559,7 @@ private: // No implementation - assignment is unsupported. - void operator=(const ValueArray33& other); + void operator=(const ValueArray33& other) = delete; const T1 v1_; const T2 v2_; @@ -1635,7 +1635,7 @@ private: // No implementation - assignment is unsupported. - void operator=(const ValueArray34& other); + void operator=(const ValueArray34& other) = delete; const T1 v1_; const T2 v2_; @@ -1712,7 +1712,7 @@ private: // No implementation - assignment is unsupported. - void operator=(const ValueArray35& other); + void operator=(const ValueArray35& other) = delete; const T1 v1_; const T2 v2_; @@ -1792,7 +1792,7 @@ private: // No implementation - assignment is unsupported. - void operator=(const ValueArray36& other); + void operator=(const ValueArray36& other) = delete; const T1 v1_; const T2 v2_; @@ -1874,7 +1874,7 @@ private: // No implementation - assignment is unsupported. - void operator=(const ValueArray37& other); + void operator=(const ValueArray37& other) = delete; const T1 v1_; const T2 v2_; @@ -1957,7 +1957,7 @@ private: // No implementation - assignment is unsupported. - void operator=(const ValueArray38& other); + void operator=(const ValueArray38& other) = delete; const T1 v1_; const T2 v2_; @@ -2042,7 +2042,7 @@ private: // No implementation - assignment is unsupported. - void operator=(const ValueArray39& other); + void operator=(const ValueArray39& other) = delete; const T1 v1_; const T2 v2_; @@ -2129,7 +2129,7 @@ private: // No implementation - assignment is unsupported. - void operator=(const ValueArray40& other); + void operator=(const ValueArray40& other) = delete; const T1 v1_; const T2 v2_; @@ -2218,7 +2218,7 @@ private: // No implementation - assignment is unsupported. - void operator=(const ValueArray41& other); + void operator=(const ValueArray41& other) = delete; const T1 v1_; const T2 v2_; @@ -2309,7 +2309,7 @@ private: // No implementation - assignment is unsupported. - void operator=(const ValueArray42& other); + void operator=(const ValueArray42& other) = delete; const T1 v1_; const T2 v2_; @@ -2401,7 +2401,7 @@ private: // No implementation - assignment is unsupported. - void operator=(const ValueArray43& other); + void operator=(const ValueArray43& other) = delete; const T1 v1_; const T2 v2_; @@ -2495,7 +2495,7 @@ private: // No implementation - assignment is unsupported. - void operator=(const ValueArray44& other); + void operator=(const ValueArray44& other) = delete; const T1 v1_; const T2 v2_; @@ -2591,7 +2591,7 @@ private: // No implementation - assignment is unsupported. - void operator=(const ValueArray45& other); + void operator=(const ValueArray45& other) = delete; const T1 v1_; const T2 v2_; @@ -2689,7 +2689,7 @@ private: // No implementation - assignment is unsupported. - void operator=(const ValueArray46& other); + void operator=(const ValueArray46& other) = delete; const T1 v1_; const T2 v2_; @@ -2789,7 +2789,7 @@ private: // No implementation - assignment is unsupported. - void operator=(const ValueArray47& other); + void operator=(const ValueArray47& other) = delete; const T1 v1_; const T2 v2_; @@ -2891,7 +2891,7 @@ private: // No implementation - assignment is unsupported. - void operator=(const ValueArray48& other); + void operator=(const ValueArray48& other) = delete; const T1 v1_; const T2 v2_; @@ -2994,7 +2994,7 @@ private: // No implementation - assignment is unsupported. - void operator=(const ValueArray49& other); + void operator=(const ValueArray49& other) = delete; const T1 v1_; const T2 v2_; @@ -3098,7 +3098,7 @@ private: // No implementation - assignment is unsupported. - void operator=(const ValueArray50& other); + void operator=(const ValueArray50& other) = delete; const T1 v1_; const T2 v2_; @@ -3251,7 +3251,7 @@ } // No implementation - assignment is unsupported. - void operator=(const Iterator& other); + void operator=(const Iterator& other) = delete; const ParamGeneratorInterface* const base_; // begin[i]_ and end[i]_ define the i-th range that Iterator traverses. @@ -3266,7 +3266,7 @@ }; // class CartesianProductGenerator2::Iterator // No implementation - assignment is unsupported. - void operator=(const CartesianProductGenerator2& other); + void operator=(const CartesianProductGenerator2& other) = delete; const ParamGenerator g1_; const ParamGenerator g2_; @@ -3379,7 +3379,7 @@ } // No implementation - assignment is unsupported. - void operator=(const Iterator& other); + void operator=(const Iterator& other) = delete; const ParamGeneratorInterface* const base_; // begin[i]_ and end[i]_ define the i-th range that Iterator traverses. @@ -3397,7 +3397,7 @@ }; // class CartesianProductGenerator3::Iterator // No implementation - assignment is unsupported. - void operator=(const CartesianProductGenerator3& other); + void operator=(const CartesianProductGenerator3& other) = delete; const ParamGenerator g1_; const ParamGenerator g2_; @@ -3526,7 +3526,7 @@ } // No implementation - assignment is unsupported. - void operator=(const Iterator& other); + void operator=(const Iterator& other) = delete; const ParamGeneratorInterface* const base_; // begin[i]_ and end[i]_ define the i-th range that Iterator traverses. @@ -3547,7 +3547,7 @@ }; // class CartesianProductGenerator4::Iterator // No implementation - assignment is unsupported. - void operator=(const CartesianProductGenerator4& other); + void operator=(const CartesianProductGenerator4& other) = delete; const ParamGenerator g1_; const ParamGenerator g2_; @@ -3689,7 +3689,7 @@ } // No implementation - assignment is unsupported. - void operator=(const Iterator& other); + void operator=(const Iterator& other) = delete; const ParamGeneratorInterface* const base_; // begin[i]_ and end[i]_ define the i-th range that Iterator traverses. @@ -3713,7 +3713,7 @@ }; // class CartesianProductGenerator5::Iterator // No implementation - assignment is unsupported. - void operator=(const CartesianProductGenerator5& other); + void operator=(const CartesianProductGenerator5& other) = delete; const ParamGenerator g1_; const ParamGenerator g2_; @@ -3871,7 +3871,7 @@ } // No implementation - assignment is unsupported. - void operator=(const Iterator& other); + void operator=(const Iterator& other) = delete; const ParamGeneratorInterface* const base_; // begin[i]_ and end[i]_ define the i-th range that Iterator traverses. @@ -3898,7 +3898,7 @@ }; // class CartesianProductGenerator6::Iterator // No implementation - assignment is unsupported. - void operator=(const CartesianProductGenerator6& other); + void operator=(const CartesianProductGenerator6& other) = delete; const ParamGenerator g1_; const ParamGenerator g2_; @@ -4070,7 +4070,7 @@ } // No implementation - assignment is unsupported. - void operator=(const Iterator& other); + void operator=(const Iterator& other) = delete; const ParamGeneratorInterface* const base_; // begin[i]_ and end[i]_ define the i-th range that Iterator traverses. @@ -4100,7 +4100,7 @@ }; // class CartesianProductGenerator7::Iterator // No implementation - assignment is unsupported. - void operator=(const CartesianProductGenerator7& other); + void operator=(const CartesianProductGenerator7& other) = delete; const ParamGenerator g1_; const ParamGenerator g2_; @@ -4288,7 +4288,7 @@ } // No implementation - assignment is unsupported. - void operator=(const Iterator& other); + void operator=(const Iterator& other) = delete; const ParamGeneratorInterface* const base_; // begin[i]_ and end[i]_ define the i-th range that Iterator traverses. @@ -4321,7 +4321,7 @@ }; // class CartesianProductGenerator8::Iterator // No implementation - assignment is unsupported. - void operator=(const CartesianProductGenerator8& other); + void operator=(const CartesianProductGenerator8& other) = delete; const ParamGenerator g1_; const ParamGenerator g2_; @@ -4523,7 +4523,7 @@ } // No implementation - assignment is unsupported. - void operator=(const Iterator& other); + void operator=(const Iterator& other) = delete; const ParamGeneratorInterface* const base_; // begin[i]_ and end[i]_ define the i-th range that Iterator traverses. @@ -4559,7 +4559,7 @@ }; // class CartesianProductGenerator9::Iterator // No implementation - assignment is unsupported. - void operator=(const CartesianProductGenerator9& other); + void operator=(const CartesianProductGenerator9& other) = delete; const ParamGenerator g1_; const ParamGenerator g2_; @@ -4775,7 +4775,7 @@ } // No implementation - assignment is unsupported. - void operator=(const Iterator& other); + void operator=(const Iterator& other) = delete; const ParamGeneratorInterface* const base_; // begin[i]_ and end[i]_ define the i-th range that Iterator traverses. @@ -4814,7 +4814,7 @@ }; // class CartesianProductGenerator10::Iterator // No implementation - assignment is unsupported. - void operator=(const CartesianProductGenerator10& other); + void operator=(const CartesianProductGenerator10& other) = delete; const ParamGenerator g1_; const ParamGenerator g2_; @@ -4850,7 +4850,7 @@ private: // No implementation - assignment is unsupported. - void operator=(const CartesianProductHolder2& other); + void operator=(const CartesianProductHolder2& other) = delete; const Generator1 g1_; const Generator2 g2_; @@ -4873,7 +4873,7 @@ private: // No implementation - assignment is unsupported. - void operator=(const CartesianProductHolder3& other); + void operator=(const CartesianProductHolder3& other) = delete; const Generator1 g1_; const Generator2 g2_; @@ -4899,7 +4899,7 @@ private: // No implementation - assignment is unsupported. - void operator=(const CartesianProductHolder4& other); + void operator=(const CartesianProductHolder4& other) = delete; const Generator1 g1_; const Generator2 g2_; @@ -4927,7 +4927,7 @@ private: // No implementation - assignment is unsupported. - void operator=(const CartesianProductHolder5& other); + void operator=(const CartesianProductHolder5& other) = delete; const Generator1 g1_; const Generator2 g2_; @@ -4959,7 +4959,7 @@ private: // No implementation - assignment is unsupported. - void operator=(const CartesianProductHolder6& other); + void operator=(const CartesianProductHolder6& other) = delete; const Generator1 g1_; const Generator2 g2_; @@ -4994,7 +4994,7 @@ private: // No implementation - assignment is unsupported. - void operator=(const CartesianProductHolder7& other); + void operator=(const CartesianProductHolder7& other) = delete; const Generator1 g1_; const Generator2 g2_; @@ -5033,7 +5033,7 @@ private: // No implementation - assignment is unsupported. - void operator=(const CartesianProductHolder8& other); + void operator=(const CartesianProductHolder8& other) = delete; const Generator1 g1_; const Generator2 g2_; @@ -5076,7 +5076,7 @@ private: // No implementation - assignment is unsupported. - void operator=(const CartesianProductHolder9& other); + void operator=(const CartesianProductHolder9& other) = delete; const Generator1 g1_; const Generator2 g2_; @@ -5122,7 +5122,7 @@ private: // No implementation - assignment is unsupported. - void operator=(const CartesianProductHolder10& other); + void operator=(const CartesianProductHolder10& other) = delete; const Generator1 g1_; const Generator2 g2_; Index: utils/unittest/googletest/include/gtest/internal/gtest-port.h =================================================================== --- utils/unittest/googletest/include/gtest/internal/gtest-port.h +++ utils/unittest/googletest/include/gtest/internal/gtest-port.h @@ -870,12 +870,12 @@ // A macro to disallow operator= // This should be used in the private: declarations for a class. #define GTEST_DISALLOW_ASSIGN_(type)\ - void operator=(type const &) + void operator=(type const &) = delete // A macro to disallow copy constructor and operator= // This should be used in the private: declarations for a class. #define GTEST_DISALLOW_COPY_AND_ASSIGN_(type)\ - type(type const &);\ + type(type const &) = delete;\ GTEST_DISALLOW_ASSIGN_(type) // Tell the compiler to warn about unused return values for functions declared