Skip to content

Instantly share code, notes, and snippets.

@hgaiser
Created November 6, 2013 23:33
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save hgaiser/7346167 to your computer and use it in GitHub Desktop.
Save hgaiser/7346167 to your computer and use it in GitHub Desktop.
Patch to fix Ogre 1.7.4 on OSX 10.9
diff --git a/RenderSystems/GL/src/OSX/OgreOSXCocoaWindow.mm b/RenderSystems/GL/src/OSX/OgreOSXCocoaWindow.mm
index 00803e7..f55a213 100644
--- a/RenderSystems/GL/src/OSX/OgreOSXCocoaWindow.mm
+++ b/RenderSystems/GL/src/OSX/OgreOSXCocoaWindow.mm
@@ -100,7 +100,7 @@ namespace Ogre {
NSString *windowTitle = [NSString stringWithCString:name.c_str() encoding:NSUTF8StringEncoding];
int winx = 0, winy = 0;
int depth = 32;
- NameValuePairList::const_iterator opt(NULL);
+ NameValuePairList::const_iterator opt;
if(miscParams)
{
@@ -220,7 +220,7 @@ namespace Ogre {
}
else
{
- NameValuePairList::const_iterator param_useNSView_pair(NULL);
+ NameValuePairList::const_iterator param_useNSView_pair;
param_useNSView_pair = miscParams->find("macAPICocoaUseNSView");
if(param_useNSView_pair != miscParams->end())
diff --git a/RenderSystems/GL/src/OSX/OgreOSXGLSupport.mm b/RenderSystems/GL/src/OSX/OgreOSXGLSupport.mm
index 864d236..1693af1 100644
--- a/RenderSystems/GL/src/OSX/OgreOSXGLSupport.mm
+++ b/RenderSystems/GL/src/OSX/OgreOSXGLSupport.mm
@@ -311,7 +311,7 @@ RenderWindow* OSXGLSupport::newWindow( const String &name, unsigned int width, u
if(miscParams)
{
- NameValuePairList::const_iterator opt(NULL);
+ NameValuePairList::const_iterator opt;
// First we must determine if this is a Carbon or a Cocoa window
// that we wish to create
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment