Commit dcee4861 authored by Marvin Scholz's avatar Marvin Scholz

macosx: Some type-annotated array fixes for Xcode 7

parent aaeeb46f
...@@ -28,7 +28,11 @@ ...@@ -28,7 +28,11 @@
@interface VLCRendererDialog : NSWindowController <VLCRendererDiscoveryDelegate, NSWindowDelegate> @interface VLCRendererDialog : NSWindowController <VLCRendererDiscoveryDelegate, NSWindowDelegate>
#ifdef MAC_OS_X_VERSION_10_11
@property NSMutableArray<VLCRendererItem*> *rendererItems; @property NSMutableArray<VLCRendererItem*> *rendererItems;
#else
@property NSMutableArray *rendererItems;
#endif
- (IBAction)selectRenderer:(id)sender; - (IBAction)selectRenderer:(id)sender;
......
...@@ -34,7 +34,11 @@ ...@@ -34,7 +34,11 @@
IBOutlet NSTableView *tableView; IBOutlet NSTableView *tableView;
IBOutlet NSArrayController *arrayController; IBOutlet NSArrayController *arrayController;
#ifdef MAC_OS_X_VERSION_10_11
NSMutableArray<VLCRendererDiscovery*> *renderer_discoveries; NSMutableArray<VLCRendererDiscovery*> *renderer_discoveries;
#else
NSMutableArray *renderer_discoveries;
#endif
intf_thread_t *p_intf; intf_thread_t *p_intf;
vlc_renderer_discovery_t *p_rd; vlc_renderer_discovery_t *p_rd;
......
...@@ -52,7 +52,11 @@ ...@@ -52,7 +52,11 @@
/** /**
Array of \c VLCRendererItems that the module discovered Array of \c VLCRendererItems that the module discovered
*/ */
#ifdef MAC_OS_X_VERSION_10_11
@property (readonly) NSMutableArray<VLCRendererItem*> *rendererItems; @property (readonly) NSMutableArray<VLCRendererItem*> *rendererItems;
#else
@property (readonly) NSMutableArray *rendererItems;
#endif
/** /**
Indicates if the discovery has been started Indicates if the discovery has been started
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment