Fixed C++11 relational operators on ObjectPrx

Removed many useless operator!=

26 files changed, 4 insertions, 135 deletions

diff --git a/cpp/src/Ice/Connector.h b/cpp/src/Ice/Connector.h
index 377c0427f03..12773c7c0a7 100644
--- a/cpp/src/Ice/Connector.h
+++ b/cpp/src/Ice/Connector.h
@@ -29,7 +29,6 @@ public:
     virtual std::string toString() const = 0;
 
     virtual bool operator==(const Connector&) const = 0;
-    virtual bool operator!=(const Connector&) const = 0;
     virtual bool operator<(const Connector&) const = 0;
 };
 
diff --git a/cpp/src/Ice/LocatorInfo.cpp b/cpp/src/Ice/LocatorInfo.cpp
index 1d723029947..e212d157552 100644
--- a/cpp/src/Ice/LocatorInfo.cpp
+++ b/cpp/src/Ice/LocatorInfo.cpp
@@ -572,16 +572,6 @@ IceInternal::LocatorInfo::operator==(const LocatorInfo& rhs) const
 }
 
 bool
-IceInternal::LocatorInfo::operator!=(const LocatorInfo& rhs) const
-{
-#ifdef ICE_CPP11_MAPPING
-    return !Ice::targetEquals(_locator, rhs._locator);
-#else
-    return _locator != rhs._locator;
-#endif
-}
-
-bool
 IceInternal::LocatorInfo::operator<(const LocatorInfo& rhs) const
 {
 #ifdef ICE_CPP11_MAPPING
diff --git a/cpp/src/Ice/LocatorInfo.h b/cpp/src/Ice/LocatorInfo.h
index 25b116913c3..f20f0b71b24 100644
--- a/cpp/src/Ice/LocatorInfo.h
+++ b/cpp/src/Ice/LocatorInfo.h
@@ -141,7 +141,6 @@ public:
     void destroy();
 
     bool operator==(const LocatorInfo&) const;
-    bool operator!=(const LocatorInfo&) const;
     bool operator<(const LocatorInfo&) const;
 
     const Ice::LocatorPrxPtr& getLocator() const
diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp
index a974c133ed6..9a38f948c1a 100644
--- a/cpp/src/Ice/Proxy.cpp
+++ b/cpp/src/Ice/Proxy.cpp
@@ -52,21 +52,15 @@ const string ice_flushBatchRequests_name = "ice_flushBatchRequests";
 #ifdef ICE_CPP11_MAPPING // C++11 mapping
 
 bool
-Ice::ObjectPrx::operator==(const ObjectPrx& r) const
+Ice::operator<(const ObjectPrx& lhs, const ObjectPrx& rhs)
 {
-    return _reference == r._reference;
-}
-
-bool
-Ice::ObjectPrx::operator!=(const ObjectPrx& r) const
-{
-    return _reference != r._reference;
+    return lhs._reference < rhs._reference;
 }
 
 bool
-Ice::ObjectPrx::operator<(const ObjectPrx& r) const
+Ice::operator==(const ObjectPrx& lhs, const ObjectPrx& rhs)
 {
-    return _reference < r._reference;
+    return lhs._reference == rhs._reference;
 }
 
 void
@@ -174,12 +168,6 @@ IceProxy::Ice::Object::operator==(const Object& r) const
 }
 
 bool
-IceProxy::Ice::Object::operator!=(const Object& r) const
-{
-    return _reference != r._reference;
-}
-
-bool
 IceProxy::Ice::Object::operator<(const Object& r) const
 {
     return _reference < r._reference;
diff --git a/cpp/src/Ice/Reference.cpp b/cpp/src/Ice/Reference.cpp
index 92ca821b3e9..b2934ecdaf3 100644
--- a/cpp/src/Ice/Reference.cpp
+++ b/cpp/src/Ice/Reference.cpp
@@ -383,12 +383,6 @@ IceInternal::Reference::operator==(const Reference& r) const
 }
 
 bool
-IceInternal::Reference::operator!=(const Reference& r) const
-{
-    return !operator==(r);
-}
-
-bool
 IceInternal::Reference::operator<(const Reference& r) const
 {
     //
@@ -842,12 +836,6 @@ IceInternal::FixedReference::operator==(const Reference& r) const
 }
 
 bool
-IceInternal::FixedReference::operator!=(const Reference& r) const
-{
-    return !operator==(r);
-}
-
-bool
 IceInternal::FixedReference::operator<(const Reference& r) const
 {
     if(this == &r)
@@ -1378,12 +1366,6 @@ IceInternal::RoutableReference::operator==(const Reference& r) const
 }
 
 bool
-IceInternal::RoutableReference::operator!=(const Reference& r) const
-{
-    return !operator==(r);
-}
-
-bool
 IceInternal::RoutableReference::operator<(const Reference& r) const
 {
     if(this == &r)
diff --git a/cpp/src/Ice/Reference.h b/cpp/src/Ice/Reference.h
index d1a6c4f5608..d3612f6cedd 100644
--- a/cpp/src/Ice/Reference.h
+++ b/cpp/src/Ice/Reference.h
@@ -144,7 +144,6 @@ public:
     virtual BatchRequestQueuePtr getBatchRequestQueue() const = 0;
 
     virtual bool operator==(const Reference&) const;
-    virtual bool operator!=(const Reference&) const;
     virtual bool operator<(const Reference&) const;
 
     virtual ReferencePtr clone() const = 0;
@@ -220,7 +219,6 @@ public:
     virtual BatchRequestQueuePtr getBatchRequestQueue() const;
 
     virtual bool operator==(const Reference&) const;
-    virtual bool operator!=(const Reference&) const;
     virtual bool operator<(const Reference&) const;
 
     virtual ReferencePtr clone() const;
@@ -275,7 +273,6 @@ public:
     virtual Ice::PropertyDict toProperty(const std::string&) const;
 
     virtual bool operator==(const Reference&) const;
-    virtual bool operator!=(const Reference&) const;
     virtual bool operator<(const Reference&) const;
 
     virtual ReferencePtr clone() const;
diff --git a/cpp/src/Ice/RouterInfo.cpp b/cpp/src/Ice/RouterInfo.cpp
index bd4bc46ff43..1589e84be90 100644
--- a/cpp/src/Ice/RouterInfo.cpp
+++ b/cpp/src/Ice/RouterInfo.cpp
@@ -137,16 +137,6 @@ IceInternal::RouterInfo::operator==(const RouterInfo& rhs) const
 }
 
 bool
-IceInternal::RouterInfo::operator!=(const RouterInfo& rhs) const
-{
-#ifdef ICE_CPP11_MAPPING
-    return !Ice::targetEquals(_router, rhs._router);
-#else
-    return _router != rhs._router;
-#endif
-}
-
-bool
 IceInternal::RouterInfo::operator<(const RouterInfo& rhs) const
 {
 #ifdef ICE_CPP11_MAPPING
diff --git a/cpp/src/Ice/RouterInfo.h b/cpp/src/Ice/RouterInfo.h
index acd24af3476..a7e632a5951 100644
--- a/cpp/src/Ice/RouterInfo.h
+++ b/cpp/src/Ice/RouterInfo.h
@@ -82,7 +82,6 @@ public:
     void destroy();
 
     bool operator==(const RouterInfo&) const;
-    bool operator!=(const RouterInfo&) const;
     bool operator<(const RouterInfo&) const;
 
     const Ice::RouterPrxPtr& getRouter() const
diff --git a/cpp/src/Ice/TcpConnector.cpp b/cpp/src/Ice/TcpConnector.cpp
index 1f4a7e1e197..44d55e795fa 100644
--- a/cpp/src/Ice/TcpConnector.cpp
+++ b/cpp/src/Ice/TcpConnector.cpp
@@ -72,12 +72,6 @@ IceInternal::TcpConnector::operator==(const Connector& r) const
 }
 
 bool
-IceInternal::TcpConnector::operator!=(const Connector& r) const
-{
-    return !operator==(r);
-}
-
-bool
 IceInternal::TcpConnector::operator<(const Connector& r) const
 {
     const TcpConnector* p = dynamic_cast<const TcpConnector*>(&r);
diff --git a/cpp/src/Ice/TcpConnector.h b/cpp/src/Ice/TcpConnector.h
index b749a694546..07f1bac84b0 100644
--- a/cpp/src/Ice/TcpConnector.h
+++ b/cpp/src/Ice/TcpConnector.h
@@ -28,7 +28,6 @@ public:
     virtual std::string toString() const;
 
     virtual bool operator==(const Connector&) const;
-    virtual bool operator!=(const Connector&) const;
     virtual bool operator<(const Connector&) const;
 
 private:
diff --git a/cpp/src/Ice/Thread.cpp b/cpp/src/Ice/Thread.cpp
index 12c5fc1738c..7882a0a2948 100644
--- a/cpp/src/Ice/Thread.cpp
+++ b/cpp/src/Ice/Thread.cpp
@@ -238,12 +238,6 @@ IceUtil::Thread::operator==(const Thread& rhs) const
 }
 
 bool
-IceUtil::Thread::operator!=(const Thread& rhs) const
-{
-    return this != &rhs;
-}
-
-bool
 IceUtil::Thread::operator<(const Thread& rhs) const
 {
     return this < &rhs;
@@ -503,12 +497,6 @@ IceUtil::Thread::operator==(const Thread& rhs) const
 }
 
 bool
-IceUtil::Thread::operator!=(const Thread& rhs) const
-{
-    return this != &rhs;
-}
-
-bool
 IceUtil::Thread::operator<(const Thread& rhs) const
 {
     return this < &rhs;
@@ -790,12 +778,6 @@ IceUtil::Thread::operator==(const Thread& rhs) const
 }
 
 bool
-IceUtil::Thread::operator!=(const Thread& rhs) const
-{
-    return this != &rhs;
-}
-
-bool
 IceUtil::Thread::operator<(const Thread& rhs) const
 {
     return this < &rhs;
diff --git a/cpp/src/Ice/UdpConnector.cpp b/cpp/src/Ice/UdpConnector.cpp
index 9d591033be1..ec98c4c0f76 100644
--- a/cpp/src/Ice/UdpConnector.cpp
+++ b/cpp/src/Ice/UdpConnector.cpp
@@ -72,12 +72,6 @@ IceInternal::UdpConnector::operator==(const Connector& r) const
 }
 
 bool
-IceInternal::UdpConnector::operator!=(const Connector& r) const
-{
-    return !operator==(r);
-}
-
-bool
 IceInternal::UdpConnector::operator<(const Connector& r) const
 {
     const UdpConnector* p = dynamic_cast<const UdpConnector*>(&r);
diff --git a/cpp/src/Ice/UdpConnector.h b/cpp/src/Ice/UdpConnector.h
index 694af385c0e..077d6cf934e 100644
--- a/cpp/src/Ice/UdpConnector.h
+++ b/cpp/src/Ice/UdpConnector.h
@@ -28,7 +28,6 @@ public:
     virtual std::string toString() const;
 
     virtual bool operator==(const Connector&) const;
-    virtual bool operator!=(const Connector&) const;
     virtual bool operator<(const Connector&) const;
 
 private:
diff --git a/cpp/src/Ice/WSConnector.cpp b/cpp/src/Ice/WSConnector.cpp
index beec5f0ab70..4d856e974fa 100644
--- a/cpp/src/Ice/WSConnector.cpp
+++ b/cpp/src/Ice/WSConnector.cpp
@@ -62,12 +62,6 @@ IceInternal::WSConnector::operator==(const Connector& r) const
 }
 
 bool
-IceInternal::WSConnector::operator!=(const Connector& r) const
-{
-    return !operator==(r);
-}
-
-bool
 IceInternal::WSConnector::operator<(const Connector& r) const
 {
     const WSConnector* p = dynamic_cast<const WSConnector*>(&r);
diff --git a/cpp/src/Ice/WSConnector.h b/cpp/src/Ice/WSConnector.h
index 176ec9d770c..9c13d0b9012 100644
--- a/cpp/src/Ice/WSConnector.h
+++ b/cpp/src/Ice/WSConnector.h
@@ -30,7 +30,6 @@ public:
     virtual std::string toString() const;
 
     virtual bool operator==(const Connector&) const;
-    virtual bool operator!=(const Connector&) const;
     virtual bool operator<(const Connector&) const;
 
 
diff --git a/cpp/src/Ice/ios/StreamConnector.cpp b/cpp/src/Ice/ios/StreamConnector.cpp
index 2e3d95ef7a8..70b604fc92d 100644
--- a/cpp/src/Ice/ios/StreamConnector.cpp
+++ b/cpp/src/Ice/ios/StreamConnector.cpp
@@ -107,12 +107,6 @@ IceObjC::StreamConnector::operator==(const IceInternal::Connector& r) const
 }
 
 bool
-IceObjC::StreamConnector::operator!=(const IceInternal::Connector& r) const
-{
-    return !operator==(r);
-}
-
-bool
 IceObjC::StreamConnector::operator<(const IceInternal::Connector& r) const
 {
     const StreamConnector* p = dynamic_cast<const StreamConnector*>(&r);
diff --git a/cpp/src/Ice/ios/StreamConnector.h b/cpp/src/Ice/ios/StreamConnector.h
index 6b93275c34a..c5c82a57b19 100644
--- a/cpp/src/Ice/ios/StreamConnector.h
+++ b/cpp/src/Ice/ios/StreamConnector.h
@@ -31,7 +31,6 @@ public:
     virtual std::string toString() const;
 
     virtual bool operator==(const IceInternal::Connector&) const;
-    virtual bool operator!=(const IceInternal::Connector&) const;
     virtual bool operator<(const IceInternal::Connector&) const;
 
 private:
diff --git a/cpp/src/IceBT/ConnectorI.cpp b/cpp/src/IceBT/ConnectorI.cpp
index d3808f52c73..ba1ecc2b24a 100644
--- a/cpp/src/IceBT/ConnectorI.cpp
+++ b/cpp/src/IceBT/ConnectorI.cpp
@@ -82,12 +82,6 @@ IceBT::ConnectorI::operator==(const IceInternal::Connector& r) const
 }
 
 bool
-IceBT::ConnectorI::operator!=(const IceInternal::Connector& r) const
-{
-    return !operator==(r);
-}
-
-bool
 IceBT::ConnectorI::operator<(const IceInternal::Connector& r) const
 {
     const ConnectorI* p = dynamic_cast<const ConnectorI*>(&r);
diff --git a/cpp/src/IceBT/ConnectorI.h b/cpp/src/IceBT/ConnectorI.h
index d1f7f41b8e6..b1ea99c269f 100644
--- a/cpp/src/IceBT/ConnectorI.h
+++ b/cpp/src/IceBT/ConnectorI.h
@@ -30,7 +30,6 @@ public:
     virtual std::string toString() const;
 
     virtual bool operator==(const IceInternal::Connector&) const;
-    virtual bool operator!=(const IceInternal::Connector&) const;
     virtual bool operator<(const IceInternal::Connector&) const;
 
 private:
diff --git a/cpp/src/IceIAP/Connector.h b/cpp/src/IceIAP/Connector.h
index f2bd4281d95..c1c449ea0b2 100644
--- a/cpp/src/IceIAP/Connector.h
+++ b/cpp/src/IceIAP/Connector.h
@@ -37,7 +37,6 @@ public:
     virtual std::string toString() const;
 
     virtual bool operator==(const IceInternal::Connector&) const;
-    virtual bool operator!=(const IceInternal::Connector&) const;
     virtual bool operator<(const IceInternal::Connector&) const;
 
 private:
diff --git a/cpp/src/IceSSL/ConnectorI.cpp b/cpp/src/IceSSL/ConnectorI.cpp
index 532847ec0ed..1d2ee15efd2 100644
--- a/cpp/src/IceSSL/ConnectorI.cpp
+++ b/cpp/src/IceSSL/ConnectorI.cpp
@@ -78,12 +78,6 @@ IceSSL::ConnectorI::operator==(const IceInternal::Connector& r) const
 }
 
 bool
