summaryrefslogtreecommitdiff
path: root/cpp/src/Slice/CPlusPlusUtil.cpp
diff options
context:
space:
mode:
authorMichi Henning <michi@zeroc.com>2005-05-11 05:51:03 +0000
committerMichi Henning <michi@zeroc.com>2005-05-11 05:51:03 +0000
commit71e63707bacbcc90051eb303080ef538a29f5d6b (patch)
tree6d02e804ece68fb312447f0f2492803844255c21 /cpp/src/Slice/CPlusPlusUtil.cpp
parentFixed version check so major and minor version must match, and the caller's (diff)
downloadice-71e63707bacbcc90051eb303080ef538a29f5d6b.tar.bz2
ice-71e63707bacbcc90051eb303080ef538a29f5d6b.tar.xz
ice-71e63707bacbcc90051eb303080ef538a29f5d6b.zip
Fixed version check for generated code so we can actually use 2.1.0 code
against a 2.1.1 library.
Diffstat (limited to 'cpp/src/Slice/CPlusPlusUtil.cpp')
-rw-r--r--cpp/src/Slice/CPlusPlusUtil.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/cpp/src/Slice/CPlusPlusUtil.cpp b/cpp/src/Slice/CPlusPlusUtil.cpp
index 6bb4d585c5c..6737ac0c193 100644
--- a/cpp/src/Slice/CPlusPlusUtil.cpp
+++ b/cpp/src/Slice/CPlusPlusUtil.cpp
@@ -90,9 +90,12 @@ Slice::printVersionCheck(Output& out)
{
out << "\n";
out << "\n#ifndef ICE_IGNORE_VERSION";
- out << "\n# if ICE_INT_VERSION != " << ICE_INT_VERSION;
+ out << "\n# if ICE_INT_VERSION / 100 != " << ICE_INT_VERSION / 100;
out << "\n# error Ice version mismatch!";
out << "\n# endif";
+ out << "\n# if ICE_INT_VERSION % 100 < " << ICE_INT_VERSION % 100;
+ out << "\n# error Ice patch level mismatch!";
+ out << "\n# endif";
out << "\n#endif";
}