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

Merge pull request #5063 from syershov/fix-warnings

Browse source 
Fix warnings
This commit is contained in:
ygorshenin 2016-12-20 15:10:34 +03:00 • committed by GitHub
commit 3b38d0df3b
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
coding/huffman.hpp
View file

@ -21,10 +21,10 @@ public:
struct Code
{
uint32_t bits;
uint32_t len;
size_t len;
Code() : bits(0), len(0) {}
Code(uint32_t bits, uint32_t len) : bits(bits), len(len) {}
Code(uint32_t bits, size_t len) : bits(bits), len(len) {}
bool operator<(const Code & o) const
{
@ -134,7 +134,7 @@ private:
Node *l, *r;
uint32_t symbol;
uint32_t freq;
uint32_t depth;
size_t depth;
bool isLeaf;
Node(uint32_t symbol, uint32_t freq, bool isLeaf)
@ -156,7 +156,7 @@ private:
// No need to clump the interface: keep private the methods
// that encode one symbol only.
template <typename TWriter>
uint32_t EncodeAndWrite(BitWriter<TWriter> & bitWriter, uint32_t symbol) const
size_t EncodeAndWrite(BitWriter<TWriter> & bitWriter, uint32_t symbol) const
{
Code code;
CHECK(Encode(symbol, code), ());

2
coding/zlib.cpp
View file

@ -25,7 +25,7 @@ ZLib::Processor::Processor(void const * data, size_t size) noexcept : m_init(fal
// zconf.h. So, for portability, const_cast<...> is used here, but
// in any case, zlib does not modify |data|.
m_stream.next_in = static_cast<unsigned char *>(const_cast<void *>(data));
m_stream.avail_in = size;
m_stream.avail_in = static_cast<unsigned int>(size);
m_stream.next_out = m_buffer;
m_stream.avail_out = kBufferSize;

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