diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/all.dsw | 9 | ||||
| -rw-r--r-- | cpp/test/IceGrid/session/AllTests.cpp | 22 |
2 files changed, 17 insertions, 14 deletions
diff --git a/cpp/all.dsw b/cpp/all.dsw index b5f5eadc931..eef7e5d94b2 100644 --- a/cpp/all.dsw +++ b/cpp/all.dsw @@ -2354,9 +2354,6 @@ Package=<4> Begin Project Dependency
Project_Dep_Name glacier2
End Project Dependency
- Begin Project Dependency
- Project_Dep_Name icessl
- End Project Dependency
}}}
###############################################################################
@@ -2375,6 +2372,12 @@ Package=<4> Begin Project Dependency
Project_Dep_Name iceutil
End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name glacier2
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name icessl
+ End Project Dependency
}}}
###############################################################################
diff --git a/cpp/test/IceGrid/session/AllTests.cpp b/cpp/test/IceGrid/session/AllTests.cpp index 95b70431e33..2e4fc659ded 100644 --- a/cpp/test/IceGrid/session/AllTests.cpp +++ b/cpp/test/IceGrid/session/AllTests.cpp @@ -427,13 +427,13 @@ public: filtered.servers.push_back(*p); } - for(AdapterDynamicInfoSeq::const_iterator p = info.adapters.begin(); p != info.adapters.end(); ++p) + for(AdapterDynamicInfoSeq::const_iterator a = info.adapters.begin(); a != info.adapters.end(); ++a) { - if(p->id == "PermissionsVerifierServer.Server") + if(a->id == "PermissionsVerifierServer.Server") { continue; } - filtered.adapters.push_back(*p); + filtered.adapters.push_back(*a); } return filtered; @@ -790,14 +790,14 @@ allTests(const Ice::CommunicatorPtr& communicator) { router1->destroySession(); } - catch(const Ice::ConnectionLostException& ex) + catch(const Ice::ConnectionLostException&) { } try { router2->destroySession(); } - catch(const Ice::ConnectionLostException& ex) + catch(const Ice::ConnectionLostException&) { } @@ -892,14 +892,14 @@ allTests(const Ice::CommunicatorPtr& communicator) { adminRouter1->destroySession(); } - catch(const Ice::ConnectionLostException& ex) + catch(const Ice::ConnectionLostException&) { } try { adminRouter2->destroySession(); } - catch(const Ice::ConnectionLostException& ex) + catch(const Ice::ConnectionLostException&) { } @@ -968,14 +968,14 @@ allTests(const Ice::CommunicatorPtr& communicator) { router1->destroySession(); } - catch(const Ice::ConnectionLostException& ex) + catch(const Ice::ConnectionLostException&) { } try { router2->destroySession(); } - catch(const Ice::ConnectionLostException& ex) + catch(const Ice::ConnectionLostException&) { } @@ -1062,14 +1062,14 @@ allTests(const Ice::CommunicatorPtr& communicator) { adminRouter1->destroySession(); } - catch(const Ice::ConnectionLostException& ex) + catch(const Ice::ConnectionLostException&) { } try { adminRouter2->destroySession(); } - catch(const Ice::ConnectionLostException& ex) + catch(const Ice::ConnectionLostException&) { } |