diff options
| author | Jose <jose@zeroc.com> | 2019-10-03 17:27:16 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2019-10-03 17:27:16 +0200 |
| commit | f6210a4dbd1bbe0a7fae804b686daf231cf0b342 (patch) | |
| tree | bc099ccb212468e22ff8f88937b8df0edbcb887d /cpp/test | |
| parent | IceSSL/configuration failures with iOS 13 - close #570 (diff) | |
| download | ice-f6210a4dbd1bbe0a7fae804b686daf231cf0b342.tar.bz2 ice-f6210a4dbd1bbe0a7fae804b686daf231cf0b342.tar.xz ice-f6210a4dbd1bbe0a7fae804b686daf231cf0b342.zip | |
Fix for IceSSL/configuration macOS version checks
Diffstat (limited to 'cpp/test')
| -rw-r--r-- | cpp/test/IceSSL/configuration/AllTests.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/test/IceSSL/configuration/AllTests.cpp b/cpp/test/IceSSL/configuration/AllTests.cpp index e7f1b319218..04f27de11f6 100644 --- a/cpp/test/IceSSL/configuration/AllTests.cpp +++ b/cpp/test/IceSSL/configuration/AllTests.cpp @@ -706,14 +706,14 @@ allTests(Test::TestHelper* helper, const string& /*testDir*/, bool p12) { // version format is x.y.z size_t first = string(&s[0]).find_first_of("."); - size_t last = string(&s[0]).find_last_of("."); int majorVersion = atoi(string(&s[0]).substr(0, first).c_str()); +# if TARGET_OS_IPHONE == 0 + size_t last = string(&s[0]).find_last_of("."); int minorVersion = atoi(string(&s[0]).substr(first + 1, last - first - 1).c_str()); isElCapitanOrGreater = majorVersion >= 15; elCapitanUpdate2OrLower = (majorVersion == 15) && (minorVersion <= 2); -# if TARGET_OS_IPHONE == 0 isCatalinaOrGreater = majorVersion >= 19; # else isIOS13OrGreater = majorVersion >= 18; |