From 5d33277604638f3cefe79c6592e2c19604f22c2c Mon Sep 17 00:00:00 2001 From: dpwrussell Date: Fri, 15 Nov 2013 00:32:15 +0000 Subject: ice: fix build against libc++ Closes #24368. Signed-off-by: Jack Nagel --- Library/Formula/ice.rb | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/Library/Formula/ice.rb b/Library/Formula/ice.rb index 62c6d6832..0a6bc84dc 100644 --- a/Library/Formula/ice.rb +++ b/Library/Formula/ice.rb @@ -108,3 +108,23 @@ diff -urN Ice-3.5.1.original/py/config/Make.rules.Darwin Ice-3.5.1/py/config/Mak -endif - -PYTHON_INCLUDE_DIR = $(PYTHON_HOME)/include/$(PYTHON_VERSION) +diff -urN Ice-3.5.1.original/cpp/src/IceGrid/DescriptorHelper.h Ice-3.5.1/cpp/src/IceGrid/DescriptorHelper.h +--- Ice-3.5.1.original/cpp/src/IceGrid/DescriptorHelper.h 2013-10-04 16:48:14.000000000 +0100 ++++ Ice-3.5.1/cpp/src/IceGrid/DescriptorHelper.h 2013-11-15 00:11:22.000000000 +0000 +@@ -247,7 +247,6 @@ + ServerInstanceHelper(const ServerInstanceDescriptor&, const Resolver&, bool); + ServerInstanceHelper(const ServerDescriptorPtr&, const Resolver&, bool); + +- void operator=(const ServerInstanceHelper&); + bool operator==(const ServerInstanceHelper&) const; + bool operator!=(const ServerInstanceHelper&) const; + +@@ -265,7 +264,7 @@ + + void init(const ServerDescriptorPtr&, const Resolver&, bool); + +- const ServerInstanceDescriptor _def; ++ ServerInstanceDescriptor _def; + std::string _id; + ServerInstanceDescriptor _instance; + -- cgit v1.2.3