diff options
| author | callum_linden <none@none> | 2015-09-29 13:35:41 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2015-09-29 13:35:41 -0700 |
| commit | 6765d666374a293762fd9b2be09465649982b3cb (patch) | |
| tree | 8ffa9d2b78ca4abf9c0dda539d648b243322d004 /indra/llwindow | |
| parent | 11c188dc734fd1dc921a2fa4c14e89a0e190c26b (diff) | |
| parent | 17ff449ae6b2759f212daa4fd3de0a7ea2664866 (diff) | |
Merge with viewer-xcode-7 for Xcode 7 patches
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; |