This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake".
The branch, master has been updated via fa9853d833a10aeb8ea94abb98c0ebe3d7dfe5be (commit) via b2aa3aedeab09ad7b2c95353d2d3c3d867bcec53 (commit) via 32cb564bea57af007d03fa31d80a0177057fc901 (commit) via 7ffa6bf99972a980d995081a66b858eaaca9db7e (commit) from e4c5e81f3116f620104d377b78e718ee47723125 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fa9853d833a10aeb8ea94abb98c0ebe3d7dfe5be commit fa9853d833a10aeb8ea94abb98c0ebe3d7dfe5be Merge: e4c5e81 b2aa3ae Author: Kyle Edwards <kyle.edwa...@kitware.com> AuthorDate: Wed Dec 19 17:02:19 2018 +0000 Commit: Kitware Robot <kwro...@kitware.com> CommitDate: Wed Dec 19 12:02:27 2018 -0500 Merge topic 'member-init' b2aa3aedea clang-tidy: Use default member initialization 32cb564bea clang-tidy: Remove redundant member initializations 7ffa6bf999 cmUVHandlePtr: Use inherited constructors Acked-by: Kitware Robot <kwro...@kitware.com> Merge-request: !2726 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b2aa3aedeab09ad7b2c95353d2d3c3d867bcec53 commit b2aa3aedeab09ad7b2c95353d2d3c3d867bcec53 Author: Regina Pfeifer <reg...@mailbox.org> AuthorDate: Wed Nov 21 23:17:54 2018 +0100 Commit: Regina Pfeifer <reg...@mailbox.org> CommitDate: Sat Dec 15 10:52:37 2018 +0100 clang-tidy: Use default member initialization diff --git a/.clang-tidy b/.clang-tidy index 20f1bf1..dc60714 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -15,7 +15,6 @@ modernize-*,\ -modernize-raw-string-literal,\ -modernize-return-braced-init-list,\ -modernize-use-auto,\ --modernize-use-default-member-init,\ -modernize-use-emplace,\ -modernize-use-equals-default,\ -modernize-use-equals-delete,\ @@ -36,4 +35,7 @@ readability-*,\ -readability-simplify-boolean-expr,\ " HeaderFilterRegex: 'Source/cm[^/]*\.(h|hxx|cxx)$' +CheckOptions: + - key: modernize-use-default-member-init.UseAssignment + value: '1' ... diff --git a/Source/CTest/cmCTestBuildHandler.cxx b/Source/CTest/cmCTestBuildHandler.cxx index a8309d9..539a0ce 100644 --- a/Source/CTest/cmCTestBuildHandler.cxx +++ b/Source/CTest/cmCTestBuildHandler.cxx @@ -503,10 +503,7 @@ public: : FTC(ftc) { } - FragmentCompare() - : FTC(nullptr) - { - } + FragmentCompare() {} bool operator()(std::string const& l, std::string const& r) const { // Order files by modification time. Use lexicographic order @@ -520,7 +517,7 @@ public: } private: - cmFileTimeComparison* FTC; + cmFileTimeComparison* FTC = nullptr; }; void cmCTestBuildHandler::GenerateXMLLaunched(cmXMLWriter& xml) diff --git a/Source/CTest/cmCTestGIT.cxx b/Source/CTest/cmCTestGIT.cxx index 471ab88..4ede3d4 100644 --- a/Source/CTest/cmCTestGIT.cxx +++ b/Source/CTest/cmCTestGIT.cxx @@ -475,13 +475,9 @@ private: { std::string Name; std::string EMail; - unsigned long Time; - long TimeZone; - Person() - : Time(0) - , TimeZone(0) - { - } + unsigned long Time = 0; + long TimeZone = 0; + Person() {} }; void ParsePerson(const char* str, Person& person) diff --git a/Source/cmCPluginAPI.cxx b/Source/cmCPluginAPI.cxx index 22ae340..065a184 100644 --- a/Source/cmCPluginAPI.cxx +++ b/Source/cmCPluginAPI.cxx @@ -475,11 +475,8 @@ int CCONV cmGetTotalArgumentSize(int argc, char** argv) // API for source files. struct cmCPluginAPISourceFile { - cmCPluginAPISourceFile() - : RealSourceFile(nullptr) - { - } - cmSourceFile* RealSourceFile; + cmCPluginAPISourceFile() {} + cmSourceFile* RealSourceFile = nullptr; std::string SourceName; std::string SourceExtension; std::string FullPath; diff --git a/Source/cmCTest.h b/Source/cmCTest.h index 7da0e1d..480204a 100644 --- a/Source/cmCTest.h +++ b/Source/cmCTest.h @@ -57,10 +57,7 @@ public: /** Representation of one part. */ struct PartInfo { - PartInfo() - : Enabled(false) - { - } + PartInfo() {} void SetName(const std::string& name) { this->Name = name; } const std::string& GetName() const { return this->Name; } @@ -71,7 +68,7 @@ public: std::vector<std::string> SubmitFiles; private: - bool Enabled; + bool Enabled = false; std::string Name; }; #ifdef CMAKE_BUILD_WITH_CMAKE diff --git a/Source/cmCacheManager.h b/Source/cmCacheManager.h index a269271..b39856e 100644 --- a/Source/cmCacheManager.h +++ b/Source/cmCacheManager.h @@ -34,20 +34,15 @@ private: struct CacheEntry { std::string Value; - cmStateEnums::CacheEntryType Type; + cmStateEnums::CacheEntryType Type = cmStateEnums::UNINITIALIZED; cmPropertyMap Properties; std::vector<std::string> GetPropertyList() const; const char* GetProperty(const std::string&) const; void SetProperty(const std::string& property, const char* value); void AppendProperty(const std::string& property, const char* value, bool asString = false); - bool Initialized; - CacheEntry() - : Value("") - , Type(cmStateEnums::UNINITIALIZED) - , Initialized(false) - { - } + bool Initialized = false; + CacheEntry() {} }; public: diff --git a/Source/cmCommand.h b/Source/cmCommand.h index 2cc0b88..dfc3e78 100644 --- a/Source/cmCommand.h +++ b/Source/cmCommand.h @@ -30,10 +30,7 @@ public: /** * Construct the command. By default it has no makefile. */ - cmCommand() - : Makefile(nullptr) - { - } + cmCommand() {} /** * Need virtual destructor to destroy real command type. @@ -90,7 +87,7 @@ public: void SetError(const std::string& e); protected: - cmMakefile* Makefile; + cmMakefile* Makefile = nullptr; private: std::string Error; diff --git a/Source/cmComputeLinkDepends.h b/Source/cmComputeLinkDepends.h index a81f705..32a2a62 100644 --- a/Source/cmComputeLinkDepends.h +++ b/Source/cmComputeLinkDepends.h @@ -35,15 +35,10 @@ public: struct LinkEntry { std::string Item; - cmGeneratorTarget const* Target; - bool IsSharedDep; - bool IsFlag; - LinkEntry() - : Target(nullptr) - , IsSharedDep(false) - , IsFlag(false) - { - } + cmGeneratorTarget const* Target = nullptr; + bool IsSharedDep = false; + bool IsFlag = false; + LinkEntry() {} LinkEntry(LinkEntry const& r) : Item(r.Item) , Target(r.Target) diff --git a/Source/cmComputeLinkInformation.h b/Source/cmComputeLinkInformation.h index 202bebd..db7eb96 100644 --- a/Source/cmComputeLinkInformation.h +++ b/Source/cmComputeLinkInformation.h @@ -30,11 +30,7 @@ public: struct Item { - Item() - : IsPath(true) - , Target(nullptr) - { - } + Item() {} Item(std::string const& v, bool p, cmGeneratorTarget const* target = nullptr) : Value(v) @@ -43,8 +39,8 @@ public: { } std::string Value; - bool IsPath; - cmGeneratorTarget const* Target; + bool IsPath = true; + cmGeneratorTarget const* Target = nullptr; }; typedef std::vector<Item> ItemVector; ItemVector const& GetItems() const; diff --git a/Source/cmCustomCommand.cxx b/Source/cmCustomCommand.cxx index 3f9f3f7..9dcec2f 100644 --- a/Source/cmCustomCommand.cxx +++ b/Source/cmCustomCommand.cxx @@ -18,9 +18,6 @@ cmCustomCommand::cmCustomCommand(cmMakefile const* mf, , Comment(comment ? comment : "") , WorkingDirectory(workingDirectory ? workingDirectory : "") , HaveComment(comment != nullptr) - , EscapeAllowMakeVars(false) - , EscapeOldStyle(true) - , CommandExpandLists(false) { if (mf) { this->Backtrace = mf->GetBacktrace(); diff --git a/Source/cmDefinitions.h b/Source/cmDefinitions.h index 9a97255..b2794fa 100644 --- a/Source/cmDefinitions.h +++ b/Source/cmDefinitions.h @@ -47,25 +47,19 @@ private: typedef std::string std_string; public: - Def() - : Exists(false) - , Used(false) - { - } + Def() {} Def(const char* v) : std_string(v ? v : "") , Exists(v ? true : false) - , Used(false) { } Def(const std_string& v) : std_string(v) , Exists(true) - , Used(false) { } - bool Exists; - bool Used; + bool Exists = false; + bool Used = false; }; static Def NoDef; diff --git a/Source/cmDepends.cxx b/Source/cmDepends.cxx index 6f1afd7..2acb015 100644 --- a/Source/cmDepends.cxx +++ b/Source/cmDepends.cxx @@ -15,10 +15,7 @@ cmDepends::cmDepends(cmLocalGenerator* lg, const char* targetDir) : LocalGenerator(lg) - , Verbose(false) - , FileComparison(nullptr) , TargetDirectory(targetDir) - , MaxPath(16384) , Dependee(new char[MaxPath]) , Depender(new char[MaxPath]) { diff --git a/Source/cmDepends.h b/Source/cmDepends.h index 4b9e05a..705d215 100644 --- a/Source/cmDepends.h +++ b/Source/cmDepends.h @@ -96,15 +96,15 @@ protected: cmLocalGenerator* LocalGenerator; // Flag for verbose output. - bool Verbose; - cmFileTimeComparison* FileComparison; + bool Verbose = false; + cmFileTimeComparison* FileComparison = nullptr; std::string Language; // The full path to the target's build directory. std::string TargetDirectory; - size_t MaxPath; + size_t MaxPath = 16384; char* Dependee; char* Depender; diff --git a/Source/cmDependsC.cxx b/Source/cmDependsC.cxx index f7dd33b..072d116 100644 --- a/Source/cmDependsC.cxx +++ b/Source/cmDependsC.cxx @@ -20,7 +20,6 @@ #define INCLUDE_REGEX_TRANSFORM_MARKER "#IncludeRegexTransform: " cmDependsC::cmDependsC() - : ValidDeps(nullptr) { } diff --git a/Source/cmDependsC.h b/Source/cmDependsC.h index 2f76f62..f833888 100644 --- a/Source/cmDependsC.h +++ b/Source/cmDependsC.h @@ -75,16 +75,13 @@ public: struct cmIncludeLines { - cmIncludeLines() - : Used(false) - { - } + cmIncludeLines() {} std::vector<UnscannedEntry> UnscannedEntries; - bool Used; + bool Used = false; }; protected: - const std::map<std::string, DependencyVector>* ValidDeps; + const std::map<std::string, DependencyVector>* ValidDeps = nullptr; std::set<std::string> Encountered; std::queue<UnscannedEntry> Unscanned; diff --git a/Source/cmDependsFortran.cxx b/Source/cmDependsFortran.cxx index 310af2d..e51f81e 100644 --- a/Source/cmDependsFortran.cxx +++ b/Source/cmDependsFortran.cxx @@ -69,7 +69,6 @@ public: }; cmDependsFortran::cmDependsFortran() - : Internal(nullptr) { } diff --git a/Source/cmDependsFortran.h b/Source/cmDependsFortran.h index bee9804..5d96dd4 100644 --- a/Source/cmDependsFortran.h +++ b/Source/cmDependsFortran.h @@ -76,7 +76,7 @@ protected: std::set<std::string> PPDefinitions; // Internal implementation details. - cmDependsFortranInternals* Internal; + cmDependsFortranInternals* Internal = nullptr; private: std::string MaybeConvertToRelativePath(std::string const& base, diff --git a/Source/cmDocumentation.h b/Source/cmDocumentation.h index c80bed1..153bad6 100644 --- a/Source/cmDocumentation.h +++ b/Source/cmDocumentation.h @@ -116,11 +116,8 @@ private: struct RequestedHelpItem { - RequestedHelpItem() - : HelpType(None) - { - } - cmDocumentationEnums::Type HelpType; + RequestedHelpItem() {} + cmDocumentationEnums::Type HelpType = None; std::string Filename; std::string Argument; }; diff --git a/Source/cmDocumentationFormatter.cxx b/Source/cmDocumentationFormatter.cxx index 2267ef9..678e408 100644 --- a/Source/cmDocumentationFormatter.cxx +++ b/Source/cmDocumentationFormatter.cxx @@ -11,8 +11,6 @@ #include <vector> cmDocumentationFormatter::cmDocumentationFormatter() - : TextWidth(77) - , TextIndent("") { } diff --git a/Source/cmDocumentationFormatter.h b/Source/cmDocumentationFormatter.h index 1f04250..17b63da 100644 --- a/Source/cmDocumentationFormatter.h +++ b/Source/cmDocumentationFormatter.h @@ -59,8 +59,8 @@ public: void SetIndent(const char* indent); private: - int TextWidth; - const char* TextIndent; + int TextWidth = 77; + const char* TextIndent = ""; }; #endif diff --git a/Source/cmExecutionStatus.h b/Source/cmExecutionStatus.h index ac5fe1d..1946231 100644 --- a/Source/cmExecutionStatus.h +++ b/Source/cmExecutionStatus.h @@ -11,13 +11,7 @@ class cmExecutionStatus { public: - cmExecutionStatus() - : ReturnInvoked(false) - , BreakInvoked(false) - , ContinueInvoked(false) - , NestedError(false) - { - } + cmExecutionStatus() {} void Clear() { @@ -40,10 +34,10 @@ public: bool GetNestedError() const { return this->NestedError; } private: - bool ReturnInvoked; - bool BreakInvoked; - bool ContinueInvoked; - bool NestedError; + bool ReturnInvoked = false; + bool BreakInvoked = false; + bool ContinueInvoked = false; + bool NestedError = false; }; #endif diff --git a/Source/cmExpandedCommandArgument.cxx b/Source/cmExpandedCommandArgument.cxx index 1c0a721..650a5ad 100644 --- a/Source/cmExpandedCommandArgument.cxx +++ b/Source/cmExpandedCommandArgument.cxx @@ -3,7 +3,6 @@ #include "cmExpandedCommandArgument.h" cmExpandedCommandArgument::cmExpandedCommandArgument() - : Quoted(false) { } diff --git a/Source/cmExpandedCommandArgument.h b/Source/cmExpandedCommandArgument.h index 302e8db..d71fc92 100644 --- a/Source/cmExpandedCommandArgument.h +++ b/Source/cmExpandedCommandArgument.h @@ -33,7 +33,7 @@ public: private: std::string Value; - bool Quoted; + bool Quoted = false; }; #endif diff --git a/Source/cmExtraCodeLiteGenerator.cxx b/Source/cmExtraCodeLiteGenerator.cxx index 194f0ac..bbc90a2 100644 --- a/Source/cmExtraCodeLiteGenerator.cxx +++ b/Source/cmExtraCodeLiteGenerator.cxx @@ -22,7 +22,6 @@ cmExtraCodeLiteGenerator::cmExtraCodeLiteGenerator() : ConfigName("NoConfig") - , CpuCount(2) { } diff --git a/Source/cmExtraCodeLiteGenerator.h b/Source/cmExtraCodeLiteGenerator.h index 029054f..dea7ebc 100644 --- a/Source/cmExtraCodeLiteGenerator.h +++ b/Source/cmExtraCodeLiteGenerator.h @@ -23,7 +23,7 @@ class cmExtraCodeLiteGenerator : public cmExternalMakefileProjectGenerator protected: std::string ConfigName; std::string WorkspacePath; - unsigned int CpuCount; + unsigned int CpuCount = 2; protected: std::string GetCodeLiteCompilerName(const cmMakefile* mf) const; diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx index fb8e8d3..594cb67 100644 --- a/Source/cmFileCommand.cxx +++ b/Source/cmFileCommand.cxx @@ -1095,13 +1095,9 @@ protected: // Properties set by pattern and regex match rules. struct MatchProperties { - bool Exclude; - mode_t Permissions; - MatchProperties() - : Exclude(false) - , Permissions(0) - { - } + bool Exclude = false; + mode_t Permissions = 0; + MatchProperties() {} }; struct MatchRule { diff --git a/Source/cmFileLock.h b/Source/cmFileLock.h index 6c9a7b8..491a40b 100644 --- a/Source/cmFileLock.h +++ b/Source/cmFileLock.h @@ -51,14 +51,13 @@ private: cmFileLockResult LockWithTimeout(unsigned long timeoutSec); #if defined(_WIN32) - typedef HANDLE FileId; + HANDLE File = INVALID_HANDLE_VALUE; BOOL LockFile(DWORD flags); #else - typedef int FileId; + int File = -1; int LockFile(int cmd, int type); #endif - FileId File; std::string Filename; }; diff --git a/Source/cmFileLockUnix.cxx b/Source/cmFileLockUnix.cxx index 7353b01..9b653e8 100644 --- a/Source/cmFileLockUnix.cxx +++ b/Source/cmFileLockUnix.cxx @@ -9,7 +9,6 @@ #include <unistd.h> cmFileLock::cmFileLock() - : File(-1) { } diff --git a/Source/cmFileLockWin32.cxx b/Source/cmFileLockWin32.cxx index 51ac249..a61d360 100644 --- a/Source/cmFileLockWin32.cxx +++ b/Source/cmFileLockWin32.cxx @@ -6,7 +6,6 @@ #include <windows.h> // CreateFileW cmFileLock::cmFileLock() - : File(INVALID_HANDLE_VALUE) { } diff --git a/Source/cmFindLibraryCommand.cxx b/Source/cmFindLibraryCommand.cxx index 1e1ab14..5a5d036 100644 --- a/Source/cmFindLibraryCommand.cxx +++ b/Source/cmFindLibraryCommand.cxx @@ -198,13 +198,10 @@ struct cmFindLibraryHelper // Current names under consideration. struct Name { - bool TryRaw; + bool TryRaw = false; std::string Raw; cmsys::RegularExpression Regex; - Name() - : TryRaw(false) - { - } + Name() {} }; std::vector<Name> Names; diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx index b045c49..3d9cd08 100644 --- a/Source/cmFindPackageCommand.cxx +++ b/Source/cmFindPackageCommand.cxx @@ -1675,10 +1675,7 @@ private: class cmFileList { public: - cmFileList() - : Last(nullptr) - { - } + cmFileList() {} virtual ~cmFileList() {} cmFileList& operator/(cmFileListGeneratorBase const& rhs) { @@ -1702,7 +1699,7 @@ private: virtual bool Visit(std::string const& fullPath) = 0; friend class cmFileListGeneratorBase; std::unique_ptr<cmFileListGeneratorBase> First; - cmFileListGeneratorBase* Last; + cmFileListGeneratorBase* Last = nullptr; }; class cmFindPackageFileList : public cmFileList diff --git a/Source/cmGeneratedFileStream.cxx b/Source/cmGeneratedFileStream.cxx index 789a399..bf53dbf 100644 --- a/Source/cmGeneratedFileStream.cxx +++ b/Source/cmGeneratedFileStream.cxx @@ -103,18 +103,10 @@ void cmGeneratedFileStream::SetCompressionExtraExtension(bool ext) } cmGeneratedFileStreamBase::cmGeneratedFileStreamBase() - : CopyIfDifferent(false) - , Okay(false) - , Compress(false) - , CompressExtraExtension(true) { } cmGeneratedFileStreamBase::cmGeneratedFileStreamBase(std::string const& name) - : CopyIfDifferent(false) - , Okay(false) - , Compress(false) - , CompressExtraExtension(true) { this->Open(name); } diff --git a/Source/cmGeneratedFileStream.h b/Source/cmGeneratedFileStream.h index dacd166..fd11889 100644 --- a/Source/cmGeneratedFileStream.h +++ b/Source/cmGeneratedFileStream.h @@ -45,16 +45,16 @@ protected: std::string TempName; // Whether to do a copy-if-different. - bool CopyIfDifferent; + bool CopyIfDifferent = false; // Whether the real file stream was valid when it was closed. - bool Okay; + bool Okay = false; // Whether the destination file is compressed - bool Compress; + bool Compress = false; // Whether the destination file is compressed - bool CompressExtraExtension; + bool CompressExtraExtension = true; }; /** \class cmGeneratedFileStream diff --git a/Source/cmGeneratorExpressionLexer.cxx b/Source/cmGeneratorExpressionLexer.cxx index e37f165..242915d 100644 --- a/Source/cmGeneratorExpressionLexer.cxx +++ b/Source/cmGeneratorExpressionLexer.cxx @@ -3,8 +3,6 @@ #include "cmGeneratorExpressionLexer.h" cmGeneratorExpressionLexer::cmGeneratorExpressionLexer() - : SawBeginExpression(false) - , SawGeneratorExpression(false) { } diff --git a/Source/cmGeneratorExpressionLexer.h b/Source/cmGeneratorExpressionLexer.h index e53f0b5..bf24308 100644 --- a/Source/cmGeneratorExpressionLexer.h +++ b/Source/cmGeneratorExpressionLexer.h @@ -46,8 +46,8 @@ public: } private: - bool SawBeginExpression; - bool SawGeneratorExpression; + bool SawBeginExpression = false; + bool SawGeneratorExpression = false; }; #endif diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h index 52defee..cfd1df0 100644 --- a/Source/cmGeneratorTarget.h +++ b/Source/cmGeneratorTarget.h @@ -110,11 +110,8 @@ public: std::set<std::string> ExpectedResxHeaders; std::set<std::string> ExpectedXamlHeaders; std::set<std::string> ExpectedXamlSources; - bool Initialized; - KindedSources() - : Initialized(false) - { - } + bool Initialized = false; + KindedSources() {} }; /** Get all sources needed for a configuration with kinds assigned. */ @@ -565,13 +562,9 @@ public: }; struct SourceFileFlags { - SourceFileFlags() - : Type(SourceFileTypeNormal) - , MacFolder(nullptr) - { - } - SourceFileType Type; - const char* MacFolder; // location inside Mac content folders + SourceFileFlags() {} + SourceFileType Type = SourceFileTypeNormal; + const char* MacFolder = nullptr; // location inside Mac content folders }; void GetAutoUicOptions(std::vector<std::string>& result, const std::string& config) const; @@ -757,11 +750,8 @@ private: struct CompatibleInterfaces : public CompatibleInterfacesBase { - CompatibleInterfaces() - : Done(false) - { - } - bool Done; + CompatibleInterfaces() {} + bool Done = false; }; mutable std::map<std::string, CompatibleInterfaces> CompatibleInterfacesMap; @@ -774,11 +764,8 @@ private: struct LinkImplClosure : public std::vector<cmGeneratorTarget const*> { - LinkImplClosure() - : Done(false) - { - } - bool Done; + LinkImplClosure() {} + bool Done = false; }; mutable std::map<std::string, LinkImplClosure> LinkImplClosureMap; @@ -797,15 +784,10 @@ private: // Cache import information from properties for each configuration. struct ImportInfo { - ImportInfo() - : NoSOName(false) - , Managed(Native) - , Multiplicity(0) - { - } - bool NoSOName; - ManagedType Managed; - unsigned int Multiplicity; + ImportInfo() {} + bool NoSOName = false; + ManagedType Managed = Native; + unsigned int Multiplicity = 0; std::string Location; std::string SOName; std::string ImportLibrary; diff --git a/Source/cmGlobVerificationManager.h b/Source/cmGlobVerificationManager.h index cf04c97..cdbd275 100644 --- a/Source/cmGlobVerificationManager.h +++ b/Source/cmGlobVerificationManager.h @@ -70,13 +70,10 @@ private: struct CacheEntryValue { - bool Initialized; + bool Initialized = false; std::vector<std::string> Files; std::vector<std::pair<std::string, cmListFileBacktrace>> Backtraces; - CacheEntryValue() - : Initialized(false) - { - } + CacheEntryValue() {} }; typedef std::map<CacheEntryKey, CacheEntryValue> CacheEntryMap; diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h index 4e6b6de..36d3d10 100644 --- a/Source/cmGlobalGenerator.h +++ b/Source/cmGlobalGenerator.h @@ -478,11 +478,8 @@ protected: cmCustomCommandLines CommandLines; std::vector<std::string> Depends; std::string WorkingDir; - bool UsesTerminal; - GlobalTargetInfo() - : UsesTerminal(false) - { - } + bool UsesTerminal = false; + GlobalTargetInfo() {} }; void CreateDefaultGlobalTargets(std::vector<GlobalTargetInfo>& targets); @@ -608,13 +605,10 @@ private: // Cache directory content and target files to be built. struct DirectoryContent { - long LastDiskTime; + long LastDiskTime = -1; std::set<std::string> All; std::set<std::string> Generated; - DirectoryContent() - : LastDiskTime(-1) - { - } + DirectoryContent() {} }; std::map<std::string, DirectoryContent> DirectoryContentMap; diff --git a/Source/cmGlobalUnixMakefileGenerator3.h b/Source/cmGlobalUnixMakefileGenerator3.h index a2ad095..6199586 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.h +++ b/Source/cmGlobalUnixMakefileGenerator3.h @@ -217,11 +217,8 @@ protected: // Store per-target progress counters. struct TargetProgress { - TargetProgress() - : NumberOfActions(0) - { - } - unsigned long NumberOfActions; + TargetProgress() {} + unsigned long NumberOfActions = 0; std::string VariableFile; std::vector<unsigned long> Marks; void WriteProgressVariables(unsigned long total, unsigned long& current); diff --git a/Source/cmInstalledFile.cxx b/Source/cmInstalledFile.cxx index 0e06029..9f61e5b 100644 --- a/Source/cmInstalledFile.cxx +++ b/Source/cmInstalledFile.cxx @@ -10,7 +10,6 @@ #include <utility> cmInstalledFile::cmInstalledFile() - : NameExpression(nullptr) { } diff --git a/Source/cmInstalledFile.h b/Source/cmInstalledFile.h index 47a4959..070b954 100644 --- a/Source/cmInstalledFile.h +++ b/Source/cmInstalledFile.h @@ -68,7 +68,7 @@ public: private: std::string Name; - cmCompiledGeneratorExpression* NameExpression; + cmCompiledGeneratorExpression* NameExpression = nullptr; PropertyMapType Properties; }; diff --git a/Source/cmLinkItem.cxx b/Source/cmLinkItem.cxx index f0d76df..12a07f6 100644 --- a/Source/cmLinkItem.cxx +++ b/Source/cmLinkItem.cxx @@ -7,13 +7,11 @@ #include <utility> // IWYU pragma: keep cmLinkItem::cmLinkItem() - : Target(nullptr) { } cmLinkItem::cmLinkItem(std::string const& n, cmListFileBacktrace const& bt) : String(n) - , Target(nullptr) , Backtrace(bt) { } @@ -59,7 +57,6 @@ std::ostream& operator<<(std::ostream& os, cmLinkItem const& item) cmLinkImplItem::cmLinkImplItem() : cmLinkItem() - , FromGenex(false) { } diff --git a/Source/cmLinkItem.h b/Source/cmLinkItem.h index e1ddd22..b841509 100644 --- a/Source/cmLinkItem.h +++ b/Source/cmLinkItem.h @@ -27,7 +27,7 @@ public: cmLinkItem(std::string const& s, cmListFileBacktrace const& bt); cmLinkItem(cmGeneratorTarget const* t, cmListFileBacktrace const& bt); std::string const& AsStr() const; - cmGeneratorTarget const* Target; + cmGeneratorTarget const* Target = nullptr; cmListFileBacktrace Backtrace; friend bool operator<(cmLinkItem const& l, cmLinkItem const& r); friend bool operator==(cmLinkItem const& l, cmLinkItem const& r); @@ -39,7 +39,7 @@ class cmLinkImplItem : public cmLinkItem public: cmLinkImplItem(); cmLinkImplItem(cmLinkItem item, bool fromGenex); - bool FromGenex; + bool FromGenex = false; }; /** The link implementation specifies the direct library @@ -70,36 +70,25 @@ struct cmLinkInterface : public cmLinkInterfaceLibraries // Number of repetitions of a strongly connected component of two // or more static libraries. - unsigned int Multiplicity; + unsigned int Multiplicity = 0; // Libraries listed for other configurations. // Needed only for OLD behavior of CMP0003. std::vector<cmLinkItem> WrongConfigLibraries; - bool ImplementationIsInterface; + bool ImplementationIsInterface = false; - cmLinkInterface() - : Multiplicity(0) - , ImplementationIsInterface(false) - { - } + cmLinkInterface() {} }; struct cmOptionalLinkInterface : public cmLinkInterface { - cmOptionalLinkInterface() - : LibrariesDone(false) - , AllDone(false) - , Exists(false) - , HadHeadSensitiveCondition(false) - , ExplicitLibraries(nullptr) - { - } - bool LibrariesDone; - bool AllDone; - bool Exists; - bool HadHeadSensitiveCondition; - const char* ExplicitLibraries; + cmOptionalLinkInterface() {} + bool LibrariesDone = false; + bool AllDone = false; + bool Exists = false; + bool HadHeadSensitiveCondition = false; + const char* ExplicitLibraries = nullptr; }; struct cmHeadToLinkInterfaceMap @@ -116,15 +105,10 @@ struct cmLinkImplementation : public cmLinkImplementationLibraries // Cache link implementation computation from each configuration. struct cmOptionalLinkImplementation : public cmLinkImplementation { - cmOptionalLinkImplementation() - : LibrariesDone(false) - , LanguagesDone(false) - , HadHeadSensitiveCondition(false) - { - } - bool LibrariesDone; - bool LanguagesDone; - bool HadHeadSensitiveCondition; + cmOptionalLinkImplementation() {} + bool LibrariesDone = false; + bool LanguagesDone = false; + bool HadHeadSensitiveCondition = false; }; /** Compute the link type to use for the given configuration. */ diff --git a/Source/cmListFileCache.h b/Source/cmListFileCache.h index 95b55a0..4a247ba 100644 --- a/Source/cmListFileCache.h +++ b/Source/cmListFileCache.h @@ -33,11 +33,8 @@ struct cmCommandContext cmCommandName(std::string const& name) { *this = name; } cmCommandName& operator=(std::string const& name); } Name; - long Line; - cmCommandContext() - : Line(0) - { - } + long Line = 0; + cmCommandContext() {} cmCommandContext(const char* name, int line) : Name(name) , Line(line) @@ -53,11 +50,7 @@ struct cmListFileArgument Quoted, Bracket }; - cmListFileArgument() - : Delim(Unquoted) - , Line(0) - { - } + cmListFileArgument() {} cmListFileArgument(const std::string& v, Delimiter d, long line) : Value(v) , Delim(d) @@ -70,8 +63,8 @@ struct cmListFileArgument } bool operator!=(const cmListFileArgument& r) const { return !(*this == r); } std::string Value; - Delimiter Delim; - long Line; + Delimiter Delim = Unquoted; + long Line = 0; }; class cmListFileContext @@ -79,11 +72,8 @@ class cmListFileContext public: std::string Name; std::string FilePath; - long Line; - cmListFileContext() - : Line(0) - { - } + long Line = 0; + cmListFileContext() {} static cmListFileContext FromCommandContext(cmCommandContext const& lfcc, std::string const& fileName) diff --git a/Source/cmLocalUnixMakefileGenerator3.h b/Source/cmLocalUnixMakefileGenerator3.h index 6d6288d..ee6b37b 100644 --- a/Source/cmLocalUnixMakefileGenerator3.h +++ b/Source/cmLocalUnixMakefileGenerator3.h @@ -264,12 +264,9 @@ private: struct LocalObjectEntry { - cmGeneratorTarget* Target; + cmGeneratorTarget* Target = nullptr; std::string Language; - LocalObjectEntry() - : Target(nullptr) - { - } + LocalObjectEntry() {} LocalObjectEntry(cmGeneratorTarget* t, const std::string& lang) : Target(t) , Language(lang) @@ -278,15 +275,10 @@ private: }; struct LocalObjectInfo : public std::vector<LocalObjectEntry> { - bool HasSourceExtension; - bool HasPreprocessRule; - bool HasAssembleRule; - LocalObjectInfo() - : HasSourceExtension(false) - , HasPreprocessRule(false) - , HasAssembleRule(false) - { - } + bool HasSourceExtension = false; + bool HasPreprocessRule = false; + bool HasAssembleRule = false; + LocalObjectInfo() {} }; void GetLocalObjectFiles( std::map<std::string, LocalObjectInfo>& localObjectFiles); diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 5cd6ba5..d7c4f22 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -2697,13 +2697,9 @@ typedef enum } t_domain; struct t_lookup { - t_lookup() - : domain(NORMAL) - , loc(0) - { - } - t_domain domain; - size_t loc; + t_lookup() {} + t_domain domain = NORMAL; + size_t loc = 0; }; cmake::MessageType cmMakefile::ExpandVariablesInStringNew( diff --git a/Source/cmNewLineStyle.cxx b/Source/cmNewLineStyle.cxx index 5500eba..12c18ee 100644 --- a/Source/cmNewLineStyle.cxx +++ b/Source/cmNewLineStyle.cxx @@ -5,7 +5,6 @@ #include <stddef.h> cmNewLineStyle::cmNewLineStyle() - : NewLineStyle(Invalid) { } diff --git a/Source/cmNewLineStyle.h b/Source/cmNewLineStyle.h index 397cd2c..f1a7bc6 100644 --- a/Source/cmNewLineStyle.h +++ b/Source/cmNewLineStyle.h @@ -33,7 +33,7 @@ public: const std::string GetCharacters() const; private: - Style NewLineStyle; + Style NewLineStyle = Invalid; }; #endif diff --git a/Source/cmOutputRequiredFilesCommand.cxx b/Source/cmOutputRequiredFilesCommand.cxx index 87c1ec0..ab1e699 100644 --- a/Source/cmOutputRequiredFilesCommand.cxx +++ b/Source/cmOutputRequiredFilesCommand.cxx @@ -28,11 +28,7 @@ public: * Construct with dependency generation marked not done; instance * not placed in cmMakefile's list. */ - cmDependInformation() - : DependDone(false) - , SourceFile(nullptr) - { - } + cmDependInformation() {} /** * The set of files on which this one depends. @@ -44,13 +40,13 @@ public: * This flag indicates whether dependency checking has been * performed for this file. */ - bool DependDone; + bool DependDone = false; /** * If this object corresponds to a cmSourceFile instance, this points * to it. */ - const cmSourceFile* SourceFile; + const cmSourceFile* SourceFile = nullptr; /** * Full path to this file. diff --git a/Source/cmProcessTools.cxx b/Source/cmProcessTools.cxx index 7ab1fa3..facde5d 100644 --- a/Source/cmProcessTools.cxx +++ b/Source/cmProcessTools.cxx @@ -45,10 +45,7 @@ void cmProcessTools::RunProcess(struct cmsysProcess_s* cp, OutputParser* out, } cmProcessTools::LineParser::LineParser(char sep, bool ignoreCR) - : Log(nullptr) - , Prefix(nullptr) - , Separator(sep) - , LineEnd('\0') + : Separator(sep) , IgnoreCR(ignoreCR) { } diff --git a/Source/cmProcessTools.h b/Source/cmProcessTools.h index f1c2a22..da3693d 100644 --- a/Source/cmProcessTools.h +++ b/Source/cmProcessTools.h @@ -54,11 +54,11 @@ public: void SetLog(std::ostream* log, const char* prefix); protected: - std::ostream* Log; - const char* Prefix; + std::ostream* Log = nullptr; + const char* Prefix = nullptr; std::string Line; char Separator; - char LineEnd; + char LineEnd = '\0'; bool IgnoreCR; bool ProcessChunk(const char* data, int length) override; diff --git a/Source/cmQtAutoGenInitializer.h b/Source/cmQtAutoGenInitializer.h index d817848..5cef1b3 100644 --- a/Source/cmQtAutoGenInitializer.h +++ b/Source/cmQtAutoGenInitializer.h @@ -25,11 +25,7 @@ public: class Qrc { public: - Qrc() - : Generated(false) - , Unique(false) - { - } + Qrc() {} public: std::string LockFile; @@ -40,8 +36,8 @@ public: std::string SettingsFile; std::map<std::string, std::string> ConfigSettingsFile; std::string RccFile; - bool Generated; - bool Unique; + bool Generated = false; + bool Unique = false; std::vector<std::string> Options; std::vector<std::string> Resources; }; diff --git a/Source/cmQtAutoGeneratorMocUic.cxx b/Source/cmQtAutoGeneratorMocUic.cxx index 446ef9a..e6ee85b 100644 --- a/Source/cmQtAutoGeneratorMocUic.cxx +++ b/Source/cmQtAutoGeneratorMocUic.cxx @@ -1130,11 +1130,6 @@ void cmQtAutoGeneratorMocUic::WorkerT::UVProcessFinished() cmQtAutoGeneratorMocUic::cmQtAutoGeneratorMocUic() : Base_(&FileSys()) , Moc_(&FileSys()) - , Stage_(StageT::SETTINGS_READ) - , JobsRemain_(0) - , JobError_(false) - , JobThreadsAbort_(false) - , MocAutoFileUpdated_(false) { // Precompile regular expressions Moc_.RegExpInclude.compile( diff --git a/Source/cmQtAutoGeneratorMocUic.h b/Source/cmQtAutoGeneratorMocUic.h index 2226954..edf597c 100644 --- a/Source/cmQtAutoGeneratorMocUic.h +++ b/Source/cmQtAutoGeneratorMocUic.h @@ -404,7 +404,7 @@ private: MocSettingsT Moc_; UicSettingsT Uic_; // -- Progress - StageT Stage_; + StageT Stage_ = StageT::SETTINGS_READ; // -- Job queues std::mutex JobsMutex_; struct @@ -416,15 +416,15 @@ private: JobQueueT Uic; } JobQueues_; JobQueueT JobQueue_; - std::size_t volatile JobsRemain_; - bool volatile JobError_; - bool volatile JobThreadsAbort_; + std::size_t volatile JobsRemain_ = 0; + bool volatile JobError_ = false; + bool volatile JobThreadsAbort_ = false; std::condition_variable JobsConditionRead_; // -- Moc meta std::set<std::string> MocIncludedStrings_; std::set<std::string> MocIncludedFiles_; std::set<std::string> MocAutoFiles_; - bool volatile MocAutoFileUpdated_; + bool volatile MocAutoFileUpdated_ = false; // -- Settings file std::string SettingsFile_; std::string SettingsStringMoc_; diff --git a/Source/cmQtAutoGeneratorRcc.cxx b/Source/cmQtAutoGeneratorRcc.cxx index 65c6741..29dc7a0 100644 --- a/Source/cmQtAutoGeneratorRcc.cxx +++ b/Source/cmQtAutoGeneratorRcc.cxx @@ -15,12 +15,6 @@ // -- Class methods cmQtAutoGeneratorRcc::cmQtAutoGeneratorRcc() - : MultiConfig_(false) - , SettingsChanged_(false) - , Stage_(StageT::SETTINGS_READ) - , Error_(false) - , Generate_(false) - , BuildFileChanged_(false) { // Initialize libuv asynchronous iteration request UVRequest().init(*UVLoop(), &cmQtAutoGeneratorRcc::UVPollStage, this); diff --git a/Source/cmQtAutoGeneratorRcc.h b/Source/cmQtAutoGeneratorRcc.h index 74cec36..1148071 100644 --- a/Source/cmQtAutoGeneratorRcc.h +++ b/Source/cmQtAutoGeneratorRcc.h @@ -70,7 +70,7 @@ private: private: // -- Config settings - bool MultiConfig_; + bool MultiConfig_ = false; // -- Directories std::string AutogenBuildDir_; std::string IncludeDir_; @@ -95,12 +95,12 @@ private: // -- Settings file std::string SettingsFile_; std::string SettingsString_; - bool SettingsChanged_; + bool SettingsChanged_ = false; // -- libuv loop - StageT Stage_; - bool Error_; - bool Generate_; - bool BuildFileChanged_; + StageT Stage_ = StageT::SETTINGS_READ; + bool Error_ = false; + bool Generate_ = false; + bool BuildFileChanged_ = false; }; #endif diff --git a/Source/cmScriptGenerator.h b/Source/cmScriptGenerator.h index c8fed19..0bb388e 100644 --- a/Source/cmScriptGenerator.h +++ b/Source/cmScriptGenerator.h @@ -12,10 +12,7 @@ class cmScriptGeneratorIndent { public: - cmScriptGeneratorIndent() - : Level(0) - { - } + cmScriptGeneratorIndent() {} cmScriptGeneratorIndent(int level) : Level(level) { @@ -32,7 +29,7 @@ public: } private: - int Level; + int Level = 0; }; inline std::ostream& operator<<(std::ostream& os, cmScriptGeneratorIndent indent) diff --git a/Source/cmSourceFileLocation.cxx b/Source/cmSourceFileLocation.cxx index 15433f9..90b9123 100644 --- a/Source/cmSourceFileLocation.cxx +++ b/Source/cmSourceFileLocation.cxx @@ -11,9 +11,6 @@ #include <assert.h> cmSourceFileLocation::cmSourceFileLocation() - : Makefile(nullptr) - , AmbiguousDirectory(true) - , AmbiguousExtension(true) { } diff --git a/Source/cmSourceFileLocation.h b/Source/cmSourceFileLocation.h index 886a184..82747ba 100644 --- a/Source/cmSourceFileLocation.h +++ b/Source/cmSourceFileLocation.h @@ -83,9 +83,9 @@ public: cmMakefile const* GetMakefile() const { return this->Makefile; } private: - cmMakefile const* const Makefile; - bool AmbiguousDirectory; - bool AmbiguousExtension; + cmMakefile const* const Makefile = nullptr; + bool AmbiguousDirectory = true; + bool AmbiguousExtension = true; std::string Directory; std::string Name; diff --git a/Source/cmState.cxx b/Source/cmState.cxx index 4bbd2e0..f664000 100644 --- a/Source/cmState.cxx +++ b/Source/cmState.cxx @@ -22,14 +22,6 @@ #include "cmake.h" cmState::cmState() - : IsInTryCompile(false) - , IsGeneratorMultiConfig(false) - , WindowsShell(false) - , WindowsVSIDE(false) - , WatcomWMake(false) - , MinGWMake(false) - , NMake(false) - , MSYSShell(false) { this->CacheManager = new cmCacheManager; this->GlobVerificationManager = new cmGlobVerificationManager; diff --git a/Source/cmState.h b/Source/cmState.h index 916985d..abe93ed 100644 --- a/Source/cmState.h +++ b/Source/cmState.h @@ -202,14 +202,14 @@ private: std::string SourceDirectory; std::string BinaryDirectory; - bool IsInTryCompile; - bool IsGeneratorMultiConfig; - bool WindowsShell; - bool WindowsVSIDE; - bool WatcomWMake; - bool MinGWMake; - bool NMake; - bool MSYSShell; + bool IsInTryCompile = false; + bool IsGeneratorMultiConfig = false; + bool WindowsShell = false; + bool WindowsVSIDE = false; + bool WatcomWMake = false; + bool MinGWMake = false; + bool NMake = false; + bool MSYSShell = false; }; #endif diff --git a/Source/cmVariableWatch.h b/Source/cmVariableWatch.h index 27d1b12..2f444ed 100644 --- a/Source/cmVariableWatch.h +++ b/Source/cmVariableWatch.h @@ -63,15 +63,10 @@ public: protected: struct Pair { - WatchMethod Method; - void* ClientData; - DeleteData DeleteDataCall; - Pair() - : Method(nullptr) - , ClientData(nullptr) - , DeleteDataCall(nullptr) - { - } + WatchMethod Method = nullptr; + void* ClientData = nullptr; + DeleteData DeleteDataCall = nullptr; + Pair() {} ~Pair() { if (this->DeleteDataCall && this->ClientData) { https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=32cb564bea57af007d03fa31d80a0177057fc901 commit 32cb564bea57af007d03fa31d80a0177057fc901 Author: Regina Pfeifer <reg...@mailbox.org> AuthorDate: Thu Dec 6 22:52:39 2018 +0100 Commit: Regina Pfeifer <reg...@mailbox.org> CommitDate: Sat Dec 15 10:51:47 2018 +0100 clang-tidy: Remove redundant member initializations diff --git a/.clang-tidy b/.clang-tidy index b35bc65..20f1bf1 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -33,7 +33,6 @@ readability-*,\ -readability-inconsistent-declaration-parameter-name,\ -readability-named-parameter,\ -readability-redundant-declaration,\ --readability-redundant-member-init,\ -readability-simplify-boolean-expr,\ " HeaderFilterRegex: 'Source/cm[^/]*\.(h|hxx|cxx)$' diff --git a/Source/CTest/cmCTestGIT.cxx b/Source/CTest/cmCTestGIT.cxx index 97c6b4f..471ab88 100644 --- a/Source/CTest/cmCTestGIT.cxx +++ b/Source/CTest/cmCTestGIT.cxx @@ -478,9 +478,7 @@ private: unsigned long Time; long TimeZone; Person() - : Name() - , EMail() - , Time(0) + : Time(0) , TimeZone(0) { } diff --git a/Source/CTest/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx index 67c669c..3042480 100644 --- a/Source/CTest/cmCTestSubmitHandler.cxx +++ b/Source/CTest/cmCTestSubmitHandler.cxx @@ -119,7 +119,6 @@ static size_t cmCTestSubmitHandlerCurlDebugCallback(CURL* /*unused*/, } cmCTestSubmitHandler::cmCTestSubmitHandler() - : HTTPProxy() { this->Initialize(); } diff --git a/Source/cmComputeLinkDepends.h b/Source/cmComputeLinkDepends.h index 66fb1e6..a81f705 100644 --- a/Source/cmComputeLinkDepends.h +++ b/Source/cmComputeLinkDepends.h @@ -39,8 +39,7 @@ public: bool IsSharedDep; bool IsFlag; LinkEntry() - : Item() - , Target(nullptr) + : Target(nullptr) , IsSharedDep(false) , IsFlag(false) { diff --git a/Source/cmComputeLinkInformation.h b/Source/cmComputeLinkInformation.h index e00d230..202bebd 100644 --- a/Source/cmComputeLinkInformation.h +++ b/Source/cmComputeLinkInformation.h @@ -31,8 +31,7 @@ public: struct Item { Item() - : Value() - , IsPath(true) + : IsPath(true) , Target(nullptr) { } diff --git a/Source/cmCustomCommand.cxx b/Source/cmCustomCommand.cxx index e87eb1e..3f9f3f7 100644 --- a/Source/cmCustomCommand.cxx +++ b/Source/cmCustomCommand.cxx @@ -15,7 +15,6 @@ cmCustomCommand::cmCustomCommand(cmMakefile const* mf, , Byproducts(byproducts) , Depends(depends) , CommandLines(commandLines) - , Backtrace() , Comment(comment ? comment : "") , WorkingDirectory(workingDirectory ? workingDirectory : "") , HaveComment(comment != nullptr) diff --git a/Source/cmDefinitions.h b/Source/cmDefinitions.h index 4ab5be6..9a97255 100644 --- a/Source/cmDefinitions.h +++ b/Source/cmDefinitions.h @@ -48,8 +48,7 @@ private: public: Def() - : std_string() - , Exists(false) + : Exists(false) , Used(false) { } diff --git a/Source/cmExportCommand.cxx b/Source/cmExportCommand.cxx index f965a29..3706a3c 100644 --- a/Source/cmExportCommand.cxx +++ b/Source/cmExportCommand.cxx @@ -25,9 +25,7 @@ class cmExecutionStatus; #endif cmExportCommand::cmExportCommand() - : cmCommand() - , ArgumentGroup() - , Targets(&Helper, "TARGETS") + : Targets(&Helper, "TARGETS") , Append(&Helper, "APPEND", &ArgumentGroup) , ExportSetName(&Helper, "EXPORT", &ArgumentGroup) , Namespace(&Helper, "NAMESPACE", &ArgumentGroup) diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx index 07a60de..d70352f 100644 --- a/Source/cmExtraCodeBlocksGenerator.cxx +++ b/Source/cmExtraCodeBlocksGenerator.cxx @@ -33,7 +33,6 @@ http://forums.codeblocks.org/index.php/topic,6789.0.html */ cmExtraCodeBlocksGenerator::cmExtraCodeBlocksGenerator() - : cmExternalMakefileProjectGenerator() { } diff --git a/Source/cmExtraCodeLiteGenerator.cxx b/Source/cmExtraCodeLiteGenerator.cxx index 28106d1..194f0ac 100644 --- a/Source/cmExtraCodeLiteGenerator.cxx +++ b/Source/cmExtraCodeLiteGenerator.cxx @@ -21,8 +21,7 @@ #include <utility> cmExtraCodeLiteGenerator::cmExtraCodeLiteGenerator() - : cmExternalMakefileProjectGenerator() - , ConfigName("NoConfig") + : ConfigName("NoConfig") , CpuCount(2) { } diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx index adb14ec..e7f3ada 100644 --- a/Source/cmExtraEclipseCDT4Generator.cxx +++ b/Source/cmExtraEclipseCDT4Generator.cxx @@ -41,7 +41,6 @@ void AppendDictionary(cmXMLWriter& xml, const char* key, T const& value) } cmExtraEclipseCDT4Generator::cmExtraEclipseCDT4Generator() - : cmExternalMakefileProjectGenerator() { this->SupportsVirtualFolders = true; this->GenerateLinkedResources = true; diff --git a/Source/cmExtraKateGenerator.cxx b/Source/cmExtraKateGenerator.cxx index 9410690..a9ed7fe 100644 --- a/Source/cmExtraKateGenerator.cxx +++ b/Source/cmExtraKateGenerator.cxx @@ -17,7 +17,6 @@ #include <vector> cmExtraKateGenerator::cmExtraKateGenerator() - : cmExternalMakefileProjectGenerator() { } diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx index 882d39f..0a1886a 100644 --- a/Source/cmExtraSublimeTextGenerator.cxx +++ b/Source/cmExtraSublimeTextGenerator.cxx @@ -55,7 +55,6 @@ cmExtraSublimeTextGenerator::GetFactory() } cmExtraSublimeTextGenerator::cmExtraSublimeTextGenerator() - : cmExternalMakefileProjectGenerator() { this->ExcludeBuildFolder = false; } diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx index bf928fc..b045c49 100644 --- a/Source/cmFindPackageCommand.cxx +++ b/Source/cmFindPackageCommand.cxx @@ -1676,8 +1676,7 @@ class cmFileList { public: cmFileList() - : First() - , Last(nullptr) + : Last(nullptr) { } virtual ~cmFileList() {} @@ -1710,8 +1709,7 @@ class cmFindPackageFileList : public cmFileList { public: cmFindPackageFileList(cmFindPackageCommand* fpc, bool use_suffixes = true) - : cmFileList() - , FPC(fpc) + : FPC(fpc) , UseSuffixes(use_suffixes) { } @@ -1753,13 +1751,11 @@ class cmFileListGeneratorFixed : public cmFileListGeneratorBase { public: cmFileListGeneratorFixed(std::string const& str) - : cmFileListGeneratorBase() - , String(str) + : String(str) { } cmFileListGeneratorFixed(cmFileListGeneratorFixed const& r) - : cmFileListGeneratorBase() - , String(r.String) + : String(r.String) { } @@ -1782,13 +1778,11 @@ class cmFileListGeneratorEnumerate : public cmFileListGeneratorBase { public: cmFileListGeneratorEnumerate(std::vector<std::string> const& v) - : cmFileListGeneratorBase() - , Vector(v) + : Vector(v) { } cmFileListGeneratorEnumerate(cmFileListGeneratorEnumerate const& r) - : cmFileListGeneratorBase() - , Vector(r.Vector) + : Vector(r.Vector) { } @@ -1817,14 +1811,12 @@ public: cmFileListGeneratorProject(std::vector<std::string> const& names, cmFindPackageCommand::SortOrderType so, cmFindPackageCommand::SortDirectionType sd) - : cmFileListGeneratorBase() - , Names(names) + : Names(names) { this->SetSort(so, sd); } cmFileListGeneratorProject(cmFileListGeneratorProject const& r) - : cmFileListGeneratorBase() - , Names(r.Names) + : Names(r.Names) { this->SetSort(r.SortOrder, r.SortDirection); } @@ -1888,14 +1880,12 @@ class cmFileListGeneratorMacProject : public cmFileListGeneratorBase public: cmFileListGeneratorMacProject(std::vector<std::string> const& names, const char* ext) - : cmFileListGeneratorBase() - , Names(names) + : Names(names) , Extension(ext) { } cmFileListGeneratorMacProject(cmFileListGeneratorMacProject const& r) - : cmFileListGeneratorBase() - , Names(r.Names) + : Names(r.Names) , Extension(r.Extension) { } @@ -1941,14 +1931,12 @@ class cmFileListGeneratorCaseInsensitive : public cmFileListGeneratorBase { public: cmFileListGeneratorCaseInsensitive(std::string const& str) - : cmFileListGeneratorBase() - , String(str) + : String(str) { } cmFileListGeneratorCaseInsensitive( cmFileListGeneratorCaseInsensitive const& r) - : cmFileListGeneratorBase() - , String(r.String) + : String(r.String) { } @@ -1985,13 +1973,11 @@ class cmFileListGeneratorGlob : public cmFileListGeneratorBase { public: cmFileListGeneratorGlob(std::string const& str) - : cmFileListGeneratorBase() - , Pattern(str) + : Pattern(str) { } cmFileListGeneratorGlob(cmFileListGeneratorGlob const& r) - : cmFileListGeneratorBase() - , Pattern(r.Pattern) + : Pattern(r.Pattern) { } diff --git a/Source/cmGeneratedFileStream.cxx b/Source/cmGeneratedFileStream.cxx index 186ec8c..789a399 100644 --- a/Source/cmGeneratedFileStream.cxx +++ b/Source/cmGeneratedFileStream.cxx @@ -12,8 +12,6 @@ #endif cmGeneratedFileStream::cmGeneratedFileStream(Encoding encoding) - : cmGeneratedFileStreamBase() - , Stream() { #ifdef CMAKE_BUILD_WITH_CMAKE if (encoding != codecvt::None) { @@ -105,9 +103,7 @@ void cmGeneratedFileStream::SetCompressionExtraExtension(bool ext) } cmGeneratedFileStreamBase::cmGeneratedFileStreamBase() - : Name() - , TempName() - , CopyIfDifferent(false) + : CopyIfDifferent(false) , Okay(false) , Compress(false) , CompressExtraExtension(true) @@ -115,9 +111,7 @@ cmGeneratedFileStreamBase::cmGeneratedFileStreamBase() } cmGeneratedFileStreamBase::cmGeneratedFileStreamBase(std::string const& name) - : Name() - , TempName() - , CopyIfDifferent(false) + : CopyIfDifferent(false) , Okay(false) , Compress(false) , CompressExtraExtension(true) diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx index 5316b19..dcd2585 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/Source/cmGlobalNinjaGenerator.cxx @@ -447,8 +447,6 @@ cmGlobalNinjaGenerator::cmGlobalNinjaGenerator(cmake* cm) , BuildFileStream(nullptr) , RulesFileStream(nullptr) , CompileCommandsStream(nullptr) - , Rules() - , AllDependencies() , UsingGCCOnWindows(false) , ComputingUnknownDependencies(false) , PolicyCMP0058(cmPolicies::WARN) diff --git a/Source/cmInstallCommandArguments.cxx b/Source/cmInstallCommandArguments.cxx index 06eb8a6..538aa9f 100644 --- a/Source/cmInstallCommandArguments.cxx +++ b/Source/cmInstallCommandArguments.cxx @@ -17,9 +17,7 @@ const std::string cmInstallCommandArguments::EmptyString; cmInstallCommandArguments::cmInstallCommandArguments( const std::string& defaultComponent) - : Parser() - , ArgumentGroup() - , Destination(&Parser, "DESTINATION", &ArgumentGroup) + : Destination(&Parser, "DESTINATION", &ArgumentGroup) , Component(&Parser, "COMPONENT", &ArgumentGroup) , NamelinkComponent(&Parser, "NAMELINK_COMPONENT", &ArgumentGroup) , ExcludeFromAll(&Parser, "EXCLUDE_FROM_ALL", &ArgumentGroup) diff --git a/Source/cmLinkItem.cxx b/Source/cmLinkItem.cxx index 121731d..f0d76df 100644 --- a/Source/cmLinkItem.cxx +++ b/Source/cmLinkItem.cxx @@ -7,8 +7,7 @@ #include <utility> // IWYU pragma: keep cmLinkItem::cmLinkItem() - : String() - , Target(nullptr) + : Target(nullptr) { } @@ -21,8 +20,7 @@ cmLinkItem::cmLinkItem(std::string const& n, cmListFileBacktrace const& bt) cmLinkItem::cmLinkItem(cmGeneratorTarget const* t, cmListFileBacktrace const& bt) - : String() - , Target(t) + : Target(t) , Backtrace(bt) { } diff --git a/Source/cmListFileCache.h b/Source/cmListFileCache.h index 9e4a833..95b55a0 100644 --- a/Source/cmListFileCache.h +++ b/Source/cmListFileCache.h @@ -54,8 +54,7 @@ struct cmListFileArgument Bracket }; cmListFileArgument() - : Value() - , Delim(Unquoted) + : Delim(Unquoted) , Line(0) { } @@ -82,9 +81,7 @@ public: std::string FilePath; long Line; cmListFileContext() - : Name() - , FilePath() - , Line(0) + : Line(0) { } diff --git a/Source/cmLocalUnixMakefileGenerator3.h b/Source/cmLocalUnixMakefileGenerator3.h index 869ef1e..6d6288d 100644 --- a/Source/cmLocalUnixMakefileGenerator3.h +++ b/Source/cmLocalUnixMakefileGenerator3.h @@ -268,7 +268,6 @@ private: std::string Language; LocalObjectEntry() : Target(nullptr) - , Language() { } LocalObjectEntry(cmGeneratorTarget* t, const std::string& lang) diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx index c953d20..324afbf 100644 --- a/Source/cmNinjaNormalTargetGenerator.cxx +++ b/Source/cmNinjaNormalTargetGenerator.cxx @@ -37,13 +37,7 @@ class cmCustomCommand; cmNinjaNormalTargetGenerator::cmNinjaNormalTargetGenerator( cmGeneratorTarget* target) : cmNinjaTargetGenerator(target) - , TargetNameOut() - , TargetNameSO() - , TargetNameReal() - , TargetNameImport() - , TargetNamePDB() , TargetLinkLanguage("") - , DeviceLinkObject() { this->TargetLinkLanguage = target->GetLinkerLanguage(this->GetConfigName()); if (target->GetType() == cmStateEnums::EXECUTABLE) { diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx index 7ac8d1b..228c9fb 100644 --- a/Source/cmNinjaTargetGenerator.cxx +++ b/Source/cmNinjaTargetGenerator.cxx @@ -54,10 +54,8 @@ cmNinjaTargetGenerator::cmNinjaTargetGenerator(cmGeneratorTarget* target) : cmCommonTargetGenerator(target) , MacOSXContentGenerator(nullptr) , OSXBundleGenerator(nullptr) - , MacContentFolders() , LocalGenerator( static_cast<cmLocalNinjaGenerator*>(target->GetLocalGenerator())) - , Objects() { MacOSXContentGenerator = new MacOSXContentGeneratorType(this); } diff --git a/Source/cmStatePrivate.h b/Source/cmStatePrivate.h index e76f2af..ec0ed6c 100644 --- a/Source/cmStatePrivate.h +++ b/Source/cmStatePrivate.h @@ -50,8 +50,7 @@ struct cmStateDetail::PolicyStackEntry : public cmPolicies::PolicyMap { typedef cmPolicies::PolicyMap derived; PolicyStackEntry(bool w = false) - : derived() - , Weak(w) + : Weak(w) { } PolicyStackEntry(derived const& d, bool w) diff --git a/Source/cmStateSnapshot.cxx b/Source/cmStateSnapshot.cxx index a649f5e..a4305e6 100644 --- a/Source/cmStateSnapshot.cxx +++ b/Source/cmStateSnapshot.cxx @@ -28,7 +28,6 @@ cmStateSnapshot::cmStateSnapshot(cmState* state) : State(state) - , Position() { } diff --git a/Source/cmString.hxx b/Source/cmString.hxx index 1623a43..e5ece52 100644 --- a/Source/cmString.hxx +++ b/Source/cmString.hxx @@ -625,8 +625,7 @@ private: // Internal constructor for view of statically allocated string. String(string_view v, Private) - : string_() - , view_(v) + : view_(v) { } diff --git a/Source/cmStringReplaceHelper.h b/Source/cmStringReplaceHelper.h index 938325a..3e76d86 100644 --- a/Source/cmStringReplaceHelper.h +++ b/Source/cmStringReplaceHelper.h @@ -46,7 +46,6 @@ private: } RegexReplacement(int n) : Number(n) - , Value() { } RegexReplacement() {} https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7ffa6bf99972a980d995081a66b858eaaca9db7e commit 7ffa6bf99972a980d995081a66b858eaaca9db7e Author: Regina Pfeifer <reg...@mailbox.org> AuthorDate: Wed Dec 12 15:33:17 2018 +0100 Commit: Regina Pfeifer <reg...@mailbox.org> CommitDate: Sat Dec 15 10:23:23 2018 +0100 cmUVHandlePtr: Use inherited constructors diff --git a/Source/cmUVHandlePtr.h b/Source/cmUVHandlePtr.h index 2937e0d..73ee334 100644 --- a/Source/cmUVHandlePtr.h +++ b/Source/cmUVHandlePtr.h @@ -3,7 +3,6 @@ #pragma once #include "cmConfigure.h" // IWYU pragma: keep -#include <algorithm> #include <cstddef> #include <cstdint> #include <memory> @@ -11,12 +10,22 @@ #include "cm_uv.h" -#define CM_PERFECT_FWD_CTOR(Class, FwdTo) \ - template <typename... Args> \ - Class(Args&&... args) \ - : FwdTo(std::forward<Args>(args)...) \ - { \ - } +#if defined(__SUNPRO_CC) + +# include <utility> + +# define CM_INHERIT_CTOR(Class, Base, Tpl) \ + template <typename... Args> \ + Class(Args&&... args) \ + : Base Tpl(std::forward<Args>(args)...) \ + { \ + } + +#else + +# define CM_INHERIT_CTOR(Class, Base, Tpl) using Base Tpl ::Base; + +#endif namespace cm { @@ -116,7 +125,7 @@ class uv_handle_ptr_ : public uv_handle_ptr_base_<T> friend class uv_handle_ptr_; public: - CM_PERFECT_FWD_CTOR(uv_handle_ptr_, uv_handle_ptr_base_<T>); + CM_INHERIT_CTOR(uv_handle_ptr_, uv_handle_ptr_base_, <T>); /*** * Allow less verbose calling of uv_<T> functions @@ -133,13 +142,13 @@ template <> class uv_handle_ptr_<uv_handle_t> : public uv_handle_ptr_base_<uv_handle_t> { public: - CM_PERFECT_FWD_CTOR(uv_handle_ptr_, uv_handle_ptr_base_<uv_handle_t>); + CM_INHERIT_CTOR(uv_handle_ptr_, uv_handle_ptr_base_, <uv_handle_t>); }; class uv_async_ptr : public uv_handle_ptr_<uv_async_t> { public: - CM_PERFECT_FWD_CTOR(uv_async_ptr, uv_handle_ptr_<uv_async_t>); + CM_INHERIT_CTOR(uv_async_ptr, uv_handle_ptr_, <uv_async_t>); int init(uv_loop_t& loop, uv_async_cb async_cb, void* data = nullptr); @@ -148,7 +157,7 @@ public: struct uv_signal_ptr : public uv_handle_ptr_<uv_signal_t> { - CM_PERFECT_FWD_CTOR(uv_signal_ptr, uv_handle_ptr_<uv_signal_t>); + CM_INHERIT_CTOR(uv_signal_ptr, uv_handle_ptr_, <uv_signal_t>); int init(uv_loop_t& loop, void* data = nullptr); @@ -159,7 +168,7 @@ struct uv_signal_ptr : public uv_handle_ptr_<uv_signal_t> struct uv_pipe_ptr : public uv_handle_ptr_<uv_pipe_t> { - CM_PERFECT_FWD_CTOR(uv_pipe_ptr, uv_handle_ptr_<uv_pipe_t>); + CM_INHERIT_CTOR(uv_pipe_ptr, uv_handle_ptr_, <uv_pipe_t>); operator uv_stream_t*() const; @@ -168,7 +177,7 @@ struct uv_pipe_ptr : public uv_handle_ptr_<uv_pipe_t> struct uv_process_ptr : public uv_handle_ptr_<uv_process_t> { - CM_PERFECT_FWD_CTOR(uv_process_ptr, uv_handle_ptr_<uv_process_t>); + CM_INHERIT_CTOR(uv_process_ptr, uv_handle_ptr_, <uv_process_t>); int spawn(uv_loop_t& loop, uv_process_options_t const& options, void* data = nullptr); @@ -176,7 +185,7 @@ struct uv_process_ptr : public uv_handle_ptr_<uv_process_t> struct uv_timer_ptr : public uv_handle_ptr_<uv_timer_t> { - CM_PERFECT_FWD_CTOR(uv_timer_ptr, uv_handle_ptr_<uv_timer_t>); + CM_INHERIT_CTOR(uv_timer_ptr, uv_handle_ptr_, <uv_timer_t>); int init(uv_loop_t& loop, void* data = nullptr); @@ -185,7 +194,7 @@ struct uv_timer_ptr : public uv_handle_ptr_<uv_timer_t> struct uv_tty_ptr : public uv_handle_ptr_<uv_tty_t> { - CM_PERFECT_FWD_CTOR(uv_tty_ptr, uv_handle_ptr_<uv_tty_t>); + CM_INHERIT_CTOR(uv_tty_ptr, uv_handle_ptr_, <uv_tty_t>); operator uv_stream_t*() const; ----------------------------------------------------------------------- Summary of changes: .clang-tidy | 5 ++-- Source/CTest/cmCTestBuildHandler.cxx | 7 ++--- Source/CTest/cmCTestGIT.cxx | 12 +++------ Source/CTest/cmCTestSubmitHandler.cxx | 1 - Source/cmCPluginAPI.cxx | 7 ++--- Source/cmCTest.h | 7 ++--- Source/cmCacheManager.h | 11 +++----- Source/cmCommand.h | 7 ++--- Source/cmComputeLinkDepends.h | 14 +++------- Source/cmComputeLinkInformation.h | 11 +++----- Source/cmCustomCommand.cxx | 4 --- Source/cmDefinitions.h | 13 +++------ Source/cmDepends.cxx | 3 --- Source/cmDepends.h | 6 ++--- Source/cmDependsC.cxx | 1 - Source/cmDependsC.h | 9 +++---- Source/cmDependsFortran.cxx | 1 - Source/cmDependsFortran.h | 2 +- Source/cmDocumentation.h | 7 ++--- Source/cmDocumentationFormatter.cxx | 2 -- Source/cmDocumentationFormatter.h | 4 +-- Source/cmExecutionStatus.h | 16 ++++------- Source/cmExpandedCommandArgument.cxx | 1 - Source/cmExpandedCommandArgument.h | 2 +- Source/cmExportCommand.cxx | 4 +-- Source/cmExtraCodeBlocksGenerator.cxx | 1 - Source/cmExtraCodeLiteGenerator.cxx | 4 +-- Source/cmExtraCodeLiteGenerator.h | 2 +- Source/cmExtraEclipseCDT4Generator.cxx | 1 - Source/cmExtraKateGenerator.cxx | 1 - Source/cmExtraSublimeTextGenerator.cxx | 1 - Source/cmFileCommand.cxx | 10 +++---- Source/cmFileLock.h | 5 ++-- Source/cmFileLockUnix.cxx | 1 - Source/cmFileLockWin32.cxx | 1 - Source/cmFindLibraryCommand.cxx | 7 ++--- Source/cmFindPackageCommand.cxx | 47 +++++++++++---------------------- Source/cmGeneratedFileStream.cxx | 14 ---------- Source/cmGeneratedFileStream.h | 8 +++--- Source/cmGeneratorExpressionLexer.cxx | 2 -- Source/cmGeneratorExpressionLexer.h | 4 +-- Source/cmGeneratorTarget.h | 44 +++++++++--------------------- Source/cmGlobVerificationManager.h | 7 ++--- Source/cmGlobalGenerator.h | 14 +++------- Source/cmGlobalNinjaGenerator.cxx | 2 -- Source/cmGlobalUnixMakefileGenerator3.h | 7 ++--- Source/cmInstallCommandArguments.cxx | 4 +-- Source/cmInstalledFile.cxx | 1 - Source/cmInstalledFile.h | 2 +- Source/cmLinkItem.cxx | 7 +---- Source/cmLinkItem.h | 46 +++++++++++--------------------- Source/cmListFileCache.h | 27 +++++-------------- Source/cmLocalUnixMakefileGenerator3.h | 21 +++++---------- Source/cmMakefile.cxx | 10 +++---- Source/cmNewLineStyle.cxx | 1 - Source/cmNewLineStyle.h | 2 +- Source/cmNinjaNormalTargetGenerator.cxx | 6 ----- Source/cmNinjaTargetGenerator.cxx | 2 -- Source/cmOutputRequiredFilesCommand.cxx | 10 +++---- Source/cmProcessTools.cxx | 5 +--- Source/cmProcessTools.h | 6 ++--- Source/cmQtAutoGenInitializer.h | 10 +++---- Source/cmQtAutoGeneratorMocUic.cxx | 5 ---- Source/cmQtAutoGeneratorMocUic.h | 10 +++---- Source/cmQtAutoGeneratorRcc.cxx | 6 ----- Source/cmQtAutoGeneratorRcc.h | 12 ++++----- Source/cmScriptGenerator.h | 7 ++--- Source/cmSourceFileLocation.cxx | 3 --- Source/cmSourceFileLocation.h | 6 ++--- Source/cmState.cxx | 8 ------ Source/cmState.h | 16 +++++------ Source/cmStatePrivate.h | 3 +-- Source/cmStateSnapshot.cxx | 1 - Source/cmString.hxx | 3 +-- Source/cmStringReplaceHelper.h | 1 - Source/cmUVHandlePtr.h | 39 ++++++++++++++++----------- Source/cmVariableWatch.h | 13 +++------ 77 files changed, 195 insertions(+), 438 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits