diff options
| author | Brent Eagles <brent@zeroc.com> | 2007-06-19 11:30:34 -0230 |
|---|---|---|
| committer | Brent Eagles <brent@zeroc.com> | 2007-06-19 11:30:34 -0230 |
| commit | e613d2e4cded8ae1a44c8b1d9afb4a4443de4b65 (patch) | |
| tree | b10509f7729b3b1a45fbd80d80aa9b71e6219b8c /cpp/src | |
| parent | Merge branch 'property_names_enh' (diff) | |
| parent | http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=2236 - Remove operator!= f... (diff) | |
| download | ice-e613d2e4cded8ae1a44c8b1d9afb4a4443de4b65.tar.bz2 ice-e613d2e4cded8ae1a44c8b1d9afb4a4443de4b65.tar.xz ice-e613d2e4cded8ae1a44c8b1d9afb4a4443de4b65.zip | |
Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Ice/EndpointI.h | 1 | ||||
| -rw-r--r-- | cpp/src/Ice/LocalObject.cpp | 6 | ||||
| -rw-r--r-- | cpp/src/Ice/Object.cpp | 6 | ||||
| -rw-r--r-- | cpp/src/Ice/TcpEndpointI.h | 1 | ||||
| -rw-r--r-- | cpp/src/Ice/UdpEndpointI.h | 1 | ||||
| -rw-r--r-- | cpp/src/Ice/UnknownEndpointI.h | 1 | ||||
| -rw-r--r-- | cpp/src/IceSSL/EndpointI.h | 1 |
7 files changed, 0 insertions, 17 deletions
diff --git a/cpp/src/Ice/EndpointI.h b/cpp/src/Ice/EndpointI.h index e5c76fb77c8..9470d0e4468 100644 --- a/cpp/src/Ice/EndpointI.h +++ b/cpp/src/Ice/EndpointI.h @@ -133,7 +133,6 @@ private: // hidding these operators. // using LocalObject::operator==; - using LocalObject::operator!=; using LocalObject::operator<; #endif }; diff --git a/cpp/src/Ice/LocalObject.cpp b/cpp/src/Ice/LocalObject.cpp index bbe4ee63899..38ac534ab85 100644 --- a/cpp/src/Ice/LocalObject.cpp +++ b/cpp/src/Ice/LocalObject.cpp @@ -22,12 +22,6 @@ Ice::LocalObject::operator==(const LocalObject& r) const } bool -Ice::LocalObject::operator!=(const LocalObject& r) const -{ - return this != &r; -} - -bool Ice::LocalObject::operator<(const LocalObject& r) const { return this < &r; diff --git a/cpp/src/Ice/Object.cpp b/cpp/src/Ice/Object.cpp index 5295d6033ed..3b8d2a64b07 100644 --- a/cpp/src/Ice/Object.cpp +++ b/cpp/src/Ice/Object.cpp @@ -28,12 +28,6 @@ Ice::Object::operator==(const Object& r) const } bool -Ice::Object::operator!=(const Object& r) const -{ - return this != &r; -} - -bool Ice::Object::operator<(const Object& r) const { return this < &r; diff --git a/cpp/src/Ice/TcpEndpointI.h b/cpp/src/Ice/TcpEndpointI.h index 42f2f1e2eda..7ea83d790d9 100644 --- a/cpp/src/Ice/TcpEndpointI.h +++ b/cpp/src/Ice/TcpEndpointI.h @@ -55,7 +55,6 @@ private: // hidding these operators. // using LocalObject::operator==; - using LocalObject::operator!=; using LocalObject::operator<; #endif diff --git a/cpp/src/Ice/UdpEndpointI.h b/cpp/src/Ice/UdpEndpointI.h index 7b1ec721d13..80c33c873e2 100644 --- a/cpp/src/Ice/UdpEndpointI.h +++ b/cpp/src/Ice/UdpEndpointI.h @@ -56,7 +56,6 @@ private: // hidding these operators. // using LocalObject::operator==; - using LocalObject::operator!=; using LocalObject::operator<; #endif diff --git a/cpp/src/Ice/UnknownEndpointI.h b/cpp/src/Ice/UnknownEndpointI.h index 2d30051573d..e9c0069f261 100644 --- a/cpp/src/Ice/UnknownEndpointI.h +++ b/cpp/src/Ice/UnknownEndpointI.h @@ -52,7 +52,6 @@ private: // hidding these operators. // using LocalObject::operator==; - using LocalObject::operator!=; using LocalObject::operator<; #endif diff --git a/cpp/src/IceSSL/EndpointI.h b/cpp/src/IceSSL/EndpointI.h index 1a91c1efd1b..c5a51375609 100644 --- a/cpp/src/IceSSL/EndpointI.h +++ b/cpp/src/IceSSL/EndpointI.h @@ -56,7 +56,6 @@ private: // hidding these operators. // using LocalObject::operator==; - using LocalObject::operator!=; using LocalObject::operator<; #endif |