Enable ARC on Apple (#4)

Signed-off-by: Darshan Sen <raisinten@gmail.com>
RaisinTen · Apr 2, 2024 · 68d79ab · 68d79ab
1 parent 861006a
commit 68d79ab
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/apple/CMakeLists.txt b/src/apple/CMakeLists.txt
@@ -1,5 +1,7 @@
 add_library(benoni STATIC http.mm)
 
+target_compile_options(benoni PUBLIC "-fobjc-arc")
+
 target_include_directories(benoni PUBLIC "${PROJECT_SOURCE_DIR}/include")
 
 target_link_libraries(benoni PUBLIC "-framework Foundation")
diff --git a/src/apple/http.mm b/src/apple/http.mm
@@ -39,7 +39,6 @@ - (BenoniHTTPTaskContextWrap *)initWithContext:
 
 - (void)dealloc {
   delete context;
-  [super dealloc];
 }
 @end
 
@@ -123,7 +122,7 @@ - (void)URLSession:(NSURLSession *)session
   HTTPTaskContext *context = [contextWrap context];
 
   if (context->data == nil) {
-    context->data = [[NSMutableData data] retain];
+    context->data = [NSMutableData data];
   }
 
   [context->data appendData:data];
@@ -140,7 +139,7 @@ - (void)URLSession:(NSURLSession *)session
 
   if (error) {
     std::string error_string([[error localizedDescription] UTF8String]);
-    [contextWrap dealloc];
+    contextMap_[key] = nil;
     callback(std::move(error_string));
     return;
   }
@@ -159,11 +158,11 @@ - (void)URLSession:(NSURLSession *)session
     }
     [responseString appendString:chunk];
   }];
-  [context->data release];
+  context->data = nil;
 
   if (success == NO) {
     std::string error_string("response body has invalid encoding");
-    [contextWrap dealloc];
+    contextMap_[key] = nil;
     callback(std::move(error_string));
     return;
   }
@@ -175,7 +174,7 @@ - (void)URLSession:(NSURLSession *)session
       .status = context->status,
       .headers = std::move(context->headers),
   };
-  [contextWrap dealloc];
+  contextMap_[key] = nil;
   callback(response);
 }
 @end