Преглед на файлове

Refactor: Use `unique_ptr` instead of raw pointer

Alex Turbov преди 6 години
родител
ревизия
d4e6b2ae25
променени са 1 файла, в които са добавени 3 реда и са изтрити 5 реда
  1. 3 5
      Source/CPack/cmCPackGenerator.cxx

+ 3 - 5
Source/CPack/cmCPackGenerator.cxx

@@ -600,9 +600,9 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects(
 
       const char* buildConfigCstr = this->GetOption("CPACK_BUILD_CONFIG");
       std::string buildConfig = buildConfigCstr ? buildConfigCstr : "";
-      cmGlobalGenerator* globalGenerator =
+      std::unique_ptr<cmGlobalGenerator> globalGenerator(
         this->MakefileMap->GetCMakeInstance()->CreateGlobalGenerator(
-          cmakeGenerator);
+          cmakeGenerator));
       if (!globalGenerator) {
         cmCPackLogger(cmCPackLog::LOG_ERROR,
                       "Specified package generator not found. "
@@ -616,12 +616,10 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects(
       cmSystemTools::SetForceUnixPaths(globalGenerator->GetForceUnixPaths());
 
       if (!this->RunPreinstallTarget(project.ProjectName, project.Directory,
-                                     globalGenerator, buildConfig)) {
+                                     globalGenerator.get(), buildConfig)) {
         return 0;
       }
 
-      delete globalGenerator;
-
       cmCPackLogger(cmCPackLog::LOG_OUTPUT,
                     "- Install project: " << project.ProjectName << std::endl);