pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Fix compile warnings for platform

Browse source
This commit is contained in:
Sergey Yershov 2016-12-19 16:45:21 +03:00
parent ebc352b165
commit 6aaa267d72
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
platform/http_client_apple.mm
View file

@ -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 *>([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<char const *>(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];
}

4
platform/http_thread_apple.mm
View file

@ -46,7 +46,7 @@ static id<DownloadIndicatorProtocol> downloadIndicator = nil;
m_expectedSize = size;
NSMutableURLRequest * request = [NSMutableURLRequest requestWithURL:
[NSURL URLWithString:[NSString stringWithUTF8String:url.c_str()]]
static_cast<NSURL *>([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<DownloadIndicatorProtocol> 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