diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-09-17 15:19:14 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-09-17 15:19:14 +0200 |
| commit | 30daedd1ef690457f535a8a2d4db9df8f65103c1 (patch) | |
| tree | 6a4f0dc6697b6ca078c309719145ddaf9fd37411 /cpp/src/Ice/InstrumentationI.cpp | |
| parent | Merge remote-tracking branch 'origin/encoding11' into mx (diff) | |
| download | ice-30daedd1ef690457f535a8a2d4db9df8f65103c1.tar.bz2 ice-30daedd1ef690457f535a8a2d4db9df8f65103c1.tar.xz ice-30daedd1ef690457f535a8a2d4db9df8f65103c1.zip | |
Win32 fixes
Diffstat (limited to 'cpp/src/Ice/InstrumentationI.cpp')
| -rw-r--r-- | cpp/src/Ice/InstrumentationI.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cpp/src/Ice/InstrumentationI.cpp b/cpp/src/Ice/InstrumentationI.cpp index 5259d4a0441..b3b94b1e061 100644 --- a/cpp/src/Ice/InstrumentationI.cpp +++ b/cpp/src/Ice/InstrumentationI.cpp @@ -242,7 +242,6 @@ public: add("operation", &DispatchHelper::getCurrent, &Current::operation); add("identity", &DispatchHelper::getIdentity); add("facet", &DispatchHelper::getCurrent, &Current::facet); - add("encoding", &DispatchHelper::getCurrent, &Current::encoding); add("mode", &DispatchHelper::getMode); setDefault(&DispatchHelper::resolve); @@ -443,7 +442,7 @@ public: { os << _proxy << " [" << _operation << ']'; } - catch(const FixedProxyException& ex) + catch(const FixedProxyException&) { os << _proxy->ice_getCommunicator()->identityToString(_proxy->ice_getIdentity()); os << " [" << _operation << ']'; |