diff options
| author | Bernard Normier <bernard@zeroc.com> | 2016-08-04 17:36:25 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2016-08-04 17:36:25 -0400 |
| commit | dc2f88ef6643b235a82be44b0682b75b7534c5e6 (patch) | |
| tree | d9084cd31009402bc5bad8ff4cd7e20f764387ea /cpp/src/Ice/Reference.cpp | |
| parent | Refactored shared_from_this/enable_shared_from_this (diff) | |
| download | ice-dc2f88ef6643b235a82be44b0682b75b7534c5e6.tar.bz2 ice-dc2f88ef6643b235a82be44b0682b75b7534c5e6.tar.xz ice-dc2f88ef6643b235a82be44b0682b75b7534c5e6.zip | |
New TargetCompare template, renamed targetEquals to targetEqualTo
Diffstat (limited to 'cpp/src/Ice/Reference.cpp')
| -rw-r--r-- | cpp/src/Ice/Reference.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/Ice/Reference.cpp b/cpp/src/Ice/Reference.cpp index b2934ecdaf3..86328e0880a 100644 --- a/cpp/src/Ice/Reference.cpp +++ b/cpp/src/Ice/Reference.cpp @@ -1343,11 +1343,11 @@ IceInternal::RoutableReference::operator==(const Reference& r) const } #ifdef ICE_CPP11_MAPPING // - // TODO: With C++14 we could use the vesion that receives four iterators and we don't need to explicitly - // check the sizesa are equal. + // TODO: With C++14 we could use the version that receives four iterators and we don't need to explicitly + // check the sizes are equal. // if(_endpoints.size() != rhs->_endpoints.size() || - !equal(_endpoints.begin(), _endpoints.end(), rhs->_endpoints.begin(), Ice::TargetEquals<shared_ptr<EndpointI>>())) + !equal(_endpoints.begin(), _endpoints.end(), rhs->_endpoints.begin(), Ice::TargetCompare<shared_ptr<EndpointI>, std::equal_to>())) #else if(_endpoints != rhs->_endpoints) #endif @@ -1474,7 +1474,7 @@ IceInternal::RoutableReference::operator<(const Reference& r) const } #ifdef ICE_CPP11_MAPPING if(lexicographical_compare(_endpoints.begin(), _endpoints.end(), rhs->_endpoints.begin(), rhs->_endpoints.end(), - Ice::TargetLess<shared_ptr<EndpointI>>())) + Ice::TargetCompare<shared_ptr<EndpointI>, std::less>())) #else if(_endpoints < rhs->_endpoints) #endif |