[100476] trunk/dports/devel/zeroc-ice34

[blair at macports.org]

Revision: 100476
          https://trac.macports.org/changeset/100476
Author:   blair at macports.org
Date:     2012-12-13 09:00:36 -0800 (Thu, 13 Dec 2012)
Log Message:
-----------
zeroc-ice34: reverse merge r100468 which broke build.

Revision Links:
--------------
    https://trac.macports.org/changeset/100468

Modified Paths:
--------------
    trunk/dports/devel/zeroc-ice34/Portfile

Added Paths:
-----------
    trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.src.IceGrid.DescriptorHelper.cpp.diff

Modified: trunk/dports/devel/zeroc-ice34/Portfile
===================================================================
--- trunk/dports/devel/zeroc-ice34/Portfile	2012-12-13 16:00:46 UTC (rev 100475)
+++ trunk/dports/devel/zeroc-ice34/Portfile	2012-12-13 17:00:36 UTC (rev 100476)
@@ -83,6 +83,7 @@
                 patch-ice.cpp.src.Ice.Service.cpp.diff \
                 patch-ice.cpp.src.Ice.Stream.cpp.diff \
                 patch-ice.cpp.src.IceGrid.AdminCallbackRouter.cpp.diff \
+                patch-ice.cpp.src.IceGrid.DescriptorHelper.cpp.diff \
                 patch-ice.cpp.src.IceGrid.Internal.ice.diff \
                 patch-ice.cpp.src.IceGrid.InternalRegistryI.cpp.diff \
                 patch-ice.cpp.src.IceGrid.InternalRegistryI.h.diff \

Copied: trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.src.IceGrid.DescriptorHelper.cpp.diff (from rev 100467, trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.src.IceGrid.DescriptorHelper.cpp.diff)
===================================================================
--- trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.src.IceGrid.DescriptorHelper.cpp.diff	                        (rev 0)
+++ trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.src.IceGrid.DescriptorHelper.cpp.diff	2012-12-13 17:00:36 UTC (rev 100476)
@@ -0,0 +1,35 @@
+--- 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<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 +214,16 @@
+     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)
+ {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121213/f147afd6/attachment-0001.html>