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

[win] Fixed compilation errors

Browse source
This commit is contained in:
Alex Zolotarev 2012-01-10 15:56:42 +03:00 • committed by Alex Zolotarev
parent c1dd341e20
commit 7819492f9a
4 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
indexer/indexer_tests/indexer_tests.pro
View file

@ -4,7 +4,7 @@ CONFIG -= app_bundle
TEMPLATE = app
ROOT_DIR = ../..
DEPENDENCIES = indexer platform coding base protobuf
DEPENDENCIES = indexer platform geometry coding base protobuf
include($$ROOT_DIR/common.pri)
QT *= core

2
map/benchmark_tool/benchmark_tool.pro
View file

@ -6,7 +6,7 @@ CONFIG -= app_bundle
TEMPLATE = app
ROOT_DIR = ../..
DEPENDENCIES = map indexer platform coding base gflags protobuf
DEPENDENCIES = map indexer platform geometry coding base gflags protobuf
include($$ROOT_DIR/common.pri)

4
platform/platform_tests/downloader_test.cpp
View file

@ -437,11 +437,11 @@ struct ResumeChecker
{
if (m_counter == 0)
{
TEST_EQUAL(request.Progress(), make_pair(beg2, FILESIZE), ());
TEST_EQUAL(request.Progress(), HttpRequest::ProgressT(beg2, FILESIZE), ());
}
else if (m_counter == 1)
{
TEST_EQUAL(request.Progress(), make_pair(FILESIZE, FILESIZE), ());
TEST_EQUAL(request.Progress(), HttpRequest::ProgressT(FILESIZE, FILESIZE), ());
}
else
{

3
yg/internal/opengl.cpp
View file

@ -2,6 +2,7 @@
#include "../../base/logging.hpp"
#include "../../base/string_utils.hpp"
#include "../../base/stl_add.hpp"
#include "../../std/bind.hpp"
@ -43,7 +44,7 @@ namespace yg
vector<string> names;
strings::Tokenize(string(reinterpret_cast<char const *>(glGetString(GL_EXTENSIONS))), " ", bind(&vector<string>::push_back, &names, _1));
strings::Tokenize(string(reinterpret_cast<char const *>(glGetString(GL_EXTENSIONS))), " ", MakeBackInsertFunctor(names));
for (unsigned i = 0; i < names.size(); ++i)
{