diff options
| author | Daniel Pfeifer <daniel@pfeifer-mail.de> | 2017-08-30 10:37:36 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-08-30 10:38:00 (GMT) |
| commit | 7ddd43183dadba9c42094540f3371dd38054bc12 (patch) | |
| tree | 7f048ea2e1a75569eb5472c238389acfc768995e /Source/cmakemain.cxx | |
| parent | 5cac887297e58efe9553d7aa2bca9139f84bf094 (diff) | |
| parent | 190e3825d44d4f846d37e1ec7372f5829a5b6b3e (diff) | |
| download | CMake-7ddd43183dadba9c42094540f3371dd38054bc12.zip CMake-7ddd43183dadba9c42094540f3371dd38054bc12.tar.gz CMake-7ddd43183dadba9c42094540f3371dd38054bc12.tar.bz2 | |
Merge topic 'cstyle-casts'
190e3825 Replace C-style casts
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1176
Diffstat (limited to 'Source/cmakemain.cxx')
| -rw-r--r-- | Source/cmakemain.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx index eb5a18b..d4e1925 100644 --- a/Source/cmakemain.cxx +++ b/Source/cmakemain.cxx @@ -102,7 +102,7 @@ static int do_build(int ac, char const* const* av); static cmMakefile* cmakemainGetMakefile(void* clientdata) { - cmake* cm = (cmake*)clientdata; + cmake* cm = reinterpret_cast<cmake*>(clientdata); if (cm && cm->GetDebugOutput()) { cmGlobalGenerator* gg = cm->GetGlobalGenerator(); if (gg) { @@ -303,8 +303,8 @@ int do_cmake(int ac, char const* const* av) cmake cm(role); cm.SetHomeDirectory(""); cm.SetHomeOutputDirectory(""); - cmSystemTools::SetMessageCallback(cmakemainMessageCallback, (void*)&cm); - cm.SetProgressCallback(cmakemainProgressCallback, (void*)&cm); + cmSystemTools::SetMessageCallback(cmakemainMessageCallback, &cm); + cm.SetProgressCallback(cmakemainProgressCallback, &cm); cm.SetWorkingMode(workingMode); int res = cm.Run(args, view_only); @@ -419,8 +419,8 @@ static int do_build(int ac, char const* const* av) } cmake cm(cmake::RoleInternal); - cmSystemTools::SetMessageCallback(cmakemainMessageCallback, (void*)&cm); - cm.SetProgressCallback(cmakemainProgressCallback, (void*)&cm); + cmSystemTools::SetMessageCallback(cmakemainMessageCallback, &cm); + cm.SetProgressCallback(cmakemainProgressCallback, &cm); return cm.Build(dir, target, config, nativeOptions, clean); #endif } |