diff options
author | Brad King <brad.king@kitware.com> | 2020-01-28 16:02:48 +0000 |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2020-01-28 11:03:34 -0500 |
commit | cb8bd146c985883f05f20d11aa57602b86fcc83a (patch) | |
tree | 24ab34f97fee52eb7002b93f21e6f0f3126156db /Source/cmComputeLinkInformation.h | |
parent | 1d08099be7fcd1030470dfa248cac387e64e7d10 (diff) | |
parent | b50b2755dad27302a18b6e86c912c76771843133 (diff) | |
download | cmake-cb8bd146c985883f05f20d11aa57602b86fcc83a.tar.gz |
Merge topic 'modernize-memory-management'
b50b2755da cmComputeLinkInformation: modernize memory management
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4285
Diffstat (limited to 'Source/cmComputeLinkInformation.h')
-rw-r--r-- | Source/cmComputeLinkInformation.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Source/cmComputeLinkInformation.h b/Source/cmComputeLinkInformation.h index 46f6705b6f..3bc9c16c7e 100644 --- a/Source/cmComputeLinkInformation.h +++ b/Source/cmComputeLinkInformation.h @@ -6,6 +6,7 @@ #include "cmConfigure.h" // IWYU pragma: keep #include <iosfwd> +#include <memory> #include <set> #include <string> #include <utility> @@ -29,6 +30,9 @@ class cmComputeLinkInformation public: cmComputeLinkInformation(cmGeneratorTarget const* target, const std::string& config); + cmComputeLinkInformation(const cmComputeLinkInformation&) = delete; + cmComputeLinkInformation& operator=(const cmComputeLinkInformation&) = + delete; ~cmComputeLinkInformation(); bool Compute(); @@ -164,7 +168,7 @@ private: cmsys::RegularExpression SplitFramework; // Linker search path computation. - cmOrderDirectories* OrderLinkerSearchPath; + std::unique_ptr<cmOrderDirectories> OrderLinkerSearchPath; bool FinishLinkerSearchDirectories(); void PrintLinkPolicyDiagnosis(std::ostream&); @@ -185,9 +189,9 @@ private: std::vector<std::string> OldUserFlagItems; std::set<std::string> CMP0060WarnItems; // Dependent library path computation. - cmOrderDirectories* OrderDependentRPath; + std::unique_ptr<cmOrderDirectories> OrderDependentRPath; // Runtime path computation. - cmOrderDirectories* OrderRuntimeSearchPath; + std::unique_ptr<cmOrderDirectories> OrderRuntimeSearchPath; bool OldLinkDirMode; bool OpenBSD; |