summaryrefslogtreecommitdiffstats
path: root/Source/cmGeneratorTarget.h
diff options
context:
space:
mode:
authorKyle Edwards <kyle.edwards@kitware.com>2018-12-19 17:02:19 (GMT)
committerKitware Robot <kwrobot@kitware.com>2018-12-19 17:02:27 (GMT)
commitfa9853d833a10aeb8ea94abb98c0ebe3d7dfe5be (patch)
treeea232ad31d2830f803e82e2f0ba6e4d4bfd58117 /Source/cmGeneratorTarget.h
parente4c5e81f3116f620104d377b78e718ee47723125 (diff)
parentb2aa3aedeab09ad7b2c95353d2d3c3d867bcec53 (diff)
downloadCMake-fa9853d833a10aeb8ea94abb98c0ebe3d7dfe5be.zip
CMake-fa9853d833a10aeb8ea94abb98c0ebe3d7dfe5be.tar.gz
CMake-fa9853d833a10aeb8ea94abb98c0ebe3d7dfe5be.tar.bz2
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 <kwrobot@kitware.com> Merge-request: !2726
Diffstat (limited to 'Source/cmGeneratorTarget.h')
-rw-r--r--Source/cmGeneratorTarget.h44
1 files changed, 13 insertions, 31 deletions
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;