diff options
| author | Bernard Normier <bernard@zeroc.com> | 2008-01-22 18:53:13 -0500 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2008-01-22 18:53:13 -0500 |
| commit | 4e20cac3603039df9d240a038e77004f60629f47 (patch) | |
| tree | cf37920bd2284ba3618a4482c1ffc54a5d59f404 /cpp/src/Ice/Reference.cpp | |
| parent | Updated mcpp build instructions (diff) | |
| download | ice-4e20cac3603039df9d240a038e77004f60629f47.tar.bz2 ice-4e20cac3603039df9d240a038e77004f60629f47.tar.xz ice-4e20cac3603039df9d240a038e77004f60629f47.zip | |
New VC60 third-party build + VC60 build fixes
Diffstat (limited to 'cpp/src/Ice/Reference.cpp')
| -rwxr-xr-x[-rw-r--r--] | cpp/src/Ice/Reference.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/cpp/src/Ice/Reference.cpp b/cpp/src/Ice/Reference.cpp index 1d1805afa0f..0d2e63b052a 100644..100755 --- a/cpp/src/Ice/Reference.cpp +++ b/cpp/src/Ice/Reference.cpp @@ -410,7 +410,7 @@ public: IceInternal::Reference::Reference(const InstancePtr& instance, const CommunicatorPtr& communicator, - const Identity& identity, + const Identity& id, const SharedContextPtr& context, const string& facet, Mode mode, @@ -420,7 +420,7 @@ IceInternal::Reference::Reference(const InstancePtr& instance, _communicator(communicator), _mode(mode), _secure(secure), - _identity(identity), + _identity(id), _context(context), _facet(facet), _overrideCompress(false), @@ -487,13 +487,13 @@ IceUtil::Shared* IceInternal::upCast(IceInternal::FixedReference* p) { return p; IceInternal::FixedReference::FixedReference(const InstancePtr& instance, const CommunicatorPtr& communicator, - const Identity& identity, + const Identity& id, const SharedContextPtr& context, const string& facet, Mode mode, bool secure, const ConnectionIPtr& fixedConnection) : - Reference(instance, communicator, identity, context, facet, mode, secure), + Reference(instance, communicator, id, context, facet, mode, secure), _fixedConnection(fixedConnection) { } @@ -797,7 +797,7 @@ IceUtil::Shared* IceInternal::upCast(IceInternal::RoutableReference* p) { return IceInternal::RoutableReference::RoutableReference(const InstancePtr& instance, const CommunicatorPtr& communicator, - const Identity& identity, + const Identity& id, const SharedContextPtr& context, const string& facet, Mode mode, @@ -812,7 +812,7 @@ IceInternal::RoutableReference::RoutableReference(const InstancePtr& instance, EndpointSelectionType endpointSelection, bool threadPerConnection, int locatorCacheTimeout) : - Reference(instance, communicator, identity, context, facet, mode, secure), + Reference(instance, communicator, id, context, facet, mode, secure), _endpoints(endpoints), _adapterId(adapterId), _locatorInfo(locatorInfo), @@ -893,7 +893,7 @@ ReferencePtr IceInternal::RoutableReference::changeCompress(bool newCompress) const { ReferencePtr r = Reference::changeCompress(newCompress); - if(r.get() != this && !_endpoints.empty()) // Also override the compress flag on the endpoints if it was updated. + if(r.get() != const_cast<RoutableReference*>(this) && !_endpoints.empty()) // Also override the compress flag on the endpoints if it was updated. { vector<EndpointIPtr> newEndpoints; for(vector<EndpointIPtr>::const_iterator p = _endpoints.begin(); p != _endpoints.end(); ++p) |