From 6aaa267d7286eaf746a94c3ba62f9231b7ffcfeb Mon Sep 17 00:00:00 2001 From: Sergey Yershov Date: Mon, 19 Dec 2016 16:45:21 +0300 Subject: [PATCH] Fix compile warnings for platform --- platform/http_client_apple.mm | 6 +++--- platform/http_thread_apple.mm | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/platform/http_client_apple.mm b/platform/http_client_apple.mm index 2157776b3c..7c366dafa0 100644 --- a/platform/http_client_apple.mm +++ b/platform/http_client_apple.mm @@ -55,12 +55,12 @@ static const double kTimeoutInSeconds = 24.0; bool HttpClient::RunHttpRequest() { NSMutableURLRequest * request = [NSMutableURLRequest requestWithURL: - [NSURL URLWithString:[NSString stringWithUTF8String:m_urlRequested.c_str()]] + static_cast([NSURL URLWithString:@(m_urlRequested.c_str())]) cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:kTimeoutInSeconds]; // We handle cookies manually. request.HTTPShouldHandleCookies = NO; - request.HTTPMethod = [NSString stringWithUTF8String:m_httpMethod.c_str()]; + request.HTTPMethod = @(m_httpMethod.c_str()); for (auto const & header : m_headers) { [request setValue:@(header.second.c_str()) forHTTPHeaderField:@(header.first.c_str())]; @@ -125,7 +125,7 @@ bool HttpClient::RunHttpRequest() if (m_outputFile.empty()) m_serverResponse.assign(reinterpret_cast(url_data.bytes), url_data.length); else - [url_data writeToFile:[NSString stringWithUTF8String:m_outputFile.c_str()] atomically:YES]; + [url_data writeToFile:@(m_outputFile.c_str()) atomically:YES]; } diff --git a/platform/http_thread_apple.mm b/platform/http_thread_apple.mm index 423b35db91..5f617f8a8c 100644 --- a/platform/http_thread_apple.mm +++ b/platform/http_thread_apple.mm @@ -46,7 +46,7 @@ static id downloadIndicator = nil; m_expectedSize = size; NSMutableURLRequest * request = [NSMutableURLRequest requestWithURL: - [NSURL URLWithString:[NSString stringWithUTF8String:url.c_str()]] + static_cast([NSURL URLWithString:@(url.c_str())]) cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:TIMEOUT_IN_SECONDS]; // use Range header only if we don't download whole file from start @@ -77,7 +77,7 @@ static id downloadIndicator = nil; if (url.find("mapswithme.com") != string::npos) { static string const uid = GetPlatform().UniqueClientId(); - [request addValue:[NSString stringWithUTF8String: uid.c_str()] forHTTPHeaderField:@"User-Agent"]; + [request addValue:@(uid.c_str()) forHTTPHeaderField:@"User-Agent"]; } #ifdef OMIM_OS_IPHONE