summaryrefslogtreecommitdiff
path: root/cpp/test/IceUtil/stacktrace/Client.cpp
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2015-11-04 12:40:22 -0330
committerDwayne Boone <dwayne@zeroc.com>2015-11-04 12:40:22 -0330
commit67d648e320e788a46d86e079a6d41c2bf7fc7740 (patch)
tree9dc34b2c4653ff30def52c67e7cfbcf1ab9e5157 /cpp/test/IceUtil/stacktrace/Client.cpp
parentReverted unnecessary change made by fixIceVersion (diff)
downloadice-67d648e320e788a46d86e079a6d41c2bf7fc7740.tar.bz2
ice-67d648e320e788a46d86e079a6d41c2bf7fc7740.tar.xz
ice-67d648e320e788a46d86e079a6d41c2bf7fc7740.zip
Removed hardcoded version from IceUtil/stacktrace test
Diffstat (limited to 'cpp/test/IceUtil/stacktrace/Client.cpp')
-rw-r--r--cpp/test/IceUtil/stacktrace/Client.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/cpp/test/IceUtil/stacktrace/Client.cpp b/cpp/test/IceUtil/stacktrace/Client.cpp
index 53edbaf4ec2..d565d2be6ee 100644
--- a/cpp/test/IceUtil/stacktrace/Client.cpp
+++ b/cpp/test/IceUtil/stacktrace/Client.cpp
@@ -113,8 +113,12 @@ getIceHome()
void
standardizeVersion(string& str)
{
- string v1("3.6.1");
- string v2("36");
+ string v1(ICE_STRING_VERSION);
+
+ vector<string> split;
+ IceUtilInternal::splitString(v1, ".", split);
+ string v2(split[0] + split[1]);
+
size_t pos = 0;
while((pos = str.find(v1, pos)) != string::npos)
{