map-per/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[indexer] Fixed compile warnings on Index::Register() calls.

Browse source
This commit is contained in:
Yuri Gorshenin 2015-04-08 13:25:57 +03:00 • committed by Alex Zolotarev
parent b6922be526
commit f9d0921c64
6 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
indexer/indexer_tests/index_builder_test.cpp
View file

@ -12,6 +12,7 @@
#include "../../coding/file_container.hpp"
#include "../../base/macros.hpp"
#include "../../base/stl_add.hpp"
@ -58,7 +59,7 @@ UNIT_TEST(BuildIndexTest)
{
// Check that index actually works.
Index index;
index.Register(fileName);
UNUSED_VALUE(index.Register(fileName));
// Make sure that index is actually parsed.
NoopFunctor fn;

2
indexer/indexer_tests/index_test.cpp
View file

@ -75,7 +75,7 @@ private:
UNIT_TEST(Index_Parse)
{
Index index;
index.RegisterMap("minsk-pass" DATA_FILE_EXTENSION);
UNUSED_VALUE(index.RegisterMap("minsk-pass" DATA_FILE_EXTENSION));
// Make sure that index is actually parsed.
NoopFunctor fn;

14
indexer/indexer_tests/mwm_set_test.cpp
View file

@ -1,6 +1,8 @@
#include "../../testing/testing.hpp"
#include "../mwm_set.hpp"
#include "../../base/macros.hpp"
namespace
{
@ -36,9 +38,9 @@ UNIT_TEST(MwmSetSmokeTest)
TestMwmSet mwmSet;
vector<MwmInfo> info;
mwmSet.Register("0");
mwmSet.Register("1");
mwmSet.Register("2");
UNUSED_VALUE(mwmSet.Register("0"));
UNUSED_VALUE(mwmSet.Register("1"));
UNUSED_VALUE(mwmSet.Register("2"));
mwmSet.Deregister("1");
mwmSet.GetMwmInfo(info);
TEST_EQUAL(info.size(), 3, ());
@ -54,7 +56,7 @@ UNIT_TEST(MwmSetSmokeTest)
TEST(!lock1.IsLocked(), ());
}
mwmSet.Register("3");
UNUSED_VALUE(mwmSet.Register("3"));
mwmSet.GetMwmInfo(info);
TEST_EQUAL(info.size(), 3, ());
TEST(info[0].IsUpToDate(), ());
@ -68,7 +70,7 @@ UNIT_TEST(MwmSetSmokeTest)
MwmSet::MwmLock lock(mwmSet, 1);
TEST(lock.IsLocked(), ());
mwmSet.Deregister("3");
mwmSet.Register("4");
UNUSED_VALUE(mwmSet.Register("4"));
}
mwmSet.GetMwmInfo(info);
TEST_EQUAL(info.size(), 4, ());
@ -80,7 +82,7 @@ UNIT_TEST(MwmSetSmokeTest)
TEST(info[3].IsUpToDate(), ());
TEST_EQUAL(info[3].m_maxScale, 4, ());
mwmSet.Register("5");
UNUSED_VALUE(mwmSet.Register("5"));
mwmSet.GetMwmInfo(info);
TEST_EQUAL(info.size(), 4, ());
TEST(info[0].IsUpToDate(), ());

4
map/benchmark_tool/features_loading.cpp
View file

@ -9,9 +9,9 @@
#include "../../platform/platform.hpp"
#include "../../base/macros.hpp"
#include "../../base/timer.hpp"
namespace bench
{
@ -110,7 +110,7 @@ void RunFeaturesLoadingBenchmark(string const & file, pair<int, int> scaleR, All
return;
model::FeaturesFetcher src;
src.RegisterMap(file);
UNUSED_VALUE(src.RegisterMap(file));
RunBenchmark(src, header.GetBounds(), scaleR, res);
}

4
map/mwm_tests/multithread_mwm_test.cpp
View file

@ -4,9 +4,9 @@
#include "../../indexer/scales.hpp"
#include "../../base/macros.hpp"
#include "../../base/thread.hpp"
namespace
{
typedef model::FeaturesFetcher SourceT;
@ -63,7 +63,7 @@ namespace
SourceT src;
src.InitClassificator();
src.RegisterMap(file + DATA_FILE_EXTENSION);
UNUSED_VALUE(src.RegisterMap(file + DATA_FILE_EXTENSION));
// Check that country rect is valid and not infinity.
m2::RectD const r = src.GetWorldRect();

3
map/mwm_tests/mwm_foreach_test.cpp
View file

@ -14,6 +14,7 @@
#include "../../geometry/robust_orientation.hpp"
#include "../../base/logging.hpp"
#include "../../base/macros.hpp"
#include "../../std/string.hpp"
#include "../../std/algorithm.hpp"
@ -251,7 +252,7 @@ void RunTest(string const & file)
model::FeaturesFetcher src1;
src1.InitClassificator();
src1.RegisterMap(file);
UNUSED_VALUE(src1.RegisterMap(file));
vector<m2::RectD> rects;
rects.push_back(src1.GetWorldRect());