diff options
| author | Michael R. Fisher <mfisher@bketech.com> | 2013-07-15 16:35:20 -0500 |
|---|---|---|
| committer | Michael Fisher <mfisher31@gmail.com> | 2013-07-15 22:57:34 -0500 |
| commit | 7f6765ece4391cfed18577a92dd15c16da9fefe1 (patch) | |
| tree | a04c9c186742aeb331a3967b882f1d79ae36e0ba | |
| parent | 9cb678ebcc2ca0c7993bdd182c9e6ad1f8adf09a (diff) | |
OSX GUI - Prevent compiler errors when -std=c++11 is switched on
| -rw-r--r-- | gtk2_ardour/au_pluginui.mm | 2 | ||||
| -rw-r--r-- | gtk2_ardour/cocoacarbon.mm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gtk2_ardour/au_pluginui.mm b/gtk2_ardour/au_pluginui.mm index 7bebcee84f..bbae272116 100644 --- 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 072008e9a1..76b92cb91f 100644 --- 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; } |