diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-10-06 11:32:00 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-10-06 11:32:00 -0400 |
| commit | 22e3e8461cf5a36754369c2648b1b4cd252a4d5c (patch) | |
| tree | d535deb3a0424366f2909f66f78ad5127844f25d /indra/llwindow | |
| parent | 617e98f1fe3d5f8965680cdd06ab72756c9c5e78 (diff) | |
| parent | 17ff449ae6b2759f212daa4fd3de0a7ea2664866 (diff) | |
merge changes for XCODE-7
Diffstat (limited to 'indra/llwindow')
| -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; |