diff options
| author | Brad King <brad.king@kitware.com> | 2021-07-26 14:17:18 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-07-26 14:17:18 (GMT) |
| commit | 4977184128ee0d9c3faa30943f79d47a419cf346 (patch) | |
| tree | 0396f01245b4d08af21087e58367037cdcd4c9f6 /Source/kwsys/SystemTools.cxx | |
| parent | 0079f24f453a872e65804ace594127955c6c114c (diff) | |
| parent | 7fc3f7001a3fcc3dbab90834c6bc2b389b3b38c9 (diff) | |
| download | CMake-4977184128ee0d9c3faa30943f79d47a419cf346.zip CMake-4977184128ee0d9c3faa30943f79d47a419cf346.tar.gz CMake-4977184128ee0d9c3faa30943f79d47a419cf346.tar.bz2 | |
Merge branch 'upstream-KWSys' into update-kwsys
# By KWSys Upstream
* upstream-KWSys:
KWSys 2021-07-26 (d5fd6ca2)
Diffstat (limited to 'Source/kwsys/SystemTools.cxx')
| -rw-r--r-- | Source/kwsys/SystemTools.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/kwsys/SystemTools.cxx b/Source/kwsys/SystemTools.cxx index 006495d..7c26974 100644 --- a/Source/kwsys/SystemTools.cxx +++ b/Source/kwsys/SystemTools.cxx @@ -4360,7 +4360,7 @@ std::string SystemTools::GetOperatingSystemNameAndVersion() # endif bOsVersionInfoEx = GetVersionExA((OSVERSIONINFOA*)&osvi); if (!bOsVersionInfoEx) { - return 0; + return ""; } # ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx # ifdef __clang__ @@ -4499,14 +4499,14 @@ std::string SystemTools::GetOperatingSystemNameAndVersion() L"SYSTEM\\CurrentControlSet\\Control\\ProductOptions", 0, KEY_QUERY_VALUE, &hKey); if (lRet != ERROR_SUCCESS) { - return 0; + return ""; } lRet = RegQueryValueExW(hKey, L"ProductType", nullptr, nullptr, (LPBYTE)szProductType, &dwBufLen); if ((lRet != ERROR_SUCCESS) || (dwBufLen > BUFSIZE)) { - return 0; + return ""; } RegCloseKey(hKey); |