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

[blair at macports.org]

Revision: 100468
          https://trac.macports.org/changeset/100468
Author:   blair at macports.org
Date:     2012-12-13 00:09:32 -0800 (Thu, 13 Dec 2012)
Log Message:
-----------
zeroc-ice34: remove noop patch patch-ice.cpp.src.IceGrid.DescriptorHelper.cpp.diff.

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

Removed 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 07:57:35 UTC (rev 100467)
+++ trunk/dports/devel/zeroc-ice34/Portfile	2012-12-13 08:09:32 UTC (rev 100468)
@@ -83,7 +83,6 @@
                 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 \

Deleted: 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	2012-12-13 07:57:35 UTC (rev 100467)
+++ trunk/dports/devel/zeroc-ice34/files/patch-ice.cpp.src.IceGrid.DescriptorHelper.cpp.diff	2012-12-13 08:09:32 UTC (rev 100468)
@@ -1,35 +0,0 @@
---- 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/4899234d/attachment.html>