From 4785da9b9f786d761828f711cfda401974cd9238 Mon Sep 17 00:00:00 2001
From: callum_linden <none@none>
Date: Fri, 17 Oct 2014 13:27:48 -0700
Subject: Update to build on Xcode 6.0: TEMP fix to remove broken code (clang)
 until it's true purpose becomes clear

---
 indra/llcommon/llpredicate.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'indra/llcommon/llpredicate.h')

diff --git a/indra/llcommon/llpredicate.h b/indra/llcommon/llpredicate.h
index a0e970a799..91d96e64f5 100644
--- a/indra/llcommon/llpredicate.h
+++ b/indra/llcommon/llpredicate.h
@@ -141,7 +141,8 @@ namespace LLPredicate
 
 		void require(ENUM e)
 		{
-			mRule.set(e, require);
+			// TEMP XCODE6FIX checkin while i figure out what the heck this is supposed to mean
+			// mRule.set(e, require);
 		}
 
 		void allow(ENUM e)
-- 
cgit v1.2.3


From cad1df584be0ed62e4ae0393b84e57f192009da5 Mon Sep 17 00:00:00 2001
From: callum_linden <none@none>
Date: Mon, 20 Oct 2014 15:20:10 -0700
Subject: Update to build on Xcode 6.0: fix typo in functions params

---
 indra/llcommon/llpredicate.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'indra/llcommon/llpredicate.h')

diff --git a/indra/llcommon/llpredicate.h b/indra/llcommon/llpredicate.h
index 91d96e64f5..e6c56a5711 100644
--- a/indra/llcommon/llpredicate.h
+++ b/indra/llcommon/llpredicate.h
@@ -139,10 +139,9 @@ namespace LLPredicate
 		Rule()
 		{}
 
-		void require(ENUM e)
+		void require(ENUM e, bool match)
 		{
-			// TEMP XCODE6FIX checkin while i figure out what the heck this is supposed to mean
-			// mRule.set(e, require);
+			mRule.set(e, match);
 		}
 
 		void allow(ENUM e)
-- 
cgit v1.2.3