-IceSSL::ConnectorI::operator!=(const IceInternal::Connector& r) const
-{
-    return !operator==(r);
-}
-
-bool
 IceSSL::ConnectorI::operator<(const IceInternal::Connector& r) const
 {
     const ConnectorI* p = dynamic_cast<const ConnectorI*>(&r);
diff --git a/cpp/src/IceSSL/ConnectorI.h b/cpp/src/IceSSL/ConnectorI.h
index e1434d97d1b..5334547e56a 100644
--- a/cpp/src/IceSSL/ConnectorI.h
+++ b/cpp/src/IceSSL/ConnectorI.h
@@ -31,7 +31,6 @@ public:
     virtual std::string toString() const;
 
     virtual bool operator==(const IceInternal::Connector&) const;
-    virtual bool operator!=(const IceInternal::Connector&) const;
     virtual bool operator<(const IceInternal::Connector&) const;
 
 private:
diff --git a/cpp/src/IceSSL/uwp/ConnectorI.cpp b/cpp/src/IceSSL/uwp/ConnectorI.cpp
index b02cc2c95dd..0d185e5823f 100644
--- a/cpp/src/IceSSL/uwp/ConnectorI.cpp
+++ b/cpp/src/IceSSL/uwp/ConnectorI.cpp
@@ -73,12 +73,6 @@ IceSSL::ConnectorI::operator==(const Connector& r) const
 }
 
 bool
-IceSSL::ConnectorI::operator!=(const Connector& r) const
-{
-    return !operator==(r);
-}
-
-bool
 IceSSL::ConnectorI::operator<(const Connector& r) const
 {
     const ConnectorI* p = dynamic_cast<const ConnectorI*>(&r);
diff --git a/cpp/src/IceSSL/uwp/ConnectorI.h b/cpp/src/IceSSL/uwp/ConnectorI.h
index 0df71fc6cda..33dca004ea9 100644
--- a/cpp/src/IceSSL/uwp/ConnectorI.h
+++ b/cpp/src/IceSSL/uwp/ConnectorI.h
@@ -28,7 +28,6 @@ public:
     virtual std::string toString() const;
 
     virtual bool operator==(const IceInternal::Connector&) const;
-    virtual bool operator!=(const IceInternal::Connector&) const;
     virtual bool operator<(const IceInternal::Connector&) const;
 
 private:
diff --git a/cpp/src/Slice/Parser.cpp b/cpp/src/Slice/Parser.cpp
index a8685dbce3d..5a642a061f1 100644
--- a/cpp/src/Slice/Parser.cpp
+++ b/cpp/src/Slice/Parser.cpp
@@ -503,12 +503,6 @@ Slice::Contained::operator==(const Contained& rhs) const
     return _scoped == rhs._scoped;
 }
 
-bool
-Slice::Contained::operator!=(const Contained& rhs) const
-{
-    return _scoped != rhs._scoped;
-}
-
 Slice::Contained::Contained(const ContainerPtr& container, const string& name) :
     SyntaxTreeBase(container->unit()),
     _container(container),
diff --git a/cpp/src/Slice/Parser.h b/cpp/src/Slice/Parser.h
index eb0e97a5269..62b1ff435d1 100644
--- a/cpp/src/Slice/Parser.h
+++ b/cpp/src/Slice/Parser.h
@@ -390,7 +390,6 @@ public:
 
     bool operator<(const Contained&) const;
     bool operator==(const Contained&) const;
-    bool operator!=(const Contained&) const;
 
 protected: