diff options
| author | Bernard Normier <bernard@zeroc.com> | 2016-09-13 14:55:00 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2016-09-13 14:55:00 -0400 |
| commit | ff3a67ff02a5482ff7ff34faf5fbecd35c048d4a (patch) | |
| tree | 408414bcb7cb4ac92567b59088270927e8d03d32 /cpp | |
| parent | Remove icegrid-slice*.ice.gz and upgradeicegrid36.py not longer used with 3.7 (diff) | |
| download | ice-ff3a67ff02a5482ff7ff34faf5fbecd35c048d4a.tar.bz2 ice-ff3a67ff02a5482ff7ff34faf5fbecd35c048d4a.tar.xz ice-ff3a67ff02a5482ff7ff34faf5fbecd35c048d4a.zip | |
Fixed C++11 relational operators build failure with GCC 6
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/Ice/Proxy.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp index a31d4022abb..5555d4214a1 100644 --- a/cpp/src/Ice/Proxy.cpp +++ b/cpp/src/Ice/Proxy.cpp @@ -50,18 +50,23 @@ const string ice_flushBatchRequests_name = "ice_flushBatchRequests"; #ifdef ICE_CPP11_MAPPING // C++11 mapping +namespace Ice +{ + bool -Ice::operator<(const ObjectPrx& lhs, const ObjectPrx& rhs) +operator<(const ObjectPrx& lhs, const ObjectPrx& rhs) { return lhs._reference < rhs._reference; } bool -Ice::operator==(const ObjectPrx& lhs, const ObjectPrx& rhs) +operator==(const ObjectPrx& lhs, const ObjectPrx& rhs) { return lhs._reference == rhs._reference; } +} + void Ice::ObjectPrx::__ice_isA(const shared_ptr<IceInternal::OutgoingAsyncT<bool>>& outAsync, const string& typeId, |