diff options
| author | Michi Henning <michi@zeroc.com> | 2005-05-19 01:23:31 +0000 |
|---|---|---|
| committer | Michi Henning <michi@zeroc.com> | 2005-05-19 01:23:31 +0000 |
| commit | 5941b20ef21dce88280306ca852865c1d409449c (patch) | |
| tree | f30d6ddab4054fd980f008235e67c2ad1f0b4724 | |
| parent | Fixed http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=331 (diff) | |
| download | ice-5941b20ef21dce88280306ca852865c1d409449c.tar.bz2 ice-5941b20ef21dce88280306ca852865c1d409449c.tar.xz ice-5941b20ef21dce88280306ca852865c1d409449c.zip | |
ixed bug in initializeWithProperties() introduced by merge from
R2_1_branch.
| -rw-r--r-- | cpp/src/Ice/Initialize.cpp | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/cpp/src/Ice/Initialize.cpp b/cpp/src/Ice/Initialize.cpp index e0d690ffa2b..a246214986c 100644 --- a/cpp/src/Ice/Initialize.cpp +++ b/cpp/src/Ice/Initialize.cpp @@ -154,18 +154,7 @@ Ice::initializeWithProperties(int& argc, char* argv[], const PropertiesPtr& prop // // Major and minor version numbers must match. // - // - // Major and minor version numbers must match. - // - if(version != ICE_INT_VERSION) - // - // The caller's patch level cannot be greater than library's patch level. (Patch level changes are - // backward-compatible, but not forward-compatible.) - // - if(version % 100 > ICE_INT_VERSION % 100) - { - throw VersionMismatchException(__FILE__, __LINE__); - } + if(ICE_INT_VERSION / 100 != version / 100) { throw VersionMismatchException(__FILE__, __LINE__); } |