diff options
| author | Bernard Normier <bernard@zeroc.com> | 2016-08-26 16:15:37 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2016-08-26 16:15:37 -0400 |
| commit | f7fe523fee0e828b781b9dc010bb0f80ea22853a (patch) | |
| tree | ffd913f8c16a56e579dd6f5f97eca08625d3418d /cpp/src/Ice/RouterInfo.h | |
| parent | Fix java-compat typo in TestUtil.py (diff) | |
| download | ice-f7fe523fee0e828b781b9dc010bb0f80ea22853a.tar.bz2 ice-f7fe523fee0e828b781b9dc010bb0f80ea22853a.tar.xz ice-f7fe523fee0e828b781b9dc010bb0f80ea22853a.zip | |
Fixed proxy comparison in C++11
Diffstat (limited to 'cpp/src/Ice/RouterInfo.h')
| -rw-r--r-- | cpp/src/Ice/RouterInfo.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cpp/src/Ice/RouterInfo.h b/cpp/src/Ice/RouterInfo.h index 6c9cdc8539f..76b70bb7bd5 100644 --- a/cpp/src/Ice/RouterInfo.h +++ b/cpp/src/Ice/RouterInfo.h @@ -43,15 +43,15 @@ public: private: #ifdef ICE_CPP11_MAPPING - using RouterTableMap = std::map<std::shared_ptr<Ice::RouterPrx>, - RouterInfoPtr, - Ice::TargetCompare<std::shared_ptr<::Ice::RouterPrx>, std::less>>; + using RouterInfoTable = std::map<std::shared_ptr<Ice::RouterPrx>, + RouterInfoPtr, + Ice::TargetCompare<std::shared_ptr<Ice::RouterPrx>, std::less>>; #else - typedef std::map<Ice::RouterPrxPtr, RouterInfoPtr> RouterTableMap; + typedef std::map<Ice::RouterPrx, RouterInfoPtr> RouterInfoTable; #endif - RouterTableMap _table; - RouterTableMap::iterator _tableHint; + RouterInfoTable _table; + RouterInfoTable::iterator _tableHint; }; class RouterInfo : public IceUtil::Shared, public IceUtil::Mutex |