diff options
author | callum_linden <none@none> | 2015-09-18 15:07:27 -0700 |
---|---|---|
committer | callum_linden <none@none> | 2015-09-18 15:07:27 -0700 |
commit | 17ff449ae6b2759f212daa4fd3de0a7ea2664866 (patch) | |
tree | a0995010a6d33d627765d60a6bc63efe7c32daf2 /indra | |
parent | 1c94732ba1d29babd32372e024c8968d75c39ba3 (diff) |
Supress error after Xcode 7 update: error: null passed to a callee that requires a non-null argument
Diffstat (limited to 'indra')
-rw-r--r-- | indra/llwindow/llopenglview-objc.mm | 6 |
1 files changed, 5 insertions, 1 deletions
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; |