소스 검색

cleanup: Prefer compiler provided special member functions

Regina Pfeifer 7 년 전
부모
커밋
094f01d0f0

+ 0 - 1
Source/CTest/cmCTestGIT.cxx

@@ -475,7 +475,6 @@ private:
     std::string EMail;
     unsigned long Time = 0;
     long TimeZone = 0;
-    Person() = default;
   };
 
   void ParsePerson(const char* str, Person& person)

+ 0 - 1
Source/CTest/cmCTestMultiProcessHandler.cxx

@@ -44,7 +44,6 @@ public:
     : Handler(handler)
   {
   }
-  ~TestComparator() = default;
 
   // Sorts tests in descending order of cost
   bool operator()(int index1, int index2) const

+ 0 - 2
Source/CTest/cmCTestRunTest.h

@@ -27,8 +27,6 @@ class cmCTestRunTest
 public:
   explicit cmCTestRunTest(cmCTestMultiProcessHandler& multiHandler);
 
-  ~cmCTestRunTest() = default;
-
   void SetNumberOfRuns(int n) { this->NumberOfRunsLeft = n; }
   void SetRunUntilFailOn() { this->RunUntilFail = true; }
   void SetTestProperties(cmCTestTestHandler::cmCTestTestProperties* prop)

+ 0 - 2
Source/CTest/cmCTestScriptHandler.cxx

