diff options
| author | Joe George <joe@zeroc.com> | 2016-09-16 11:29:47 -0400 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2016-09-16 11:29:47 -0400 |
| commit | acfc80639e34d8ca6c610e228d5b6ada114c27a9 (patch) | |
| tree | 915952d0ab3e475211c05219c1d42b3b12f6b90f /cpp/test | |
| parent | Fix ICE-7338 (diff) | |
| download | ice-acfc80639e34d8ca6c610e228d5b6ada114c27a9.tar.bz2 ice-acfc80639e34d8ca6c610e228d5b6ada114c27a9.tar.xz ice-acfc80639e34d8ca6c610e228d5b6ada114c27a9.zip | |
Cleanup os version check in IceSSL/configuration
Diffstat (limited to 'cpp/test')
| -rw-r--r-- | cpp/test/IceSSL/configuration/AllTests.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/cpp/test/IceSSL/configuration/AllTests.cpp b/cpp/test/IceSSL/configuration/AllTests.cpp index 10629281968..ba5c767256d 100644 --- a/cpp/test/IceSSL/configuration/AllTests.cpp +++ b/cpp/test/IceSSL/configuration/AllTests.cpp @@ -440,11 +440,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12, b { // 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 - 1).c_str()); - int minorVersion = atoi(string(&s[0]).substr(first + 1, last - first - 1).c_str()); - + int majorVersion = atoi(string(&s[0]).substr(0, first).c_str()); isElCapitanOrGreater = majorVersion >= 15; } #endif |