From e48e22ea8cf7dbbebb342870e1a9ddbec8166032 Mon Sep 17 00:00:00 2001 From: Holger Date: Wed, 4 Dec 2013 00:14:22 +0100 Subject: [PATCH] incompatibilities with objc++ compiler (i.e. due to type mismatch) corrected --- AAMFeedback/AAMFeedback/AAMFeedbackTopicsViewController.m | 2 +- AAMFeedback/AAMFeedback/AAMFeedbackViewController.m | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/AAMFeedback/AAMFeedback/AAMFeedbackTopicsViewController.m b/AAMFeedback/AAMFeedback/AAMFeedbackTopicsViewController.m index d0ffb47..9b2f94a 100644 --- a/AAMFeedback/AAMFeedback/AAMFeedbackTopicsViewController.m +++ b/AAMFeedback/AAMFeedback/AAMFeedbackTopicsViewController.m @@ -9,7 +9,7 @@ #import "AAMFeedbackTopicsViewController.h" -@interface AAMFeedbackTopicsViewController(private) +@interface AAMFeedbackTopicsViewController() - (void)_setSelectedIndex:(int)theIndex; - (NSInteger)_selectedIndex; - (void)_updateCellselection; diff --git a/AAMFeedback/AAMFeedback/AAMFeedbackViewController.m b/AAMFeedback/AAMFeedback/AAMFeedbackViewController.m index 7a7b3fe..a6d6016 100644 --- a/AAMFeedback/AAMFeedback/AAMFeedbackViewController.m +++ b/AAMFeedback/AAMFeedback/AAMFeedbackViewController.m @@ -11,7 +11,7 @@ #include #include -@interface AAMFeedbackViewController(private) +@interface AAMFeedbackViewController() - (NSString *) _platform; - (NSString *) _platformString; - (NSString*)_feedbackSubject; @@ -400,7 +400,7 @@ - (NSString *) _platform mib[0] = CTL_HW; mib[1] = HW_MACHINE; sysctl(mib, 2, NULL, &len, NULL, 0); - machine = malloc(len); + machine = (char*)malloc(len); sysctl(mib, 2, machine, &len, NULL, 0); NSString *platform = [NSString stringWithCString:machine encoding:NSASCIIStringEncoding];