diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2016-04-07 19:01:26 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2016-04-07 19:01:26 +0200 |
| commit | 86cebe154899d8a2c2039707a7f1b436590a16ef (patch) | |
| tree | b5e1bbe148fd5af3db7a00de5fb5da3d5ac86ed8 /cpp/src/Ice/DynamicLibrary.cpp | |
| parent | C++11 build fix for LoggerI updates (diff) | |
| download | ice-86cebe154899d8a2c2039707a7f1b436590a16ef.tar.bz2 ice-86cebe154899d8a2c2039707a7f1b436590a16ef.tar.xz ice-86cebe154899d8a2c2039707a7f1b436590a16ef.zip | |
Fixes to support new versionning scheme for alpha/beta releases
Diffstat (limited to 'cpp/src/Ice/DynamicLibrary.cpp')
| -rw-r--r-- | cpp/src/Ice/DynamicLibrary.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/cpp/src/Ice/DynamicLibrary.cpp b/cpp/src/Ice/DynamicLibrary.cpp index 155bc3b0fe1..dd084c67e1d 100644 --- a/cpp/src/Ice/DynamicLibrary.cpp +++ b/cpp/src/Ice/DynamicLibrary.cpp @@ -96,17 +96,16 @@ IceInternal::DynamicLibrary::loadEntryPoint(const string& entryPoint, bool useIc { int majorVersion = (ICE_INT_VERSION / 10000); int minorVersion = (ICE_INT_VERSION / 100) - majorVersion * 100; + int patchVersion = ICE_INT_VERSION % 100; ostringstream os; os << majorVersion * 10 + minorVersion; - - int patchVersion = ICE_INT_VERSION % 100; - if(patchVersion > 50) + if(patchVersion > 70) + { + os << 'b' << (patchVersion - 71); + } + else if(patchVersion > 50) { - os << 'b'; - if(patchVersion >= 52) - { - os << (patchVersion - 50); - } + os << 'a' << (patchVersion - 51); } version = os.str(); } |