New TargetCompare template, renamed targetEquals to targetEqualTo

7 files changed, 10 insertions, 10 deletions

diff --git a/cpp/src/Ice/ConnectionFactory.h b/cpp/src/Ice/ConnectionFactory.h
index 46df6067236..92d2d400739 100644
--- a/cpp/src/Ice/ConnectionFactory.h
+++ b/cpp/src/Ice/ConnectionFactory.h
@@ -165,7 +165,7 @@ private:
     std::map<ConnectorPtr, std::set<ConnectCallbackPtr> > _pending;
 
 #ifdef ICE_CPP11_MAPPING
-    std::multimap<EndpointIPtr, Ice::ConnectionIPtr, Ice::TargetLess<EndpointIPtr>> _connectionsByEndpoint;
+    std::multimap<EndpointIPtr, Ice::ConnectionIPtr, Ice::TargetCompare<EndpointIPtr, std::less>> _connectionsByEndpoint;
 #else
     std::multimap<EndpointIPtr, Ice::ConnectionIPtr> _connectionsByEndpoint;
 #endif
diff --git a/cpp/src/Ice/LocatorInfo.cpp b/cpp/src/Ice/LocatorInfo.cpp
index e212d157552..d13d3f9f54f 100644
--- a/cpp/src/Ice/LocatorInfo.cpp
+++ b/cpp/src/Ice/LocatorInfo.cpp
@@ -565,7 +565,7 @@ bool
 IceInternal::LocatorInfo::operator==(const LocatorInfo& rhs) const
 {
 #ifdef ICE_CPP11_MAPPING
-    return Ice::targetEquals(_locator, rhs._locator);
+    return Ice::targetEqualTo(_locator, rhs._locator);
 #else
     return _locator == rhs._locator;
 #endif
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
diff --git a/cpp/src/Ice/RouterInfo.cpp b/cpp/src/Ice/RouterInfo.cpp
index 1589e84be90..c5c7b4c5df6 100644
--- a/cpp/src/Ice/RouterInfo.cpp
+++ b/cpp/src/Ice/RouterInfo.cpp
@@ -130,7 +130,7 @@ bool
 IceInternal::RouterInfo::operator==(const RouterInfo& rhs) const
 {
 #ifdef ICE_CPP11_MAPPING
-    return Ice::targetEquals(_router, rhs._router);
+    return Ice::targetEqualTo(_router, rhs._router);
 #else
     return _router == rhs._router;
 #endif
diff --git a/cpp/src/Ice/RouterInfo.h b/cpp/src/Ice/RouterInfo.h
index 298cbc455f4..6c9cdc8539f 100644
--- a/cpp/src/Ice/RouterInfo.h
+++ b/cpp/src/Ice/RouterInfo.h
@@ -45,7 +45,7 @@ private:
 #ifdef ICE_CPP11_MAPPING
     using RouterTableMap = std::map<std::shared_ptr<Ice::RouterPrx>,
                                     RouterInfoPtr,
-                                    Ice::TargetLess<std::shared_ptr<::Ice::RouterPrx>>>;
+                                    Ice::TargetCompare<std::shared_ptr<::Ice::RouterPrx>, std::less>>;
 #else
     typedef std::map<Ice::RouterPrxPtr, RouterInfoPtr> RouterTableMap;
 #endif
diff --git a/cpp/src/Ice/WSEndpoint.cpp b/cpp/src/Ice/WSEndpoint.cpp
index 244017087a2..0c41ac4a310 100644
--- a/cpp/src/Ice/WSEndpoint.cpp
+++ b/cpp/src/Ice/WSEndpoint.cpp
@@ -310,7 +310,7 @@ IceInternal::WSEndpoint::operator==(const Ice::LocalObject& r) const
         return true;
     }
 
-    if(!Ice::targetEquals(_delegate, p->_delegate))
+    if(!Ice::targetEqualTo(_delegate, p->_delegate))
     {
         return false;
     }
diff --git a/cpp/src/IceSSL/EndpointI.cpp b/cpp/src/IceSSL/EndpointI.cpp
index 08b78b1317a..73072ddea7a 100644
--- a/cpp/src/IceSSL/EndpointI.cpp
+++ b/cpp/src/IceSSL/EndpointI.cpp
@@ -258,7 +258,7 @@ IceSSL::EndpointI::operator==(const Ice::LocalObject& r) const
         return true;
     }
 
-    if(!Ice::targetEquals(_delegate, p->_delegate))
+    if(!Ice::targetEqualTo(_delegate, p->_delegate))
     {
         return false;
     }