1
0
Эх сурвалжийг харах

use static_cast<> for casts from void*

Rolf Eike Beer 8 жил өмнө
parent
commit
353ec23737

+ 3 - 3
Source/CTest/cmCTestBuildAndTestHandler.cxx

@@ -115,21 +115,21 @@ int cmCTestBuildAndTestHandler::RunCMake(std::string* outstring,
 void CMakeMessageCallback(const char* m, const char* /*unused*/,
                           bool& /*unused*/, void* s)
 {
-  std::string* out = reinterpret_cast<std::string*>(s);
+  std::string* out = static_cast<std::string*>(s);
   *out += m;
   *out += "\n";
 }
 
 void CMakeProgressCallback(const char* msg, float /*unused*/, void* s)
 {
-  std::string* out = reinterpret_cast<std::string*>(s);
+  std::string* out = static_cast<std::string*>(s);
   *out += msg;
   *out += "\n";
 }
 
 void CMakeOutputCallback(const char* m, size_t len, void* s)
 {
-  std::string* out = reinterpret_cast<std::string*>(s);
+  std::string* out = static_cast<std::string*>(s);
   out->append(m, len);
 }
 

+ 1 - 1
Source/CTest/cmCTestMemCheckHandler.cxx

@@ -33,7 +33,7 @@ static CatToErrorType cmCTestMemCheckBoundsChecker[] = {
 
 static void xmlReportError(int line, const char* msg, void* data)
 {
-  cmCTest* ctest = reinterpret_cast<cmCTest*>(data);
+  cmCTest* ctest = static_cast<cmCTest*>(data);
   cmCTestLog(ctest, ERROR_MESSAGE, "Error parsing XML in stream at line "
                << line << ": " << msg << std::endl);
 }

+ 1 - 1
Source/cmLoadCommandCommand.cxx

@@ -120,7 +120,7 @@ bool cmLoadedCommand::InitialPass(std::vector<std::string> const& args,
   int argc = static_cast<int>(args.size());
   char** argv = nullptr;
   if (argc) {
-    argv = reinterpret_cast<char**>(malloc(argc * sizeof(char*)));
+    argv = static_cast<char**>(malloc(argc * sizeof(char*)));
   }
   int i;
   for (i = 0; i < argc; ++i) {

+ 1 - 1
Source/cmakemain.cxx

@@ -102,7 +102,7 @@ static int do_build(int ac, char const* const* av);
 
 static cmMakefile* cmakemainGetMakefile(void* clientdata)
 {
-  cmake* cm = reinterpret_cast<cmake*>(clientdata);
+  cmake* cm = static_cast<cmake*>(clientdata);
   if (cm && cm->GetDebugOutput()) {
     cmGlobalGenerator* gg = cm->GetGlobalGenerator();
     if (gg) {