diff options
| author | Bernard Normier <bernard@zeroc.com> | 2016-08-03 14:08:32 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2016-08-03 14:08:32 -0400 |
| commit | c36d0acbeb23017705a7096dcf97e688c8ec62be (patch) | |
| tree | 0668919d27c5fdb8c4a4dd9e8e23c99262145990 /cpp/src/Ice/Proxy.cpp | |
| parent | Added missing <iterator> (diff) | |
| download | ice-c36d0acbeb23017705a7096dcf97e688c8ec62be.tar.bz2 ice-c36d0acbeb23017705a7096dcf97e688c8ec62be.tar.xz ice-c36d0acbeb23017705a7096dcf97e688c8ec62be.zip | |
Fixed C++11 relational operators on ObjectPrx
Removed many useless operator!=
Diffstat (limited to 'cpp/src/Ice/Proxy.cpp')
| -rw-r--r-- | cpp/src/Ice/Proxy.cpp | 20 |
1 files changed, 4 insertions, 16 deletions
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; |