Last active
December 17, 2015 15:29
-
-
Save d235j/5632224 to your computer and use it in GitHub Desktop.
Patch for Ogre 1.7.4 with C++11
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff -Nru ogre_src_v1-7-4-orig/RenderSystems/GL/src/OSX/OgreOSXCarbonWindow.cpp ogre_src_v1-7-4/RenderSystems/GL/src/OSX/OgreOSXCarbonWindow.cpp | |
| --- ogre_src_v1-7-4-orig/RenderSystems/GL/src/OSX/OgreOSXCarbonWindow.cpp 2012-01-14 12:40:39.000000000 -0500 | |
| +++ ogre_src_v1-7-4/RenderSystems/GL/src/OSX/OgreOSXCarbonWindow.cpp 2013-05-22 21:36:09.000000000 -0400 | |
| @@ -66,7 +66,7 @@ | |
| if( miscParams ) | |
| { | |
| - NameValuePairList::const_iterator opt(NULL); | |
| + NameValuePairList::const_iterator opt; | |
| // Full screen anti aliasing | |
| opt = miscParams->find( "FSAA" ); | |
| @@ -113,7 +113,7 @@ | |
| { | |
| createAGLContext(fsaa_samples, depth); | |
| - NameValuePairList::const_iterator opt(NULL); | |
| + NameValuePairList::const_iterator opt; | |
| if(miscParams) | |
| opt = miscParams->find("externalWindowHandle"); | |
| diff -Nru ogre_src_v1-7-4-orig/RenderSystems/GL/src/OSX/OgreOSXCocoaWindow.mm ogre_src_v1-7-4/RenderSystems/GL/src/OSX/OgreOSXCocoaWindow.mm | |
| --- ogre_src_v1-7-4-orig/RenderSystems/GL/src/OSX/OgreOSXCocoaWindow.mm 2012-01-14 12:40:39.000000000 -0500 | |
| +++ ogre_src_v1-7-4/RenderSystems/GL/src/OSX/OgreOSXCocoaWindow.mm 2013-05-22 21:37:28.000000000 -0400 | |
| @@ -100,7 +100,7 @@ | |
| 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 @@ | |
| } | |
| 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 -Nru ogre_src_v1-7-4-orig/RenderSystems/GL/src/OSX/OgreOSXGLSupport.mm ogre_src_v1-7-4/RenderSystems/GL/src/OSX/OgreOSXGLSupport.mm | |
| --- ogre_src_v1-7-4-orig/RenderSystems/GL/src/OSX/OgreOSXGLSupport.mm 2012-01-14 12:40:39.000000000 -0500 | |
| +++ ogre_src_v1-7-4/RenderSystems/GL/src/OSX/OgreOSXGLSupport.mm 2013-05-22 21:37:45.000000000 -0400 | |
| @@ -311,7 +311,7 @@ | |
| 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