From b2aa3aedeab09ad7b2c95353d2d3c3d867bcec53 Mon Sep 17 00:00:00 2001
From: Regina Pfeifer <regina@mailbox.org>
Date: Wed, 21 Nov 2018 23:17:54 +0100
Subject: [PATCH] clang-tidy: Use default member initialization
---
.clang-tidy | 4 ++-
Source/CTest/cmCTestBuildHandler.cxx | 7 ++--
Source/CTest/cmCTestGIT.cxx | 10 ++----
Source/cmCPluginAPI.cxx | 7 ++--
Source/cmCTest.h | 7 ++--
Source/cmCacheManager.h | 11 ++----
Source/cmCommand.h | 7 ++--
Source/cmComputeLinkDepends.h | 13 +++----
Source/cmComputeLinkInformation.h | 10 ++----
Source/cmCustomCommand.cxx | 3 --
Source/cmDefinitions.h | 12 ++-----
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/cmExtraCodeLiteGenerator.cxx | 1 -
Source/cmExtraCodeLiteGenerator.h | 2 +-
Source/cmFileCommand.cxx | 10 ++----
Source/cmFileLock.h | 5 ++-
Source/cmFileLockUnix.cxx | 1 -
Source/cmFileLockWin32.cxx | 1 -
Source/cmFindLibraryCommand.cxx | 7 ++--
Source/cmFindPackageCommand.cxx | 7 ++--
Source/cmGeneratedFileStream.cxx | 8 -----
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/cmGlobalUnixMakefileGenerator3.h | 7 ++--
Source/cmInstalledFile.cxx | 1 -
Source/cmInstalledFile.h | 2 +-
Source/cmLinkItem.cxx | 3 --
Source/cmLinkItem.h | 46 ++++++++-----------------
Source/cmListFileCache.h | 24 ++++---------
Source/cmLocalUnixMakefileGenerator3.h | 20 ++++-------
Source/cmMakefile.cxx | 10 ++----
Source/cmNewLineStyle.cxx | 1 -
Source/cmNewLineStyle.h | 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/cmVariableWatch.h | 13 +++----
62 files changed, 152 insertions(+), 347 deletions(-)
diff --git a/.clang-tidy b/.clang-tidy
index 20f1bf1811..dc6071474b 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 a8309d94ae..539a0ce1a8 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 471ab88d31..4ede3d4ee1 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 22ae340334..065a184ceb 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 7da0e1d126..480204a474 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 a269271b88..b39856ee97 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 2cc0b88ecf..dfc3e78f58 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 a81f70531d..32a2a628ac 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 202bebdf23..db7eb96cfb 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 3f9f3f7b03..9dcec2f85c 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 9a97255d00..b2794fa9b7 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 6f1afd7bcb..2acb01509f 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 4b9e05a887..705d215522 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 f7dd33b371..072d1161c5 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 2f76f6275f..f833888b87 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 310af2d5ce..e51f81e087 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 bee9804710..5d96dd49ce 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 c80bed1cd3..153bad6fb8 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 2267ef94b8..678e4087dc 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 1f04250c9d..17b63dacc4 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 ac5fe1d727..19462313d5 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 1c0a721757..650a5ad617 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 302e8dbd6b..d71fc92c10 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 194f0ace35..bbc90a2d72 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 029054fdd2..dea7ebc113 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 fb8e8d353e..594cb67866 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 6c9a7b86fa..491a40b84d 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 7353b01fc2..9b653e8076 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 51ac249937..a61d360ab1 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 1e1ab147fd..5a5d03641e 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 b045c495fb..3d9cd08ed9 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 789a39931d..bf53dbf02b 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 dacd166923..fd118894c2 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 e37f165a80..242915dcff 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 e53f0b5477..bf24308187 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 52defee449..cfd1df0785 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 cf04c97c72..cdbd27510a 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 4e6b6dea95..36d3d107e4 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 a2ad095166..6199586476 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 0e0602981e..9f61e5b707 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 47a49590d2..070b954e67 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 f0d76df14c..12a07f6765 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 e1ddd22547..b841509e84 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 95b55a05f0..4a247bad1f 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 6d6288d5fd..ee6b37b003 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 5cd6ba5b94..d7c4f22adb 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 5500eba658..12c18eea22 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 397cd2c501..f1a7bc6e02 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 87c1ec055e..ab1e699d4a 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 7ab1fa3fcf..facde5d22e 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 f1c2a228e0..da3693d1a7 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 d817848f16..5cef1b3367 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 446ef9ae99..e6ee85b55a 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 2226954111..edf597c140 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 65c674110b..29dc7a0883 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 74cec36616..1148071a39 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 c8fed1950b..0bb388e635 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 15433f94f8..90b9123cf2 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 886a184583..82747ba7a4 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 4bbd2e02a8..f664000c94 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 916985dbbf..abe93ed6cf 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 27d1b12dfe..2f444edf6b 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) {
--
GitLab