Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-19 19:43:23 +08:00
Code Issues Projects Releases Wiki Activity

Replace some uses of sprintf with std::to_string

Browse Source
This commit is contained in:
jrp2014
2018-04-04 07:41:50 -04:00
committed by Brad King
parent 418541035f
commit acda926a04
2 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Source/cmCacheManager.cxx
View File

@@ -8,6 +8,7 @@
#include <sstream> #include <sstream>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <string>
#include "cmGeneratedFileStream.h" #include "cmGeneratedFileStream.h"
#include "cmMessenger.h" #include "cmMessenger.h"
@@ -243,19 +244,18 @@ bool cmCacheManager::SaveCache(const std::string& path, cmMessenger* messenger)
} }
// before writing the cache, update the version numbers // before writing the cache, update the version numbers
// to the // to the
char temp[1024]; this->AddCacheEntry("CMAKE_CACHE_MAJOR_VERSION",
sprintf(temp, "%d", cmVersion::GetMinorVersion()); std::to_string(cmVersion::GetMajorVersion()).c_str(),
this->AddCacheEntry("CMAKE_CACHE_MINOR_VERSION", temp,
"Minor version of cmake used to create the "
"current loaded cache",
cmStateEnums::INTERNAL);
sprintf(temp, "%d", cmVersion::GetMajorVersion());
this->AddCacheEntry("CMAKE_CACHE_MAJOR_VERSION", temp,
"Major version of cmake used to create the " "Major version of cmake used to create the "
"current loaded cache", "current loaded cache",
cmStateEnums::INTERNAL); cmStateEnums::INTERNAL);
sprintf(temp, "%d", cmVersion::GetPatchVersion()); this->AddCacheEntry("CMAKE_CACHE_MINOR_VERSION",
this->AddCacheEntry("CMAKE_CACHE_PATCH_VERSION", temp, std::to_string(cmVersion::GetMinorVersion()).c_str(),
"Minor version of cmake used to create the "
"current loaded cache",
cmStateEnums::INTERNAL);
this->AddCacheEntry("CMAKE_CACHE_PATCH_VERSION",
std::to_string(cmVersion::GetPatchVersion()).c_str(),
"Patch version of cmake used to create the " "Patch version of cmake used to create the "
"current loaded cache", "current loaded cache",
cmStateEnums::INTERNAL); cmStateEnums::INTERNAL);

19
Source/cmStateSnapshot.cxx
View File

@@ -6,7 +6,7 @@
#include <algorithm> #include <algorithm>
#include <assert.h> #include <assert.h>
#include <iterator> #include <iterator>
#include <stdio.h> #include <string>
#include "cmAlgorithms.h" #include "cmAlgorithms.h"
#include "cmDefinitions.h" #include "cmDefinitions.h"
@@ -328,15 +328,14 @@ void cmStateSnapshot::SetDefaultDefinitions()
this->SetDefinition("CMAKE_HOST_SOLARIS", "1"); this->SetDefinition("CMAKE_HOST_SOLARIS", "1");
#endif #endif
char temp[1024]; this->SetDefinition("CMAKE_MAJOR_VERSION",
sprintf(temp, "%d", cmVersion::GetMinorVersion()); std::to_string(cmVersion::GetMajorVersion()));
this->SetDefinition("CMAKE_MINOR_VERSION", temp); this->SetDefinition("CMAKE_MINOR_VERSION",
sprintf(temp, "%d", cmVersion::GetMajorVersion()); std::to_string(cmVersion::GetMinorVersion()));
this->SetDefinition("CMAKE_MAJOR_VERSION", temp); this->SetDefinition("CMAKE_PATCH_VERSION",
sprintf(temp, "%d", cmVersion::GetPatchVersion()); std::to_string(cmVersion::GetPatchVersion()));
this->SetDefinition("CMAKE_PATCH_VERSION", temp); this->SetDefinition("CMAKE_TWEAK_VERSION",
sprintf(temp, "%d", cmVersion::GetTweakVersion()); std::to_string(cmVersion::GetTweakVersion()));
this->SetDefinition("CMAKE_TWEAK_VERSION", temp);
this->SetDefinition("CMAKE_VERSION", cmVersion::GetCMakeVersion()); this->SetDefinition("CMAKE_VERSION", cmVersion::GetCMakeVersion());
this->SetDefinition("CMAKE_FILES_DIRECTORY", this->SetDefinition("CMAKE_FILES_DIRECTORY",