diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2013-02-01 18:15:57 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2013-02-01 18:15:57 +0100 |
| commit | ba166110beb86f147aac6d221c9c41a1fb45d797 (patch) | |
| tree | 657d223239f76d16cf265ac95ce0b6b8813471da /cpp/src/Ice/InstrumentationI.cpp | |
| parent | Ice:/8929351 - remove tp_libidr/tp_bindir (diff) | |
| download | ice-ba166110beb86f147aac6d221c9c41a1fb45d797.tar.bz2 ice-ba166110beb86f147aac6d221c9c41a1fb45d797.tar.xz ice-ba166110beb86f147aac6d221c9c41a1fb45d797.zip | |
Fix for ICE-5140 - an opaque endpoint which doesn't specify -e is assumed to be a 1.0 encoded endpoint
Diffstat (limited to 'cpp/src/Ice/InstrumentationI.cpp')
| -rw-r--r-- | cpp/src/Ice/InstrumentationI.cpp | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/cpp/src/Ice/InstrumentationI.cpp b/cpp/src/Ice/InstrumentationI.cpp index e5a15432fd1..023e4669c09 100644 --- a/cpp/src/Ice/InstrumentationI.cpp +++ b/cpp/src/Ice/InstrumentationI.cpp @@ -560,24 +560,14 @@ private: const ConnectionInfoPtr& _connectionInfo; const EndpointPtr& _endpoint; -// -// Clang 4.2 reports unused-private-field for the _requestId -// field that is only used in the nested Attributes class. -// -#ifdef __clang__ -# pragma clang diagnostic push -# pragma clang diagnostic ignored "-Wunused-private-field" -#endif - +protected: + // + // COMPILERFIX: Clang 4.2 reports unused-private-field for the _requestId + // field that is only used in the nested Attributes class. + // const int _requestId; -// -// Restore diagnostic to previous state. -// -#ifdef __clang__ -# pragma clang diagnostic pop -#endif - +private: const int _size; mutable string _id; mutable EndpointInfoPtr _endpointInfo; |