summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorMarc Laukien <marc@zeroc.com>2001-11-21 19:25:44 +0000
committerMarc Laukien <marc@zeroc.com>2001-11-21 19:25:44 +0000
commit00cc33e5c8cc7f7e98376db9079fe11dfb203bdc (patch)
tree18a2d0900ae89852af6b7211112ad9cba7b8abea /cpp
parentfixes (diff)
downloadice-00cc33e5c8cc7f7e98376db9079fe11dfb203bdc.tar.bz2
ice-00cc33e5c8cc7f7e98376db9079fe11dfb203bdc.tar.xz
ice-00cc33e5c8cc7f7e98376db9079fe11dfb203bdc.zip
fixes
Diffstat (limited to 'cpp')
-rw-r--r--cpp/config/TestUtil.py2
-rw-r--r--cpp/src/Ice/Proxy.cpp2
2 files changed, 1 insertions, 3 deletions
diff --git a/cpp/config/TestUtil.py b/cpp/config/TestUtil.py
index b6dde9fe40f..80285768c39 100644
--- a/cpp/config/TestUtil.py
+++ b/cpp/config/TestUtil.py
@@ -69,14 +69,12 @@ def clientServerTest(toplevel, name):
updatedClientOptions = clientOptions.replace("TOPLEVELDIR", toplevel)
print "starting server...",
- print server + updatedServerOptions
serverPipe = os.popen(server + updatedServerOptions)
getServerPid(serverPipe)
getAdapterReady(serverPipe)
print "ok"
print "starting client...",
- print client + updatedClientOptions
clientPipe = os.popen(client + updatedClientOptions)
output = clientPipe.readline()
if not output:
diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp
index 0d642e39a69..94b688fb545 100644
--- a/cpp/src/Ice/Proxy.cpp
+++ b/cpp/src/Ice/Proxy.cpp
@@ -348,7 +348,7 @@ IceProxy::Ice::Object::__handleException(const LocalException& ex, int& cnt)
{
++cnt;
}
- catch (const IceSecurity::SecurityException& ex) // TODO: bandaid to make retry w/ ssl work.
+ catch (const IceSecurity::SecurityException&) // TODO: bandaid to make retry w/ ssl work.
{
++cnt;
}