pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Warning fixes

Browse source
This commit is contained in:
Alex Zolotarev 2014-03-18 16:11:55 +03:00 • committed by Alex Zolotarev
parent 2f98749ea8
commit 86ffb62add
8 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
base/base_tests/assert_test.cpp
View file

@ -9,6 +9,10 @@
UNIT_TEST(Assert_Smoke)
{
int x = 5;
// to avoid warning in release
#ifdef RELEASE
UNUSED_VALUE(x);
#endif
ASSERT_EQUAL ( x, 5, () );
ASSERT_NOT_EQUAL ( x, 6, () );
//ASSERT_EQUAL ( x, 666, ("Skip this to continue test") );

3
coding/hex.hpp
View file

@ -44,7 +44,10 @@ inline string NumToHex(IntT n)
for (size_t i = 0; i < sizeof(n); ++i)
{
buf[i] = (n >> ((sizeof(n) - 1) * 8));
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wshift-count-overflow"
n <<= 8;
#pragma GCC diagnostic pop
}
return ToHex(buf, sizeof(buf));

10
drape_frontend/drape_frontend_tests/memory_feature_index_tests.cpp
View file

@ -21,11 +21,11 @@ namespace
features[indexes[i]].m_isOwner = true;
}
void ResetReadedMark(vector<df::FeatureInfo> & features)
{
for (size_t i = 0; i < features.size(); ++i)
features[i].m_isOwner = false;
}
// void ResetReadedMark(vector<df::FeatureInfo> & features)
// {
// for (size_t i = 0; i < features.size(); ++i)
// features[i].m_isOwner = false;
// }
}
UNIT_TEST(MemoryFeatureIndex_SimpleTest)

2
drape_head/drape_surface.cpp
View file

@ -114,6 +114,6 @@ void DrapeSurface::sizeChanged(int)
m2::PointF DrapeSurface::GetDevicePosition(const QPoint & p)
{
qreal ratio = devicePixelRatio();
// qreal ratio = devicePixelRatio();
return m2::PointF(p.x() /* ratio*/, p.y() /* ratio*/);
}

4
indexer/classificator.cpp
View file

@ -172,6 +172,10 @@ namespace ftype
ASSERT ( value <= max_value, ("invalid input value", value) );
uint8_t const cl = get_control_level(type);
// to avoid warning in release
#ifdef RELEASE
UNUSED_VALUE(levels_count);
#endif
ASSERT ( cl < levels_count, (cl) );
set_value(type, cl, value);

1
indexer/feature_data.cpp
View file

@ -132,6 +132,7 @@ void FeatureParams::SetGeomType(feature::EGeomType t)
case GEOM_POINT: m_geomType = HEADER_GEOM_POINT; break;
case GEOM_LINE: m_geomType = HEADER_GEOM_LINE; break;
case GEOM_AREA: m_geomType = HEADER_GEOM_AREA; break;
default: ASSERT(false, ());
}
}

2
stats/client/event_writer.cpp
View file

@ -8,7 +8,7 @@ namespace stats
{
EventWriter::EventWriter(string const & uniqueClientId, string const & dbPath)
: m_cnt(0), m_db(0), m_path(dbPath), m_uid(0)
: /*m_cnt(0), m_db(0), */m_path(dbPath)/*, m_uid(0)*/
{
}

6
stats/client/event_writer.hpp
View file

@ -27,10 +27,10 @@ private:
bool OpenDb(string const & path);
private:
unsigned int m_cnt;
void * m_db; // @todo Replace with ours impl
// unsigned int m_cnt;
// void * m_db; // @todo Replace with ours impl
string m_path;
unsigned long long m_uid;
// unsigned long long m_uid;
};
} // namespace stats