diff options
| author | Brad King <brad.king@kitware.com> | 2019-07-15 11:39:47 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-07-15 11:40:00 (GMT) |
| commit | a92b7fd46bcf1ecd255290d84c691a244c8ecb26 (patch) | |
| tree | 13d56424cfcf969d0afaab6762a76656e0d995f0 /Source/cmBinUtilsLinuxELFLinker.cxx | |
| parent | 3376067bae3972b0fc7232b524ee80e2fc39950f (diff) | |
| parent | 1591f138f1a40fccdde7fb2796ee2d2d8f3f97bb (diff) | |
| download | CMake-a92b7fd46bcf1ecd255290d84c691a244c8ecb26.zip CMake-a92b7fd46bcf1ecd255290d84c691a244c8ecb26.tar.gz CMake-a92b7fd46bcf1ecd255290d84c691a244c8ecb26.tar.bz2 | |
Merge topic 'modernize-cmCommand-memory-management'
1591f138f1 modernize: manage cmCommand instances using unique_ptr.
d9b2c7dae2 Introduce memory management helper: cm_memory.hxx
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sebastian Holtermann <sebholt@web.de>
Merge-request: !3513
Diffstat (limited to 'Source/cmBinUtilsLinuxELFLinker.cxx')
| -rw-r--r-- | Source/cmBinUtilsLinuxELFLinker.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmBinUtilsLinuxELFLinker.cxx b/Source/cmBinUtilsLinuxELFLinker.cxx index 4fb15f2..86846cb 100644 --- a/Source/cmBinUtilsLinuxELFLinker.cxx +++ b/Source/cmBinUtilsLinuxELFLinker.cxx @@ -2,7 +2,7 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmBinUtilsLinuxELFLinker.h" -#include "cmAlgorithms.h" + #include "cmBinUtilsLinuxELFObjdumpGetRuntimeDependenciesTool.h" #include "cmLDConfigLDConfigTool.h" #include "cmMakefile.h" @@ -12,9 +12,10 @@ #include <cmsys/RegularExpression.hxx> -#include <memory> #include <sstream> +#include "cm_memory.hxx" + static std::string ReplaceOrigin(const std::string& rpath, const std::string& origin) { |