kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

Warning and compilation fixes

Browse source
This commit is contained in:
Alex Zolotarev 2011-05-23 17:37:52 +02:00 • committed by Alex Zolotarev
parent d6389417b0
commit 1434e75808
5 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
generator/generator_tests/feature_merger_test.cpp
View file

@ -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;

2
generator/world_map_generator.hpp
View file

@ -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)
{
}

2
indexer/feature.cpp
View file

@ -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;

2
search/search_tests/string_match_test.cpp
View file

@ -1,6 +1,8 @@
#include "../../testing/testing.hpp"
#include "../string_match.hpp"
#include "../../std/memcpy.hpp"
namespace
{

2
yg/resource_manager.cpp
View file

@ -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));