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/LocatorInfo.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/LocatorInfo.h')
| -rw-r--r-- | cpp/src/Ice/LocatorInfo.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/cpp/src/Ice/LocatorInfo.h b/cpp/src/Ice/LocatorInfo.h index f20f0b71b24..36528f7790d 100644 --- a/cpp/src/Ice/LocatorInfo.h +++ b/cpp/src/Ice/LocatorInfo.h @@ -45,8 +45,15 @@ private: const bool _background; - std::map<Ice::LocatorPrxPtr, LocatorInfoPtr> _table; - std::map<Ice::LocatorPrxPtr, LocatorInfoPtr>::iterator _tableHint; +#ifdef ICE_CPP11_MAPPING + using LocatorInfoTable = std::map<std::shared_ptr<Ice::LocatorPrx>, + LocatorInfoPtr, + Ice::TargetCompare<std::shared_ptr<Ice::LocatorPrx>, std::less>>; +#else + typedef std::map<Ice::LocatorPrx, LocatorInfoPtr> LocatorInfoTable; +#endif + LocatorInfoTable _table; + LocatorInfoTable::iterator _tableHint; std::map<std::pair<Ice::Identity, Ice::EncodingVersion>, LocatorTablePtr> _locatorTables; }; |