diff options
| author | Aura Linden <aura@lindenlab.com> | 2015-10-01 09:35:58 -0700 |
|---|---|---|
| committer | Aura Linden <aura@lindenlab.com> | 2015-10-01 09:35:58 -0700 |
| commit | 40316f8431279d925bc677a7e2ef7b4d79bc843a (patch) | |
| tree | 218b97ae3d0173a9b8c106c09306aef03f42c7f6 /indra/llwindow | |
| parent | a4fef135b110045500d9afc1b558127bc2f5cd89 (diff) | |
| parent | 6c422a881499c0d7649a59db47905a584bbd2bc1 (diff) | |
Pulled merge to use 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; |