Commit: 8f688a3403f4af74827635d543b677ebc0fedcc6 - HotshotOgreIOS (hg)

Commit MetaInfo

• Revision: 8f688a3403f4af74827635d543b677ebc0fedcc6 (tree)
• Time: 2014-01-10 10:08:11
• Author: Steve Peters <scpeters@osrf...>
• Commiter: Steve Peters

Log Message

Change syntax in OgreOSXCocoaWindow.mm to fix compilation for both OSX 10.8 and 10.9

Change Summary

• modified: RenderSystems/GL/src/OSX/OgreOSXCocoaWindow.mm

Incremental Difference

diff -r 843ccc99d680 -r 8f688a3403f4 RenderSystems/GL/src/OSX/OgreOSXCocoaWindow.mm
--- a/RenderSystems/GL/src/OSX/OgreOSXCocoaWindow.mm	Wed Jan 08 20:00:52 2014 -0800
+++ b/RenderSystems/GL/src/OSX/OgreOSXCocoaWindow.mm	Thu Jan 09 17:08:11 2014 -0800
@@ -126,7 +126,7 @@
         NSString *windowTitle = [NSString stringWithCString:name.c_str() encoding:NSUTF8StringEncoding];
 		int winx = 0, winy = 0;
 		int depth = 32;
-        NameValuePairList::const_iterator opt{};
+        NameValuePairList::const_iterator opt;
         mIsFullScreen = fullScreen;
 		
 		if(miscParams)
@@ -257,7 +257,7 @@
         }
         else
         {
-            NameValuePairList::const_iterator param_useNSView_pair{};
+            NameValuePairList::const_iterator param_useNSView_pair;
             param_useNSView_pair = miscParams->find("macAPICocoaUseNSView");
 
             if(param_useNSView_pair != miscParams->end())