--- Ice-3.4.2.orig/cpp/src/IceGrid/DescriptorHelper.cpp 2011-06-15 21:43:59.000000000 +0200 +++ Ice-3.4.2/cpp/src/IceGrid/DescriptorHelper.cpp 2012-03-04 20:14:53.000000000 +0100 @@ -198,15 +198,6 @@ return result; } -template Dict -getDictUpdatedElts(const Dict& ldict, const Dict& rdict) -{ -#if defined(_MSC_VER) && (_MSC_VER < 1300) - return getDictUpdatedEltsWithEq(ldict, rdict, equal_to()); -#else - return getDictUpdatedEltsWithEq(ldict, rdict, equal_to()); -#endif -} template Dict getDictUpdatedEltsWithEq(const Dict& ldict, const Dict& rdict, EqFunc eq) @@ -223,6 +214,16 @@ return result; } +template Dict +getDictUpdatedElts(const Dict& ldict, const Dict& rdict) +{ +#if defined(_MSC_VER) && (_MSC_VER < 1300) + return getDictUpdatedEltsWithEq(ldict, rdict, equal_to()); +#else + return getDictUpdatedEltsWithEq(ldict, rdict, equal_to()); +#endif +} + template Ice::StringSeq getDictRemovedElts(const Dict& ldict, const Dict& rdict) {