diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2011-10-18 22:18:35 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2011-10-18 22:50:09 +0200 |
| commit | 54a5e8d05528c379b1c3465b908c18fe5aa5d2b3 (patch) | |
| tree | da218465a52a7eaf19c44d281fc3952e40f9f59b /cpp/src/IceGrid/DescriptorHelper.cpp | |
| parent | Fixed ICE-4722 - Bogus communicator initialization in Freeze map (diff) | |
| download | ice-54a5e8d05528c379b1c3465b908c18fe5aa5d2b3.tar.bz2 ice-54a5e8d05528c379b1c3465b908c18fe5aa5d2b3.tar.xz ice-54a5e8d05528c379b1c3465b908c18fe5aa5d2b3.zip | |
Fixed ICE-4721 - support for OS X clang
Diffstat (limited to 'cpp/src/IceGrid/DescriptorHelper.cpp')
| -rw-r--r-- | cpp/src/IceGrid/DescriptorHelper.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/cpp/src/IceGrid/DescriptorHelper.cpp b/cpp/src/IceGrid/DescriptorHelper.cpp index 9126c2fc7b4..bdc04a91217 100644 --- a/cpp/src/IceGrid/DescriptorHelper.cpp +++ b/cpp/src/IceGrid/DescriptorHelper.cpp @@ -198,16 +198,6 @@ updateSeqElts(const Seq& seq, const Seq& update, const Ice::StringSeq& remove, G return result; } -template<typename Dict> Dict -getDictUpdatedElts(const Dict& ldict, const Dict& rdict) -{ -#if defined(_MSC_VER) && (_MSC_VER < 1300) - return getDictUpdatedEltsWithEq(ldict, rdict, equal_to<Dict::mapped_type>()); -#else - return getDictUpdatedEltsWithEq(ldict, rdict, equal_to<typename Dict::mapped_type>()); -#endif -} - template<typename EqFunc, typename Dict> Dict getDictUpdatedEltsWithEq(const Dict& ldict, const Dict& rdict, EqFunc eq) { @@ -223,6 +213,16 @@ getDictUpdatedEltsWithEq(const Dict& ldict, const Dict& rdict, EqFunc eq) return result; } +template<typename Dict> Dict +getDictUpdatedElts(const Dict& ldict, const Dict& rdict) +{ +#if defined(_MSC_VER) && (_MSC_VER < 1300) + return getDictUpdatedEltsWithEq(ldict, rdict, equal_to<Dict::mapped_type>()); +#else + return getDictUpdatedEltsWithEq(ldict, rdict, equal_to<typename Dict::mapped_type>()); +#endif +} + template <typename Dict> Ice::StringSeq getDictRemovedElts(const Dict& ldict, const Dict& rdict) { |