diff options
| author | Brad King <brad.king@kitware.com> | 2021-10-27 13:24:42 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-10-27 13:24:54 (GMT) |
| commit | a956be484783a991dbda3b14f676538d5f0b17bd (patch) | |
| tree | 1c719f7e81e3d64916e1fcf219cdd6937a4c3935 /Source/cmMachO.cxx | |
| parent | db422ae0c7b3b871c067c9afcd2b0d8a43376ff6 (diff) | |
| parent | 7e4e192ce2a579c22120150953df5adf26435eef (diff) | |
| download | CMake-a956be484783a991dbda3b14f676538d5f0b17bd.zip CMake-a956be484783a991dbda3b14f676538d5f0b17bd.tar.gz CMake-a956be484783a991dbda3b14f676538d5f0b17bd.tar.bz2 | |
Merge topic 'warnings-cleanup'
7e4e192ce2 Source: fix clang-tidy modernize-redundant-void-arg warning
8d671dd94c Source: fix more -Wmissing-prototypes warnings
1cf14f8c03 Source: fix many -Wmissing-prototypes warnings by marking functions static
319944b3d2 Source: fix some -Wunused-macros warnings
5257d9e71a Source: fix only -Wshorten-64-to-32 warning with explicit cast
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6648
Diffstat (limited to 'Source/cmMachO.cxx')
| -rw-r--r-- | Source/cmMachO.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmMachO.cxx b/Source/cmMachO.cxx index 72dd055..4fcaedf 100644 --- a/Source/cmMachO.cxx +++ b/Source/cmMachO.cxx @@ -341,7 +341,8 @@ bool cmMachO::GetInstallName(std::string& install_name) if (lc_cmd == LC_ID_DYLIB || lc_cmd == LC_LOAD_WEAK_DYLIB || lc_cmd == LC_LOAD_DYLIB) { if (sizeof(dylib_command) < cmd.LoadCommand.size()) { - uint32_t namelen = cmd.LoadCommand.size() - sizeof(dylib_command); + uint32_t namelen = static_cast<uint32_t>(cmd.LoadCommand.size() - + sizeof(dylib_command)); install_name.assign(&cmd.LoadCommand[sizeof(dylib_command)], namelen); return true; } |