Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArsentiy Milchakov <milcars@mapswithme.com>2017-03-21 12:35:00 +0300
committerArsentiy Milchakov <milcars@mapswithme.com>2017-03-22 15:48:06 +0300
commit431299e98329b863b2518ed863c918bc0501256d (patch)
treec36c2e412182daa911c4ed17cf81c3b8b416129d /indexer/indexer_tests
parent655b6f0a2833dc39a8c08199ecde85b5c739088b (diff)
warnings fix
Diffstat (limited to 'indexer/indexer_tests')
-rw-r--r--indexer/indexer_tests/categories_test.cpp5
-rw-r--r--indexer/indexer_tests/centers_table_test.cpp2
-rw-r--r--indexer/indexer_tests/osm_editor_test.cpp2
-rw-r--r--indexer/indexer_tests/succinct_trie_test.cpp8
4 files changed, 5 insertions, 12 deletions
diff --git a/indexer/indexer_tests/categories_test.cpp b/indexer/indexer_tests/categories_test.cpp
index 5bc2698013..aec616c418 100644
--- a/indexer/indexer_tests/categories_test.cpp
+++ b/indexer/indexer_tests/categories_test.cpp
@@ -115,8 +115,9 @@ UNIT_TEST(CategoriesHolder_Smoke)
for (size_t i = 0; i < mappings.size(); ++i)
{
auto const & mapping = mappings[i];
- TEST_EQUAL(i + 1, mapping.m_code, ());
- TEST_EQUAL(i + 1, CategoriesHolder::MapLocaleToInteger(mapping.m_name), ());
+ TEST_EQUAL(static_cast<int8_t>(i + 1), mapping.m_code, ());
+ TEST_EQUAL(static_cast<int8_t>(i + 1),
+ CategoriesHolder::MapLocaleToInteger(mapping.m_name), ());
TEST_EQUAL(CategoriesHolder::MapIntegerToLocale(i + 1), mapping.m_name, ());
}
}
diff --git a/indexer/indexer_tests/centers_table_test.cpp b/indexer/indexer_tests/centers_table_test.cpp
index 1e4fbbf16f..6874d26fa6 100644
--- a/indexer/indexer_tests/centers_table_test.cpp
+++ b/indexer/indexer_tests/centers_table_test.cpp
@@ -93,7 +93,7 @@ UNIT_CLASS_TEST(CentersTableTest, Subset)
auto table = CentersTable::Load(reader, codingParams);
TEST(table.get(), ());
- size_t i = 0;
+ uint32_t i = 0;
size_t j = 0;
while (i < 100)
diff --git a/indexer/indexer_tests/osm_editor_test.cpp b/indexer/indexer_tests/osm_editor_test.cpp
index 27534b0c51..b0df3afaa9 100644
--- a/indexer/indexer_tests/osm_editor_test.cpp
+++ b/indexer/indexer_tests/osm_editor_test.cpp
@@ -120,7 +120,7 @@ template <typename T>
uint32_t CountFeaturesInRect(MwmSet::MwmId const & mwmId, m2::RectD const & rect)
{
auto & editor = osm::Editor::Instance();
- uint32_t unused = 0;
+ int unused = 0;
uint32_t counter = 0;
editor.ForEachFeatureInMwmRectAndScale(mwmId, [&counter](T const & ft)
{
diff --git a/indexer/indexer_tests/succinct_trie_test.cpp b/indexer/indexer_tests/succinct_trie_test.cpp
index 92961d0ef7..003f06ca2d 100644
--- a/indexer/indexer_tests/succinct_trie_test.cpp
+++ b/indexer/indexer_tests/succinct_trie_test.cpp
@@ -159,8 +159,6 @@ UNIT_TEST(SuccinctTrie_Serialization_Smoke1)
MemReader memReader(buf.data(), buf.size());
- using TEmptyValue = EmptyValueReader::ValueType;
-
auto trieRoot = trie::ReadSuccinctTrie(memReader, EmptyValueReader());
TEST(trieRoot, ());
}
@@ -178,8 +176,6 @@ UNIT_TEST(SuccinctTrie_Serialization_Smoke2)
MemReader memReader(buf.data(), buf.size());
- using TEmptyValue = EmptyValueReader::ValueType;
-
auto trieRoot = trie::ReadSuccinctTrie(memReader, SimpleValueReader());
TEST(trieRoot, ());
}
@@ -200,8 +196,6 @@ UNIT_TEST(SuccinctTrie_Iterator)
MemReader memReader(buf.data(), buf.size());
- using TEmptyValue = EmptyValueReader::ValueType;
-
auto trieRoot = trie::ReadSuccinctTrie(memReader, SimpleValueReader());
TEST(trieRoot, ());
@@ -228,8 +222,6 @@ UNIT_TEST(SuccinctTrie_MoveToString)
BuildFromSimpleValueList(memWriter, data);
MemReader memReader(buf.data(), buf.size());
- using TEmptyValue = EmptyValueReader::ValueType;
-
auto trieRoot = trie::ReadSuccinctTrie(memReader, SimpleValueReader());
{