From 17ff449ae6b2759f212daa4fd3de0a7ea2664866 Mon Sep 17 00:00:00 2001
From: callum_linden <none@none>
Date: Fri, 18 Sep 2015 15:07:27 -0700
Subject: [PATCH] Supress error after Xcode 7 update: error: null passed to a
callee that requires a non-null argument
---
indra/llwindow/llopenglview-objc.mm | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/indra/llwindow/llopenglview-objc.mm b/indra/llwindow/llopenglview-objc.mm
index 1c9160a42d..deb8cb90d8 100644
--- a/indra/llwindow/llopenglview-objc.mm
+++ b/indra/llwindow/llopenglview-objc.mm
@@ -239,7 +239,11 @@ attributedStringInfo getSegments(NSAttributedString *str)
{
[glContext setValues:(const GLint*)1 forParameter:NSOpenGLCPSwapInterval];
} else {
- [glContext setValues:(const GLint*)0 forParameter:NSOpenGLCPSwapInterval];
+ // supress this error after move to Xcode 7:
+ // error: null passed to a callee that requires a non-null argument [-Werror,-Wnonnull]
+ // Tried using ObjC 'nonnull' keyword as per SO article but didn't build
+ GLint swapInterval=0;
+ [glContext setValues:&swapInterval forParameter:NSOpenGLCPSwapInterval];
}
mOldResize = false;
--
GitLab