From 7819492f9a96251d127471f4af6895e0c22356d3 Mon Sep 17 00:00:00 2001
From: Alex Zolotarev <deathbaba@gmail.com>
Date: Tue, 10 Jan 2012 15:56:42 +0300
Subject: [PATCH] [win] Fixed compilation errors

---
 indexer/indexer_tests/indexer_tests.pro     | 2 +-
 map/benchmark_tool/benchmark_tool.pro       | 2 +-
 platform/platform_tests/downloader_test.cpp | 4 ++--
 yg/internal/opengl.cpp                      | 3 ++-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/indexer/indexer_tests/indexer_tests.pro b/indexer/indexer_tests/indexer_tests.pro
index c9fd714d57..c9aff80c27 100644
--- a/indexer/indexer_tests/indexer_tests.pro
+++ b/indexer/indexer_tests/indexer_tests.pro
@@ -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
diff --git a/map/benchmark_tool/benchmark_tool.pro b/map/benchmark_tool/benchmark_tool.pro
index 4f67bf0765..8f124642ae 100644
--- a/map/benchmark_tool/benchmark_tool.pro
+++ b/map/benchmark_tool/benchmark_tool.pro
@@ -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)
 
diff --git a/platform/platform_tests/downloader_test.cpp b/platform/platform_tests/downloader_test.cpp
index cccc01ba92..e422bfe56d 100644
--- a/platform/platform_tests/downloader_test.cpp
+++ b/platform/platform_tests/downloader_test.cpp
@@ -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
     {
diff --git a/yg/internal/opengl.cpp b/yg/internal/opengl.cpp
index 084f168404..f3400188cb 100644
--- a/yg/internal/opengl.cpp
+++ b/yg/internal/opengl.cpp
@@ -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)
       {