diff options
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator.cxx | 6 | ||||
| -rw-r--r-- | Source/cmake.cxx | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator.cxx b/Source/cmLocalUnixMakefileGenerator.cxx index f9a93e9..4db85ed 100644 --- a/Source/cmLocalUnixMakefileGenerator.cxx +++ b/Source/cmLocalUnixMakefileGenerator.cxx @@ -2517,7 +2517,7 @@ cmLocalUnixMakefileGenerator::CreateMakeVariable(const char* s, const char* s2) std::string ret = unmodified; // if the string is greater the 32 chars it is an invalid vairable name // for borland make - if(ret.size() > m_MakefileVariableSize) + if(static_cast<int>(ret.size()) > m_MakefileVariableSize) { int keep = m_MakefileVariableSize - 8; int size = keep + 3; @@ -2525,11 +2525,11 @@ cmLocalUnixMakefileGenerator::CreateMakeVariable(const char* s, const char* s2) std::string str2 = s2; // we must shorten the combined string by 4 charactors // keep no more than 24 charactors from the second string - if(str2.size() > keep) + if(static_cast<int>(str2.size()) > keep) { str2 = str2.substr(0, keep); } - if(str1.size() + str2.size() > size) + if(static_cast<int>(str1.size()) + static_cast<int>(str2.size()) > size) { str1 = str1.substr(0, size - str2.size()); } diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 3e440fe..b57745f 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -811,8 +811,10 @@ bool cmake::CacheVersionMatches() const char* minv = m_CacheManager->GetCacheValue("CMAKE_CACHE_MINOR_VERSION"); const char* relv = m_CacheManager->GetCacheValue("CMAKE_CACHE_RELEASE_VERSION"); bool cacheSameCMake = false; - if(majv && atoi(majv) == cmMakefile::GetMajorVersion() - && minv && atoi(minv) == cmMakefile::GetMinorVersion() + if(majv && + atoi(majv) == static_cast<int>(cmMakefile::GetMajorVersion()) + && minv && + atoi(minv) == static_cast<int>(cmMakefile::GetMinorVersion()) && relv && (strcmp(relv, cmMakefile::GetReleaseVersion()) == 0)) { cacheSameCMake = true; |