@@ -53,8 +53,6 @@ struct cmListFileFunction;
 class cmCTestScriptFunctionBlocker : public cmFunctionBlocker
 {
 public:
-  cmCTestScriptFunctionBlocker() = default;
-  ~cmCTestScriptFunctionBlocker() override = default;
   bool IsFunctionBlocked(const cmListFileFunction& lff, cmMakefile& mf,
                          cmExecutionStatus& /*status*/) override;
   // virtual bool ShouldRemove(const cmListFileFunction& lff, cmMakefile &mf);

+ 1 - 5
Source/CTest/cmCTestSubmitHandler.cxx

@@ -29,10 +29,6 @@ typedef std::vector<char> cmCTestSubmitHandlerVectorOfChar;
 
 class cmCTestSubmitHandler::ResponseParser : public cmXMLParser
 {
-public:
-  ResponseParser() { this->Status = STATUS_OK; }
-  ~ResponseParser() override = default;
-
 public:
   enum StatusType
   {
@@ -41,7 +37,7 @@ public:
     STATUS_ERROR
   };
 
-  StatusType Status;
+  StatusType Status = STATUS_OK;
   std::string Filename;
   std::string MD5;
   std::string Message;

+ 5 - 12
Source/CTest/cmParseCoberturaCoverage.cxx

@@ -13,19 +13,12 @@ class cmParseCoberturaCoverage::XMLParser : public cmXMLParser
 {
 public:
   XMLParser(cmCTest* ctest, cmCTestCoverageHandlerContainer& cont)
-    : CTest(ctest)
+    : FilePaths{ cont.SourceDir, cont.BinaryDir }
+    , CTest(ctest)
     , Coverage(cont)
   {
-    this->InSources = false;
-    this->InSource = false;
-    this->SkipThisClass = false;
-    this->FilePaths.push_back(this->Coverage.SourceDir);
-    this->FilePaths.push_back(this->Coverage.BinaryDir);
-    this->CurFileName.clear();
   }
 
-  ~XMLParser() override = default;
-
 protected:
   void EndElement(const std::string& name) override
   {
@@ -144,9 +137,9 @@ protected:
   }
 
 private:
-  bool InSources;
-  bool InSource;
-  bool SkipThisClass;
+  bool InSources = false;
+  bool InSource = false;
+  bool SkipThisClass = false;
   std::vector<std::string> FilePaths;
   typedef cmCTestCoverageHandlerContainer::SingleFileCoverageVector
     FileLinesType;

+ 0 - 5
Source/CTest/cmParseJacocoCoverage.cxx

@@ -18,13 +18,8 @@ public:
     : CTest(ctest)
     , Coverage(cont)
   {
-    this->FilePath.clear();
-    this->PackagePath.clear();
-    this->PackageName.clear();
   }
 
-  ~XMLParser() override = default;
-
 protected:
   void EndElement(const std::string& /*name*/) override {}
 

+ 0 - 1
Source/cmCPluginAPI.cxx

@@ -474,7 +474,6 @@ int CCONV cmGetTotalArgumentSize(int argc, char** argv)
 // API for source files.
 struct cmCPluginAPISourceFile
 {
-  cmCPluginAPISourceFile() = default;
   cmSourceFile* RealSourceFile = nullptr;
   std::string SourceName;
   std::string SourceExtension;

+ 0 - 2
Source/cmCTest.h

@@ -57,8 +57,6 @@ public:
   /** Representation of one part.  */
   struct PartInfo
   {
-    PartInfo() = default;
-
     void SetName(const std::string& name) { this->Name = name; }
     const std::string& GetName() const { return this->Name; }
 

+ 0 - 1
Source/cmCacheManager.h

@@ -42,7 +42,6 @@ private:
     void AppendProperty(const std::string& property, const char* value,
                         bool asString = false);
     bool Initialized = false;
-    CacheEntry() = default;
   };
 
 public:

+ 0 - 2
Source/cmCommandArgumentsHelper.h

@@ -172,8 +172,6 @@ class cmCommandArgumentGroup
   friend class cmCommandArgument;
 
 public:
-  cmCommandArgumentGroup() = default;
-
   /// All members of this group may follow the given argument
   void Follows(const cmCommandArgument* arg);
 

+ 0 - 2
Source/cmComputeLinkDepends.h

@@ -38,8 +38,6 @@ public:
     cmGeneratorTarget const* Target = nullptr;
     bool IsSharedDep = false;
     bool IsFlag = false;
-    LinkEntry() = default;
-    LinkEntry(LinkEntry const& r) = default;
   };
 
   typedef std::vector<LinkEntry> EntryVector;

+ 0 - 1
Source/cmDependsC.h

@@ -75,7 +75,6 @@ public:
 
   struct cmIncludeLines
   {
-    cmIncludeLines() = default;
     std::vector<UnscannedEntry> UnscannedEntries;
     bool Used = false;
   };

+ 0 - 1
Source/cmDocumentation.h

@@ -115,7 +115,6 @@ private:
 
   struct RequestedHelpItem
   {
-    RequestedHelpItem() = default;
     cmDocumentationEnums::Type HelpType = None;
     std::string Filename;
     std::string Argument;

+ 0 - 2
Source/cmExecutionStatus.h

@@ -11,8 +11,6 @@
 class cmExecutionStatus
 {
 public:
-  cmExecutionStatus() = default;
-
   void Clear()
   {
     this->ReturnInvoked = false;

+ 0 - 1
Source/cmFileCommand.cxx

@@ -1102,7 +1102,6 @@ protected:
   {
     bool Exclude = false;
     mode_t Permissions = 0;
-    MatchProperties() = default;
   };
   struct MatchRule
   {

+ 0 - 3
Source/cmFileMonitor.cxx

@@ -19,7 +19,6 @@ void on_fs_close(uv_handle_t* handle);
 class cmIBaseWatcher
 {
 public:
-  cmIBaseWatcher() = default;
   virtual ~cmIBaseWatcher() = default;
 
   virtual void Trigger(const std::string& pathSegment, int events,
@@ -150,8 +149,6 @@ public:
     p->AddChildWatcher(ps, this);
   }
 
-  ~cmRealDirectoryWatcher() override = default;
-
   void StartWatching() final
   {
     if (!this->Handle) {

+ 0 - 1
Source/cmFindLibraryCommand.cxx

@@ -202,7 +202,6 @@ struct cmFindLibraryHelper
     bool TryRaw = false;
     std::string Raw;
     cmsys::RegularExpression Regex;
-    Name() = default;
   };
   std::vector<Name> Names;
 

+ 0 - 1
Source/cmFindPackageCommand.cxx

@@ -1688,7 +1688,6 @@ private:
 class cmFileList
 {
 public:
-  cmFileList() = default;
   virtual ~cmFileList() = default;
   cmFileList& operator/(cmFileListGeneratorBase const& rhs)
   {

+ 0 - 5
Source/cmFunctionCommand.cxx

@@ -14,11 +14,6 @@
 class cmFunctionHelperCommand : public cmCommand
 {
 public:
-  cmFunctionHelperCommand() = default;
-
-  ///! clean up any memory allocated by the function
-  ~cmFunctionHelperCommand() override = default;
-
   /**
    * This is a virtual constructor for the command.
    */

+ 1 - 3
Source/cmFunctionCommand.h

@@ -18,15 +18,13 @@ class cmMakefile;
 class cmFunctionFunctionBlocker : public cmFunctionBlocker
 {
 public:
-  cmFunctionFunctionBlocker() { this->Depth = 0; }
-  ~cmFunctionFunctionBlocker() override = default;
   bool IsFunctionBlocked(const cmListFileFunction&, cmMakefile& mf,
                          cmExecutionStatus&) override;
   bool ShouldRemove(const cmListFileFunction&, cmMakefile& mf) override;
 
   std::vector<std::string> Args;
   std::vector<cmListFileFunction> Functions;
-  int Depth;
+  int Depth = 0;
 };
 
 /// Starts function() ... endfunction() block

+ 0 - 5
Source/cmGeneratorTarget.h

@@ -111,7 +111,6 @@ public:
     std::set<std::string> ExpectedXamlHeaders;
     std::set<std::string> ExpectedXamlSources;
     bool Initialized = false;
-    KindedSources() = default;
   };
 
   /** Get all sources needed for a configuration with kinds assigned.  */
@@ -562,7 +561,6 @@ public:
   };
   struct SourceFileFlags
   {
-    SourceFileFlags() = default;
     SourceFileType Type = SourceFileTypeNormal;
     const char* MacFolder = nullptr; // location inside Mac content folders
   };
@@ -750,7 +748,6 @@ private:
 
   struct CompatibleInterfaces : public CompatibleInterfacesBase
   {
-    CompatibleInterfaces() = default;
     bool Done = false;
   };
   mutable std::map<std::string, CompatibleInterfaces> CompatibleInterfacesMap;
@@ -764,7 +761,6 @@ private:
 
   struct LinkImplClosure : public std::vector<cmGeneratorTarget const*>
   {
-    LinkImplClosure() = default;
     bool Done = false;
   };
   mutable std::map<std::string, LinkImplClosure> LinkImplClosureMap;
@@ -784,7 +780,6 @@ private:
   // Cache import information from properties for each configuration.
   struct ImportInfo
   {
-    ImportInfo() = default;
     bool NoSOName = false;
     ManagedType Managed = Native;
     unsigned int Multiplicity = 0;

+ 0 - 4
Source/cmGlobVerificationManager.h

@@ -21,9 +21,6 @@
  */
 class cmGlobVerificationManager
 {
-public:
-  cmGlobVerificationManager() = default;
-
 protected:
   ///! Save verification script for given makefile.
   ///! Saves to output <path>/<CMakeFilesDirectory>/VerifyGlobs.cmake
@@ -73,7 +70,6 @@ private:
     bool Initialized = false;
     std::vector<std::string> Files;
     std::vector<std::pair<std::string, cmListFileBacktrace>> Backtraces;
-    CacheEntryValue() = default;
   };
 
   typedef std::map<CacheEntryKey, CacheEntryValue> CacheEntryMap;

+ 0 - 2
Source/cmGlobalGenerator.h

@@ -479,7 +479,6 @@ protected:
     std::vector<std::string> Depends;
     std::string WorkingDir;
     bool UsesTerminal = false;
-    GlobalTargetInfo() = default;
   };
 
   void CreateDefaultGlobalTargets(std::vector<GlobalTargetInfo>& targets);
@@ -608,7 +607,6 @@ private:
     long LastDiskTime = -1;
     std::set<std::string> All;
     std::set<std::string> Generated;
-    DirectoryContent() = default;
   };
   std::map<std::string, DirectoryContent> DirectoryContentMap;
 

+ 0 - 2
Source/cmGlobalNinjaGenerator.h

@@ -183,8 +183,6 @@ public:
     return new cmGlobalGeneratorSimpleFactory<cmGlobalNinjaGenerator>();
   }
 
-  ~cmGlobalNinjaGenerator() override = default;
-
   cmLocalGenerator* CreateLocalGenerator(cmMakefile* mf) override;
 
   std::string GetName() const override

+ 0 - 1
Source/cmGlobalUnixMakefileGenerator3.h

@@ -217,7 +217,6 @@ protected:
   // Store per-target progress counters.
   struct TargetProgress
   {
-    TargetProgress() = default;
     unsigned long NumberOfActions = 0;
     std::string VariableFile;
     std::vector<unsigned long> Marks;

+ 3 - 10
Source/cmIfCommand.h

@@ -19,13 +19,6 @@ class cmMakefile;
 class cmIfFunctionBlocker : public cmFunctionBlocker
 {
 public:
-  cmIfFunctionBlocker()
-  {
-    this->HasRun = false;
-    this->ElseSeen = false;
-    this->ScopeDepth = 0;
-  }
-  ~cmIfFunctionBlocker() override = default;
   bool IsFunctionBlocked(const cmListFileFunction& lff, cmMakefile& mf,
                          cmExecutionStatus&) override;
   bool ShouldRemove(const cmListFileFunction& lff, cmMakefile& mf) override;
@@ -33,9 +26,9 @@ public:
   std::vector<cmListFileArgument> Args;
   std::vector<cmListFileFunction> Functions;
   bool IsBlocking;
-  bool HasRun;
-  bool ElseSeen;
-  unsigned int ScopeDepth;
+  bool HasRun = false;
+  bool ElseSeen = false;
+  unsigned int ScopeDepth = 0;
 };
 
 /// Starts an if block

+ 0 - 4
Source/cmLinkItem.h

@@ -77,13 +77,10 @@ struct cmLinkInterface : public cmLinkInterfaceLibraries
   std::vector<cmLinkItem> WrongConfigLibraries;
 
   bool ImplementationIsInterface = false;
-
-  cmLinkInterface() = default;
 };
 
 struct cmOptionalLinkInterface : public cmLinkInterface
 {
-  cmOptionalLinkInterface() = default;
   bool LibrariesDone = false;
   bool AllDone = false;
   bool Exists = false;
@@ -105,7 +102,6 @@ struct cmLinkImplementation : public cmLinkImplementationLibraries
 // Cache link implementation computation from each configuration.
 struct cmOptionalLinkImplementation : public cmLinkImplementation
 {
-  cmOptionalLinkImplementation() = default;
   bool LibrariesDone = false;
   bool LanguagesDone = false;
   bool HadHeadSensitiveCondition = false;

+ 0 - 10
Source/cmListFileCache.h

@@ -73,7 +73,6 @@ public:
   std::string Name;
   std::string FilePath;
   long Line = 0;
-  cmListFileContext() = default;
 
   static cmListFileContext FromCommandContext(cmCommandContext const& lfcc,
                                               std::string const& fileName)
@@ -110,15 +109,6 @@ public:
   // indicated by the given valid snapshot.
   cmListFileBacktrace(cmStateSnapshot const& snapshot);
 
-  // Backtraces may be copied, moved, and assigned as values.
-  cmListFileBacktrace(cmListFileBacktrace const&) = default;
-  cmListFileBacktrace(cmListFileBacktrace&&) // NOLINT(clang-tidy)
-    noexcept = default;
-  cmListFileBacktrace& operator=(cmListFileBacktrace const&) = default;
-  cmListFileBacktrace& operator=(cmListFileBacktrace&&) // NOLINT(clang-tidy)
-    noexcept = default;
-  ~cmListFileBacktrace() = default;
-
   cmStateSnapshot GetBottom() const;
 
   // Get a backtrace with the given file scope added to the top.

+ 0 - 1
Source/cmLocalUnixMakefileGenerator3.h

@@ -279,7 +279,6 @@ private:
     bool HasSourceExtension = false;
     bool HasPreprocessRule = false;
     bool HasAssembleRule = false;
-    LocalObjectInfo() = default;
   };
   void GetLocalObjectFiles(
     std::map<std::string, LocalObjectInfo>& localObjectFiles);

+ 0 - 5
Source/cmMacroCommand.cxx

@@ -17,11 +17,6 @@
 class cmMacroHelperCommand : public cmCommand
 {
 public:
-  cmMacroHelperCommand() = default;
-
-  ///! clean up any memory allocated by the macro
-  ~cmMacroHelperCommand() override = default;
-
   /**
    * This is a virtual constructor for the command.
    */

+ 1 - 3
Source/cmMacroCommand.h

@@ -18,15 +18,13 @@ class cmMakefile;
 class cmMacroFunctionBlocker : public cmFunctionBlocker
 {
 public:
-  cmMacroFunctionBlocker() { this->Depth = 0; }
-  ~cmMacroFunctionBlocker() override = default;
   bool IsFunctionBlocked(const cmListFileFunction&, cmMakefile& mf,
                          cmExecutionStatus&) override;
   bool ShouldRemove(const cmListFileFunction&, cmMakefile& mf) override;
 
   std::vector<std::string> Args;
   std::vector<cmListFileFunction> Functions;
-  int Depth;
+  int Depth = 0;
 };
 
 /// Starts macro() ... endmacro() block

+ 0 - 1
Source/cmMakefile.cxx

@@ -2712,7 +2712,6 @@ typedef enum
 } t_domain;
 struct t_lookup
 {
-  t_lookup() = default;
   t_domain domain = NORMAL;
   size_t loc = 0;
 };

+ 0 - 3
Source/cmQtAutoGenInitializer.h

@@ -25,9 +25,6 @@ public:
   /// @brief Rcc job information
   class Qrc
   {
-  public:
-    Qrc() = default;
-
   public:
     std::string LockFile;
     std::string QrcFile;

+ 0 - 3
Source/cmQtAutoGenerator.h

@@ -206,9 +206,6 @@ public:
       bool MergedOutput = false;
     };
 
-    // -- Constructor
-    ReadOnlyProcessT() = default;
-
     // -- Const accessors
     const SetupT& Setup() const { return Setup_; }
     ProcessResultT* Result() const { return Setup_.Result; }

+ 0 - 2
Source/cmTimestamp.h

@@ -15,8 +15,6 @@
 class cmTimestamp
 {
 public:
-  cmTimestamp() = default;
-
   std::string CurrentTime(const std::string& formatString, bool utcFlag);
 
   std::string FileModificationTime(const char* path,

+ 0 - 2
Source/cmVSSetupHelper.h

@@ -112,8 +112,6 @@ struct VSInstanceInfo
   bool IsWin10SDKInstalled = false;
   bool IsWin81SDKInstalled = false;
 
-  VSInstanceInfo() = default;
-
   std::string GetInstallLocation() const;
 };
 

+ 0 - 1
Source/cmVariableWatch.h

@@ -66,7 +66,6 @@ protected:
     WatchMethod Method = nullptr;
     void* ClientData = nullptr;
     DeleteData DeleteDataCall = nullptr;
-    Pair() = default;
     ~Pair()
     {
       if (this->DeleteDataCall && this->ClientData) {