summaryrefslogtreecommitdiff
path: root/cpp/src/IceGrid/Util.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2007-02-14 14:30:41 +0000
committerBenoit Foucher <benoit@zeroc.com>2007-02-14 14:30:41 +0000
commitfc7f0213bab5d14ae26423c78c0d9d221f93774a (patch)
tree7e92a757a34dfd39b3d2ada6185a433c41b3e69f /cpp/src/IceGrid/Util.cpp
parentBacked out Ice.OA prefix addition (diff)
downloadice-fc7f0213bab5d14ae26423c78c0d9d221f93774a.tar.bz2
ice-fc7f0213bab5d14ae26423c78c0d9d221f93774a.tar.xz
ice-fc7f0213bab5d14ae26423c78c0d9d221f93774a.zip
Removed support for removed Ice.OA property prefix
Diffstat (limited to 'cpp/src/IceGrid/Util.cpp')
-rw-r--r--cpp/src/IceGrid/Util.cpp71
1 files changed, 0 insertions, 71 deletions
diff --git a/cpp/src/IceGrid/Util.cpp b/cpp/src/IceGrid/Util.cpp
index f955fe69e4c..3d7bd18f961 100644
--- a/cpp/src/IceGrid/Util.cpp
+++ b/cpp/src/IceGrid/Util.cpp
@@ -82,74 +82,3 @@ IceGrid::createProperty(const string& name, const string& value)
return prop;
}
-int
-IceGrid::getMMVersion(const string& o)
-{
- //
- // Strip the version
- //
- string::size_type beg = o.find_first_not_of(' ');
- string::size_type end = o.find_last_not_of(' ');
- string version = o.substr(beg == string::npos ? 0 : beg, end == string::npos ? o.length() - 1 : end - beg + 1);
-
- string::size_type minorPos = version.find('.');
- string::size_type patchPos = version.find('.', minorPos + 1);
-
- if(minorPos != 1 && minorPos != 2)
- {
- return -1;
- }
-
- if(patchPos != string::npos)
- {
- if((minorPos == 1 && patchPos != 3 && patchPos != 4) || (minorPos == 2 && patchPos != 4 && patchPos != 5))
- {
- return -1;
- }
- else if((version.size() - patchPos - 1) > 2)
- {
- return -1;
- }
- }
- else if((version.size() - minorPos - 1) > 2)
- {
- return -1;
- }
-
- int v, ver;
-
- istringstream major(version.substr(0, minorPos));
- major >> v;
- if(major.fail() || v > 99 || v < 1)
- {
- return -1;
- }
- ver = v;
- ver *= 100;
-
- istringstream minor(version.substr(minorPos + 1, patchPos != string::npos ? patchPos : version.size()));
- minor >> v;
- if(minor.fail() || v > 99 || v < 0)
- {
- return -1;
- }
- ver += v;
- ver *= 100;
-
- //
- // No need to get the patch number, we're only interested in
- // MAJOR.MINOR
- //
-// if(patchPos != string::npos)
-// {
-// istringstream patch(version.substr(patchPos + 1));
-// patch >> v;
-// if(patch.fail() || v > 99 || v < 0)
-// {
-// return -1;
-// }
-// ver += v;
-// }
-
- return ver;
-}