From dc2f88ef6643b235a82be44b0682b75b7534c5e6 Mon Sep 17 00:00:00 2001
From: Bernard Normier <bernard@zeroc.com>
Date: Thu, 4 Aug 2016 17:36:25 -0400
Subject: New TargetCompare template, renamed targetEquals to targetEqualTo

---
 cpp/src/Ice/Reference.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'cpp/src/Ice/Reference.cpp')

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
-- 
cgit v1.2.3