From 1434e7580848fafaec60825b4375badd5272fa96 Mon Sep 17 00:00:00 2001
From: Alex Zolotarev <deathbaba@gmail.com>
Date: Mon, 23 May 2011 17:37:52 +0200
Subject: [PATCH] Warning and compilation fixes

---
 generator/generator_tests/feature_merger_test.cpp | 13 +++++++------
 generator/world_map_generator.hpp                 |  2 +-
 indexer/feature.cpp                               |  2 +-
 search/search_tests/string_match_test.cpp         |  2 ++
 yg/resource_manager.cpp                           |  2 ++
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/generator/generator_tests/feature_merger_test.cpp b/generator/generator_tests/feature_merger_test.cpp
index e2b014d160..1364b8a241 100644
--- a/generator/generator_tests/feature_merger_test.cpp
+++ b/generator/generator_tests/feature_merger_test.cpp
@@ -75,12 +75,13 @@ UNIT_TEST(FeatureMerger_MultipleTypes)
 
 UNIT_TEST(FeatureMerger_Branches)
 {
-  // Try to unite next configuration
-  //     o
-  //     /\
-  // o--o--o--o
-  //     \/
-  //      o
+  /* Try to unite next configuration
+          o
+         /\
+     o--o--o--o
+         \/
+         o
+  */
 
   vector<FeatureBuilder1> vF;
 
diff --git a/generator/world_map_generator.hpp b/generator/world_map_generator.hpp
index ab1a38c18f..35e869a796 100644
--- a/generator/world_map_generator.hpp
+++ b/generator/world_map_generator.hpp
@@ -28,7 +28,7 @@ class WorldMapGenerator
   public:
     template <class TInit>
     WorldEmitter(int maxScale, TInit const & initData)
-      : m_maxWorldScale(maxScale), m_output(WORLD_FILE_NAME, initData)
+      : m_output(WORLD_FILE_NAME, initData), m_maxWorldScale(maxScale)
     {
     }
 
diff --git a/indexer/feature.cpp b/indexer/feature.cpp
index 2294d9ec35..df2a2a8311 100644
--- a/indexer/feature.cpp
+++ b/indexer/feature.cpp
@@ -934,7 +934,7 @@ public:
     : m_priorities(priorities), m_result(result), m_minPriority(256) {}
   bool operator() (char lang, string const & utf8s)
   {
-    int const priority = m_priorities[lang];
+    int const priority = m_priorities[static_cast<uint8_t>(lang)];
     if (priority == 0)
     {
       m_result = utf8s;
diff --git a/search/search_tests/string_match_test.cpp b/search/search_tests/string_match_test.cpp
index cdc36c55a3..0c50bfbc38 100644
--- a/search/search_tests/string_match_test.cpp
+++ b/search/search_tests/string_match_test.cpp
@@ -1,6 +1,8 @@
 #include "../../testing/testing.hpp"
 #include "../string_match.hpp"
 
+#include "../../std/memcpy.hpp"
+
 namespace
 {
 
diff --git a/yg/resource_manager.cpp b/yg/resource_manager.cpp
index a85c575d3e..3bbda54165 100644
--- a/yg/resource_manager.cpp
+++ b/yg/resource_manager.cpp
@@ -35,7 +35,9 @@ namespace yg
                                      m_fillSkinAlpha(fillSkinAlpha)
   {
     if (useVA)
+    {
       LOG(LINFO, ("buffer objects are unsupported. using client vertex array instead."));
+    }
 
     for (size_t i = 0; i < storagesCount; ++i)
       m_storages.push_back(gl::Storage(vbSize, ibSize, m_useVA));