OSX GUI - Prevent compiler errors when -std=c++11 is switched on

diff --git a/gtk2_ardour/au_pluginui.mm b/gtk2_ardour/au_pluginui.mm
index 7bebcee84ff519559295ab9d4516025007cb5a0b..bbae2721165946416ba13b5aaf88da0c989e154d 100644 (file)
--- a/gtk2_ardour/au_pluginui.mm
+++ b/gtk2_ardour/au_pluginui.mm
@@ -658,7 +658,7 @@ AUPluginUI::parent_cocoa_window ()
 
        /* move the au_view down so that it doesn't overlap the top_box contents */
 
-       NSPoint origin = { 0, a.height };
+       NSPoint origin = { 0, static_cast<CGFloat> (a.height) };
 
        [au_view setFrameOrigin:origin];
         [view addSubview:au_view positioned:NSWindowBelow relativeTo:nil]; 

diff --git a/gtk2_ardour/cocoacarbon.mm b/gtk2_ardour/cocoacarbon.mm
index 072008e9a1545133f52d2a4d099afa80049bfe84..76b92cb91fa9b8a89366511de173e96d13fadb2c 100644 (file)
--- a/gtk2_ardour/cocoacarbon.mm
+++ b/gtk2_ardour/cocoacarbon.mm
@@ -112,7 +112,7 @@ set_language_preference ()
                                break;
                        }
                }
-               NSRange r = { 0, count };
+               NSRange r = { 0, static_cast<NSUInteger> (count) };
                setenv ("LANGUAGE", [[[languages subarrayWithRange:r] componentsJoinedByString:@":"] UTF8String], 0);
                cout << "LANGUAGE set to " << getenv ("LANGUAGE") << endl;
        }