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

Merge pull request #8930 from maksimandrianov/mrpropper

Browse source 
[generator] Fixed all warnings (GCC 7.3.0)
This commit is contained in:
Maksim Andrianov 2018-06-25 19:22:58 +03:00 • committed by GitHub
commit b086fe5fb1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
102 changed files with 277 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
3party/agg/CMakeLists.txt
View file

@ -1,6 +1,7 @@
project(agg)
add_clang_compile_options("-Wno-deprecated-declarations")
add_gcc_compile_options("-Wno-deprecated-declarations")
set(CMAKE_PREFIX_PATH ./)

4
3party/freetype/CMakeLists.txt
View file

@ -9,6 +9,10 @@ endif ()
add_compile_options("-Wall")
add_clang_compile_options("-Wno-unused-function")
add_gcc_compile_options(
"-Wno-pointer-to-int-cast"
"-Wno-unused-function"
)
include_directories(include)

1
3party/icu/CMakeLists.txt
View file

@ -11,6 +11,7 @@ add_definitions(
)
add_clang_compile_options("-Wno-deprecated-declarations")
add_gcc_compile_options("-Wno-deprecated-declarations")
set(CMAKE_PREFIX_PATH ./)

1
3party/minizip/CMakeLists.txt
View file

@ -3,6 +3,7 @@ project(minizip)
add_definitions(-DUSE_FILE32API -DNOCRYPT)
add_clang_compile_options("-Wno-unused-value")
add_gcc_compile_options("-Wno-unused-value")
set(
SRC

4
3party/opening_hours/CMakeLists.txt
View file

@ -12,6 +12,10 @@ add_compile_options(
)
add_clang_compile_options("-Wno-unused-local-typedef")
add_gcc_compile_options(
"-Wno-unused-local-typedef"
"-Wno-return-type"
)
set(
SRC

1
3party/succinct/CMakeLists.txt
View file

@ -5,6 +5,7 @@ add_definitions(-DLTC_NO_ROLC)
include_directories(src/headers)
add_clang_compile_options("-Wno-unused-local-typedef")
add_gcc_compile_options("-Wno-unused-local-typedef")
set(
SRC

5
CMakeLists.txt
View file

@ -203,9 +203,10 @@ include_directories(
${CMAKE_HOME_DIRECTORY}
${Qt5Core_INCLUDE_DIRS}
${Qt5Network_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
)
include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
if (USE_ASAN)
@ -260,6 +261,8 @@ add_compile_options(
)
add_clang_compile_options("-Wshorten-64-to-32")
add_clang_cpp_compile_options("-Wno-noexcept-type")
add_gcc_cpp_compile_options("-Wno-noexcept-type")
add_subdirectory(base)
add_subdirectory(coding)

7
base/assert.hpp
View file

@ -91,3 +91,10 @@ namespace my
#define ASSERT_GREATER(X, Y, msg)
#define ASSERT_GREATER_OR_EQUAL(X, Y, msg)
#endif
// The macro that causes the warning to be ignored: control reaches end of
// non-void function.
#define CHECK_SWITCH() do { \
CHECK(false, ("Incorrect value in the switch statment")); \
std::abort(); \
} while(false)

1
base/base_tests/levenshtein_dfa_test.cpp
View file

@ -42,6 +42,7 @@ string DebugPrint(Status status)
case Status::Rejects: return "Rejects";
case Status::Intermediate: return "Intermediate";
}
CHECK_SWITCH();
}
string DebugPrint(Result const & result)

4
base/base_tests/stl_helpers_test.cpp
View file

@ -92,7 +92,7 @@ UNIT_TEST(LessBy)
std::vector<Value> v = {{2, 2}, {0, 4}, {3, 1}, {4, 0}, {1, 3}};
std::sort(v.begin(), v.end(), my::LessBy(&Value::first));
for (size_t i = 0; i < v.size(); ++i)
TEST_EQUAL(i, v[i].first, ());
TEST_EQUAL(i, static_cast<size_t>(v[i].first), ());
std::vector<Value const *> pv;
for (auto const & p : v)
@ -100,7 +100,7 @@ UNIT_TEST(LessBy)
std::sort(pv.begin(), pv.end(), my::LessBy(&Value::second));
for (size_t i = 0; i < pv.size(); ++i)
TEST_EQUAL(i, pv[i]->second, ());
TEST_EQUAL(i, static_cast<size_t>(pv[i]->second), ());
}
{

5
base/levenshtein_dfa.cpp
View file

@ -4,6 +4,7 @@
#include "base/stl_helpers.hpp"
#include <algorithm>
#include <iterator>
#include <queue>
#include <set>
#include <sstream>
@ -200,7 +201,9 @@ LevenshteinDFA::LevenshteinDFA(UniString const & s, size_t prefixSize,
m_alphabet.assign(s.begin(), s.end());
CHECK_LESS_OR_EQUAL(prefixSize, s.size(), ());
for (auto it = s.begin(); std::distance(it, s.begin()) < prefixSize; ++it)
auto const pSize = static_cast<typename std::iterator_traits<
UniString::iterator>::difference_type>(prefixSize);
for (auto it = s.begin(); std::distance(it, s.begin()) < pSize; ++it)
{
for (auto const & misprints : prefixMisprints)
{

18
cmake/OmimHelpers.cmake
View file

@ -162,6 +162,24 @@ function(add_clang_compile_options)
endif()
endfunction()
function(add_gcc_compile_options)
if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
add_compile_options(${ARGV})
endif()
endfunction()
function(add_clang_cpp_compile_options)
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
add_compile_options("$<$<COMPILE_LANGUAGE:CXX>:${ARGV}>")
endif()
endfunction()
function(add_gcc_cpp_compile_options)
if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
add_compile_options("$<$<COMPILE_LANGUAGE:CXX>:${ARGV}>")
endif()
endfunction()
function(export_directory_flags filename)
get_directory_property(include_directories INCLUDE_DIRECTORIES)
get_directory_property(definitions COMPILE_DEFINITIONS)

1
coding/compressed_bit_vector.cpp
View file

@ -461,6 +461,7 @@ string DebugPrint(CompressedBitVector::StorageStrategy strat)
case CompressedBitVector::StorageStrategy::Dense: return "Dense";
case CompressedBitVector::StorageStrategy::Sparse: return "Sparse";
}
CHECK_SWITCH();
}
// static

8
coding/diff.hpp
View file

@ -155,14 +155,16 @@ public:
DstIterT const dstBeg, DstIterT const dstEnd,
PatchCoderT & patchCoder)
{
if (srcEnd - srcBeg < m_BlockSize || dstEnd - dstBeg < m_BlockSize)
if (srcEnd - srcBeg < static_cast<decltype(srcEnd - srcBeg)>(m_BlockSize) ||
dstEnd - dstBeg < static_cast<decltype(dstEnd - dstBeg)>(m_BlockSize))
{
m_FineGrainedDiff.Diff(srcBeg, srcEnd, dstBeg, dstEnd, patchCoder);
return;
}
HasherT hasher;
HashPosMultiMapT srcHashes;
for (SrcIterT src = srcBeg; srcEnd - src >= m_BlockSize; src += m_BlockSize)
for (SrcIterT src = srcBeg; srcEnd - src >= static_cast<decltype(srcEnd - src)>(m_BlockSize);
src += m_BlockSize)
srcHashes.insert(HashPosMultiMapValue(hasher.Init(src, m_BlockSize), src - srcBeg));
SrcIterT srcLastDiff = srcBeg;
DstIterT dst = dstBeg, dstNext = dstBeg + m_BlockSize, dstLastDiff = dstBeg;
@ -187,7 +189,7 @@ public:
patchCoder.Copy(m_BlockSize);
srcLastDiff = srcBeg + srcBlockEqualPos + m_BlockSize;
dst = dstLastDiff = dstNext;
if (dstEnd - dstNext < m_BlockSize)
if (dstEnd - dstNext < static_cast<decltype(dstEnd - dstNext)>(m_BlockSize))
break;
dstNext = dst + m_BlockSize;
h = hasher.Init(dst, m_BlockSize);

5
coding/point_to_integer.cpp
View file

@ -7,8 +7,8 @@ int64_t PointToInt64Obsolete(double x, double y, uint32_t coordBits)
{
int64_t const res = static_cast<int64_t>(PointUToUint64Obsolete(PointDToPointU(x, y, coordBits)));
ASSERT_LESS_OR_EQUAL(res, 3ULL << 2 * POINT_COORD_BITS, ());
ASSERT_GREATER_OR_EQUAL(res, 0, ("Highest bits of (ix, iy) are not used, so res should be > 0."));
ASSERT_LESS_OR_EQUAL(static_cast<uint64_t>(res), uint64_t{3} << 2 * POINT_COORD_BITS, ());
return res;
}
@ -19,7 +19,8 @@ int64_t PointToInt64Obsolete(m2::PointD const & pt, uint32_t coordBits)
m2::PointD Int64ToPointObsolete(int64_t v, uint32_t coordBits)
{
ASSERT_LESS_OR_EQUAL(v, 3ULL << 2 * POINT_COORD_BITS, ());
ASSERT_GREATER_OR_EQUAL(v, 0, ("Highest bits of (ix, iy) are not used, so res should be > 0."));
ASSERT_LESS_OR_EQUAL(static_cast<uint64_t>(v), uint64_t{3} << 2 * POINT_COORD_BITS, ());
return PointUToPointD(Uint64ToPointUObsolete(static_cast<uint64_t>(v)), coordBits);
}

1
coding/zlib.cpp
View file

@ -19,6 +19,7 @@ int ToInt(ZLib::Deflate::Level level)
case Level::BestCompression: return Z_BEST_COMPRESSION;
case Level::DefaultCompression: return Z_DEFAULT_COMPRESSION;
}
CHECK_SWITCH();
}
} // namespace

4
drape/drape_tests/buffer_tests.cpp
View file

@ -68,12 +68,12 @@ UNIT_TEST(ParticalUploadDataTest)
{
size_t const kPart1Size = 3 * 30;
float part1Data[kPart1Size];
for (int i = 0; i < kPart1Size; ++i)
for (size_t i = 0; i < kPart1Size; ++i)
part1Data[i] = (float)i;
size_t const kPart2Size = 3 * 100;
float part2Data[kPart2Size];
for (int i = 0; i < kPart2Size; ++i)
for (size_t i = 0; i < kPart2Size; ++i)
part2Data[i] = (float)i;
unique_ptr<DataBuffer> buffer(new DataBuffer(3 * sizeof(float), 100));

2
drape/overlay_tree.cpp
View file

@ -104,7 +104,7 @@ bool OverlayTree::Frame()
}
m_frameCounter++;
if (m_frameCounter >= m_frameUpdatePeriod)
if (m_frameCounter >= static_cast<int>(m_frameUpdatePeriod))
m_frameCounter = kInvalidFrame;
return IsNeedUpdate();

2
drape_frontend/gui/ruler_helper.cpp
View file

@ -225,7 +225,7 @@ double RulerHelper::CalcMetresDiff(double value)
auto conversionFn = &Identity;
auto units = measurement_utils::Units::Metric;
UNUSED_VALUE(settings::Get(settings::kMeasurementUnits, units));
settings::TryGet(settings::kMeasurementUnits, units);
if (units == measurement_utils::Units::Imperial)
{

15
drape_frontend/user_event_stream.cpp
View file

@ -20,6 +20,7 @@
#include <chrono>
#include <cmath>
#include <cstdint>
#ifdef DEBUG
#define TEST_CALL(action) if (m_testFn) m_testFn(action)
@ -1018,8 +1019,9 @@ bool UserEventStream::EndDrag(Touch const & t, bool cancelled)
CheckAutoRotate();
if (!cancelled && m_kineticScrollEnabled && m_scroller.IsActive() &&
m_kineticTimer.TimeElapsedAs<std::chrono::milliseconds>().count() >= kKineticDelayMs)
auto const ms = static_cast<uint64_t>(
m_kineticTimer.TimeElapsedAs<std::chrono::milliseconds>().count());
if (!cancelled && m_kineticScrollEnabled && m_scroller.IsActive() && ms >= kKineticDelayMs)
{
drape_ptr<Animation> anim = m_scroller.CreateKineticAnimation(m_navigator.Screen());
if (anim != nullptr)
@ -1108,7 +1110,8 @@ void UserEventStream::DetectShortTap(Touch const & touch)
if (DetectForceTap(touch))
return;
auto const ms = m_touchTimer.TimeElapsedAs<std::chrono::milliseconds>().count();
auto const ms = static_cast<uint64_t>(
m_touchTimer.TimeElapsedAs<std::chrono::milliseconds>().count());
if (ms > kDoubleTapPauseMs)
{
m_state = STATE_EMPTY;
@ -1124,7 +1127,8 @@ void UserEventStream::DetectLongTap(Touch const & touch)
if (DetectForceTap(touch))
return;
auto const ms = m_touchTimer.TimeElapsedAs<std::chrono::milliseconds>().count();
auto const ms = static_cast<uint64_t>(
m_touchTimer.TimeElapsedAs<std::chrono::milliseconds>().count());
if (ms > kLongTouchMs)
{
TEST_CALL(LONG_TAP_DETECTED);
@ -1136,7 +1140,8 @@ void UserEventStream::DetectLongTap(Touch const & touch)
bool UserEventStream::DetectDoubleTap(Touch const & touch)
{
auto const ms = m_touchTimer.TimeElapsedAs<std::chrono::milliseconds>().count();
auto const ms = static_cast<uint64_t>(
m_touchTimer.TimeElapsedAs<std::chrono::milliseconds>().count());
if (m_state != STATE_WAIT_DOUBLE_TAP || ms > kDoubleTapPauseMs)
return false;

1
editor/edits_migration.cpp
View file

@ -118,5 +118,6 @@ FeatureID MigrateFeatureIndex(osm::Editor::ForEachFeaturesNearByFn & forEach,
case XMLFeature::Type::Relation:
return MigrateWayOrRelatonFeatureIndex(forEach, xml, featureStatus, generateID);
}
CHECK_SWITCH();
}
} // namespace editor

1
editor/osm_editor.cpp
View file

@ -1210,5 +1210,6 @@ void Editor::LoadMwmEdits(xml_node const & mwm, MwmSet::MwmId const & mwmId, boo
}
}
const char * const Editor::kPlaceDoesNotExistMessage = "The place has gone or never existed. This is an auto-generated note from MAPS.ME application: a user reports a POI that is visible on a map (which can be outdated), but cannot be found on the ground.";
} // namespace osm

1
editor/xml_feature.cpp
View file

@ -400,6 +400,7 @@ string XMLFeature::TypeToString(Type type)
case Type::Way: return kWayType;
case Type::Relation: return kRelationType;
}
CHECK_SWITCH();
}
// static

4
generator/feature_segments_checker/feature_segments_checker.cpp
View file

@ -95,7 +95,7 @@ bool LinearLeastSquaresFactors(vector<double> const & xs, vector<double> const &
double constexpr kEpsilon = 1e-6;
size_t const n = xs.size();
double mx = 0, my = 0, mxy = 0, mx2 = 0;
for (int i = 0; i < n; ++i)
for (size_t i = 0; i < n; ++i)
{
mx += xs[i] / n;
my += ys[i] / n;
@ -271,7 +271,7 @@ public:
return;
double const k = (endAltitude - startAltitude) / realFeatureLengthMeters;
for (TAltitude i = 1; i + 1 < numPoints; ++i)
for (uint32_t i = 1; i + 1 < numPoints; ++i)
{
int32_t const deviation =
static_cast<TAltitude>(GetY(k, startAltitude, pointDists[i])) - pointAltitudes[i];

2
generator/generator_tests/tesselator_test.cpp
View file

@ -32,7 +32,7 @@ namespace
size_t count;
info.ForEachTriangle(DoDump(count));
TEST_EQUAL(count, trianglesCount, ());
TEST_EQUAL(count, static_cast<size_t>(trianglesCount), ());
return count;
}

1
generator/osm_element.cpp
View file

@ -28,6 +28,7 @@ std::string DebugPrint(OsmElement::EntityType e)
case OsmElement::EntityType::Member:
return "member";
}
CHECK_SWITCH();
}

9
generator/osm_o5m_source.hpp
View file

@ -1,6 +1,7 @@
// See O5M Format definition at https://wiki.openstreetmap.org/wiki/O5m
#pragma once
#include "base/assert.hpp"
#include "base/stl_helpers.hpp"
#include <algorithm>
@ -14,10 +15,9 @@
#include <type_traits>
#include <vector>
using TReadFunc = std::function<size_t(uint8_t *, size_t)>;
namespace
namespace osm
{
using TReadFunc = std::function<size_t(uint8_t *, size_t)>;
class StreamBuffer
{
@ -108,10 +108,7 @@ private:
m_position = m_buffer.begin();
}
};
} // anonymous namespace
namespace osm
{
class O5MSource
{

2
generator/ugc_db.cpp
View file

@ -21,7 +21,7 @@ namespace generator
static int callback(void * results_ptr, int argc, char ** argv, char ** azColName)
{
Results & results = *reinterpret_cast<Results *>(results_ptr);
for (size_t i = 0; i < argc; i++)
for (int i = 0; i < argc; i++)
{
if (results.empty)
results.empty = false;

4
geometry/cellid.hpp
View file

@ -250,7 +250,7 @@ public:
{
ASSERT_GREATER(v, 0, ());
ASSERT(0 < depth && depth <= DEPTH_LEVELS, (v, depth));
ASSERT_LESS_OR_EQUAL(v, TreeSizeForDepth(depth), ());
ASSERT_LESS_OR_EQUAL(static_cast<uint64_t>(v), TreeSizeForDepth(depth), ());
uint64_t bits = 0;
int level = 0;
--v;
@ -258,7 +258,7 @@ public:
{
bits <<= 2;
++level;
uint64_t subtreeSize = TreeSizeForDepth(depth - level);
int64_t subtreeSize = static_cast<int64_t>(TreeSizeForDepth(depth - level));
for (--v; v >= subtreeSize; v -= subtreeSize)
++bits;
}

1
geometry/line2d.cpp
View file

@ -61,6 +61,7 @@ string DebugPrint(LineIntersector::Result::Type type)
case Type::One: return "One";
case Type::Infinity: return "Infinity";
}
CHECK_SWITCH();
}
string DebugPrint(LineIntersector::Result const & result)

5
indexer/cell_coverer.hpp
View file

@ -169,8 +169,9 @@ void CoverSpiral(m2::RectD rect, int maxDepth, vector<CellId> & result)
};
auto const coordsAreValid = [](pair<int32_t, int32_t> const & xy) {
return xy.first >= 0 && xy.second >= 0 && xy.first <= CellId::MAX_COORD &&
xy.second <= CellId::MAX_COORD;
return xy.first >= 0 && xy.second >= 0 &&
static_cast<decltype(CellId::MAX_COORD)>(xy.first) <= CellId::MAX_COORD &&
static_cast<decltype(CellId::MAX_COORD)>(xy.second) <= CellId::MAX_COORD;
};
m2::RectD coveredRect;

1
indexer/feature_decl.cpp
View file

@ -19,6 +19,7 @@ string DebugPrint(feature::EGeomType type)
case EGeomType::GEOM_LINE: return "GEOM_LINE";
case EGeomType::GEOM_AREA: return "GEOM_AREA";
}
CHECK_SWITCH();
}
// static

1
indexer/ftraits.hpp
View file

@ -207,6 +207,7 @@ inline std::string DebugPrint(WheelchairAvailability wheelchair)
case WheelchairAvailability::Yes: return "Yes";
case WheelchairAvailability::Limited: return "Limited";
}
CHECK_SWITCH();
}
class Wheelchair : public TraitsBase<Wheelchair, WheelchairAvailability>

1
indexer/ftypes_matcher.cpp
View file

@ -357,6 +357,7 @@ char const * IsHotelChecker::GetHotelTypeTag(Type type)
case Type::Resort: return "resort";
case Type::Count: CHECK(false, ("Can't get hotel type tag")); return "";
}
CHECK_SWITCH();
}
IsWifiChecker::IsWifiChecker()

26
indexer/interval_index_builder.hpp
View file

@ -1,14 +1,20 @@
#pragma once
#include "indexer/interval_index.hpp"
#include "coding/byte_stream.hpp"
#include "coding/endianness.hpp"
#include "coding/varint.hpp"
#include "coding/write_to_sink.hpp"
#include "base/assert.hpp"
#include "base/base.hpp"
#include "base/bits.hpp"
#include "base/logging.hpp"
#include "std/vector.hpp"
#include <cstdint>
#include <limits>
#include <vector>
// +------------------------------+
// | Header |
@ -66,15 +72,15 @@ public:
WriteZeroesToSink(writer, 4 * (m_Levels + 2));
uint64_t const afterHeaderPos = writer.Pos();
vector<uint32_t> levelOffset;
std::vector<uint32_t> levelOffset;
{
vector<uint32_t> offsets;
std::vector<uint32_t> offsets;
levelOffset.push_back(static_cast<uint32_t>(writer.Pos()));
BuildLeaves(writer, beg, end, offsets);
levelOffset.push_back(static_cast<uint32_t>(writer.Pos()));
for (int i = 1; i <= static_cast<int>(m_Levels); ++i)
{
vector<uint32_t> nextOffsets;
std::vector<uint32_t> nextOffsets;
BuildLevel(writer, beg, end, i, &offsets[0], &offsets[0] + offsets.size(), nextOffsets);
nextOffsets.swap(offsets);
levelOffset.push_back(static_cast<uint32_t>(writer.Pos()));
@ -141,7 +147,7 @@ public:
{
CHECK_LESS(it->GetCell(), 1ULL << keyBits, ());
// We use static_cast<int64_t>(value) in BuildLeaves to store values difference as VarInt.
CHECK_EQUAL(it->GetValue(), static_cast<int64_t>(it->GetValue()), ());
CHECK_LESS_OR_EQUAL(it->GetValue(), static_cast<uint64_t>(std::numeric_limits<int64_t>::max()), ());
}
return true;
@ -150,10 +156,10 @@ public:
template <class SinkT>
uint32_t WriteNode(SinkT & sink, uint32_t offset, uint32_t * childSizes)
{
vector<uint8_t> bitmapSerial, listSerial;
std::vector<uint8_t> bitmapSerial, listSerial;
bitmapSerial.reserve(1024);
listSerial.reserve(1024);
PushBackByteSink<vector<uint8_t> > bitmapSink(bitmapSerial), listSink(listSerial);
PushBackByteSink<std::vector<uint8_t> > bitmapSink(bitmapSerial), listSink(listSerial);
WriteBitmapNode(bitmapSink, offset, childSizes);
WriteListNode(listSink, offset, childSizes);
if (bitmapSerial.size() <= listSerial.size())
@ -173,12 +179,12 @@ public:
template <class Writer, typename CellIdValueIter>
void BuildLevel(Writer & writer, CellIdValueIter const & beg, CellIdValueIter const & end,
int level, uint32_t const * childSizesBeg, uint32_t const * childSizesEnd,
vector<uint32_t> & sizes)
std::vector<uint32_t> & sizes)
{
UNUSED_VALUE(childSizesEnd);
ASSERT_GREATER(level, 0, ());
uint32_t const skipBits = m_LeafBytes * 8 + (level - 1) * m_BitsPerLevel;
vector<uint32_t> expandedSizes(1 << m_BitsPerLevel);
std::vector<uint32_t> expandedSizes(1 << m_BitsPerLevel);
uint64_t prevKey = static_cast<uint64_t>(-1);
uint32_t childOffset = 0;
uint32_t nextChildOffset = 0;
@ -206,7 +212,7 @@ public:
template <class Writer, typename CellIdValueIter>
void BuildLeaves(Writer & writer, CellIdValueIter const & beg, CellIdValueIter const & end,
vector<uint32_t> & sizes)
std::vector<uint32_t> & sizes)
{
using Value = typename CellIdValueIter::value_type::ValueType;

1
indexer/mwm_set.cpp
View file

@ -448,6 +448,7 @@ string DebugPrint(MwmSet::RegResult result)
case MwmSet::RegResult::UnsupportedFileFormat:
return "UnsupportedFileFormat";
}
CHECK_SWITCH();
}
string DebugPrint(MwmSet::Event::Type type)

1
indexer/postcodes_matcher.cpp
View file

@ -64,6 +64,7 @@ public:
case TStringSet::Status::Prefix: return isPrefix;
case TStringSet::Status::Full: return true;
}
CHECK_SWITCH();
}
inline size_t GetMaxNumTokensInPostcode() const { return m_maxNumTokensInPostcode; }

1
kml/serdes.cpp
View file

@ -122,6 +122,7 @@ std::string GetStyleForPredefinedColor(PredefinedColor color)
case PredefinedColor::Count:
return {};
}
CHECK_SWITCH();
}
BookmarkIcon GetIcon(std::string const & iconName)

3
kml/types.hpp
View file

@ -43,6 +43,7 @@ inline std::string DebugPrint(PredefinedColor color)
case PredefinedColor::Orange: return "Orange";
case PredefinedColor::Count: return {};
}
CHECK_SWITCH();
}
enum class AccessRules : uint8_t
@ -61,6 +62,7 @@ inline std::string DebugPrint(AccessRules accessRules)
case AccessRules::Public: return "Public";
case AccessRules::Count: return {};
}
CHECK_SWITCH();
}
enum class BookmarkIcon : uint16_t
@ -116,6 +118,7 @@ inline std::string DebugPrint(BookmarkIcon icon)
case BookmarkIcon::Water: return "Water";
case BookmarkIcon::Count: return {};
}
CHECK_SWITCH();
}
struct ColorData

1
map/booking_filter_cache.cpp
View file

@ -106,6 +106,7 @@ std::string DebugPrint(Cache::HotelStatus status)
case Cache::HotelStatus::Unavailable: return "Unavailable";
case Cache::HotelStatus::Available: return "Available";
}
CHECK_SWITCH();
}
} // namespace availability
} // namespace filter

2
map/bookmark.cpp
View file

@ -36,6 +36,7 @@ std::string GetBookmarkIconType(kml::BookmarkIcon const & icon)
ASSERT(false, ("Invalid bookmark icon type"));
return {};
}
CHECK_SWITCH();
}
} // namespace
@ -105,6 +106,7 @@ df::ColorConstant Bookmark::GetColorConstant() const
case kml::PredefinedColor::Count:
return "BookmarkRed";
}
CHECK_SWITCH();
}
bool Bookmark::HasCreationAnimation() const

1
map/bookmark_helpers.hpp
View file

@ -26,6 +26,7 @@ inline std::string DebugPrint(KmlFileType fileType)
case KmlFileType::Text: return "Text";
case KmlFileType::Binary: return "Binary";
}
CHECK_SWITCH();
}
std::unique_ptr<kml::FileData> LoadKmlFile(std::string const & file, KmlFileType fileType);

12
map/bookmark_manager.cpp
View file

@ -97,6 +97,7 @@ bool IsValidFilterType(BookmarkManager::CategoryFilterType const filter,
case BookmarkManager::CategoryFilterType::Public: return fromCatalog;
case BookmarkManager::CategoryFilterType::Private: return !fromCatalog;
}
CHECK_SWITCH();
}
class FindMarkFunctor
@ -343,8 +344,12 @@ bool MigrateIfNeeded()
if (files.empty())
{
auto const newBookmarksDir = GetBookmarksDirectory();
if (!GetPlatform().IsFileExistsByFullPath(newBookmarksDir))
UNUSED_VALUE(GetPlatform().MkDirChecked(newBookmarksDir));
if (!GetPlatform().IsFileExistsByFullPath(newBookmarksDir) &&
!GetPlatform().MkDirChecked(newBookmarksDir))
{
LOG(LWARNING, ("Could not create directory:", newBookmarksDir));
return false;
}
OnMigrationSuccess(0 /* originalCount */, 0 /* convertedCount */);
return true;
}
@ -894,7 +899,8 @@ void BookmarkManager::SaveState() const
void BookmarkManager::LoadState()
{
UNUSED_VALUE(settings::Get(kLastEditedBookmarkCategory, m_lastCategoryUrl));
settings::TryGet(kLastEditedBookmarkCategory, m_lastCategoryUrl);
uint32_t color;
if (settings::Get(kLastEditedBookmarkColor, color) &&
color > static_cast<uint32_t>(kml::PredefinedColor::None) &&

4
map/chart_generator.cpp
View file

@ -63,6 +63,7 @@ agg::rgba8 GetLineColor(MapStyle mapStyle)
case MapStyleMerged:
return agg::rgba8(30, 150, 240, 255);
}
CHECK_SWITCH();
}
agg::rgba8 GetCurveColor(MapStyle mapStyle)
@ -80,6 +81,7 @@ agg::rgba8 GetCurveColor(MapStyle mapStyle)
case MapStyleMerged:
return agg::rgba8(30, 150, 240, 20);
}
CHECK_SWITCH();
}
} // namespace
@ -219,8 +221,6 @@ bool GenerateChartByPoints(uint32_t width, uint32_t height, vector<m2::PointD> c
using TBlender = BlendAdaptor<agg::rgba8, agg::order_rgba>;
using TPixelFormat = agg::pixfmt_custom_blend_rgba<TBlender, agg::rendering_buffer>;
using TBaseRenderer = agg::renderer_base<TPixelFormat>;
using TPrimitivesRenderer = agg::renderer_primitives<TBaseRenderer>;
using TSolidRenderer = agg::renderer_scanline_aa_solid<TBaseRenderer>;
using TPath = agg::poly_container_adaptor<vector<m2::PointD>>;
using TStroke = agg::conv_stroke<TPath>;

1
map/cloud.cpp
View file

@ -128,6 +128,7 @@ bool CanUpload(uint64_t totalUploadingSize)
return platform::GetCurrentNetworkPolicy().CanUse() &&
totalUploadingSize <= kMaxWwanUploadingSizeInBytes;
}
CHECK_SWITCH();
}
struct SnapshotCreateRequestData

3
map/cloud.hpp
View file

@ -391,6 +391,7 @@ inline std::string DebugPrint(Cloud::SynchronizationType type)
case Cloud::SynchronizationType::Backup: return "Backup";
case Cloud::SynchronizationType::Restore: return "Restore";
}
CHECK_SWITCH();
}
inline std::string DebugPrint(Cloud::SynchronizationResult result)
@ -404,6 +405,7 @@ inline std::string DebugPrint(Cloud::SynchronizationResult result)
case Cloud::SynchronizationResult::UserInterrupted: return "UserInterrupted";
case Cloud::SynchronizationResult::InvalidCall: return "InvalidCall";
}
CHECK_SWITCH();
}
inline std::string DebugPrint(Cloud::RestoringRequestResult result)
@ -414,4 +416,5 @@ inline std::string DebugPrint(Cloud::RestoringRequestResult result)
case Cloud::RestoringRequestResult::NoBackup: return "NoBackup";
case Cloud::RestoringRequestResult::NotEnoughDiskSpace: return "NotEnoughDiskSpace";
}
CHECK_SWITCH();
}

2
map/discovery/discovery_manager.cpp
View file

@ -16,6 +16,8 @@ std::string GetQuery(discovery::ItemType const type)
case discovery::ItemType::LocalExperts:
case discovery::ItemType::Viator: ASSERT(false, ()); return "";
}
CHECK_SWITCH();
}
} // namespace

2
map/framework.cpp
View file

@ -1932,7 +1932,7 @@ void Framework::SetupMeasurementSystem()
GetPlatform().SetupMeasurementSystem();
auto units = measurement_utils::Units::Metric;
UNUSED_VALUE(settings::Get(settings::kMeasurementUnits, units));
settings::TryGet(settings::kMeasurementUnits, units);
m_routingManager.SetTurnNotificationsUnits(units);
}

2
map/gps_track_filter.cpp
View file

@ -57,7 +57,7 @@ GpsTrackFilter::GpsTrackFilter()
, m_countLastInfo(0)
, m_countAcceptedInfo(0)
{
UNUSED_VALUE(settings::Get(kMinHorizontalAccuracyKey, m_minAccuracy));
settings::TryGet(kMinHorizontalAccuracyKey, m_minAccuracy);
}
void GpsTrackFilter::Process(vector<location::GpsInfo> const & inPoints,

9
map/gps_track_storage.cpp
View file

@ -171,7 +171,8 @@ void GpsTrackStorage::Append(vector<TItem> const & items)
TruncFile();
// Write position must be after last item position
ASSERT_EQUAL(m_stream.tellp(), GetItemOffset(m_itemCount), ());
ASSERT_EQUAL(m_stream.tellp(), static_cast<typename fstream::pos_type>(
GetItemOffset(m_itemCount)), ());
vector<char> buff(min(kItemBlockSize, items.size()) * kPointSize);
for (size_t i = 0; i < items.size();)
@ -212,7 +213,8 @@ void GpsTrackStorage::Clear()
MYTHROW(WriteException, ("File:", m_filePath));
// Write position is set to the first item in the file
ASSERT_EQUAL(m_stream.tellp(), GetItemOffset(0), ());
ASSERT_EQUAL(m_stream.tellp(), static_cast<typename fstream::pos_type>(
GetItemOffset(0)), ());
}
void GpsTrackStorage::ForEach(std::function<bool(TItem const & item)> const & fn)
@ -308,7 +310,8 @@ void GpsTrackStorage::TruncFile()
m_itemCount = newItemCount;
// Write position must be after last item position (end of file)
ASSERT_EQUAL(m_stream.tellp(), GetItemOffset(m_itemCount), ());
ASSERT_EQUAL(m_stream.tellp(), static_cast<typename fstream::pos_type>(
GetItemOffset(m_itemCount)), ());
}
size_t GpsTrackStorage::GetFirstItemIndex() const

1
map/mwm_url.cpp
View file

@ -259,6 +259,7 @@ ParsedMapApi::ParsingResult ParsedMapApi::Parse(Uri const & uri)
return ParsingResult::Lead;
}
}
CHECK_SWITCH();
}
bool ParsedMapApi::RouteKeyValue(string const & key, string const & value, vector<string> & pattern)

3
map/osm_opening_hours.hpp
View file

@ -2,6 +2,8 @@
#include "3party/opening_hours/opening_hours.hpp"
#include "base/assert.hpp"
#include "std/chrono.hpp"
namespace osm
@ -27,6 +29,7 @@ inline string DebugPrint(EPlaceState state)
case EPlaceState::CloseSoon:
return "EPlaceState::CloseSoon";
}
CHECK_SWITCH();
}
inline EPlaceState PlaceStateCheck(string const & openingHours, time_t timestamp)

4
map/routing_manager.cpp
View file

@ -207,6 +207,7 @@ VehicleType GetVehicleType(RouterType routerType)
case RouterType::Transit: return VehicleType::Transit;
case RouterType::Count: CHECK(false, ("Invalid type", routerType)); return VehicleType::Count;
}
CHECK_SWITCH();
}
} // namespace
@ -1037,7 +1038,8 @@ bool RoutingManager::IsTrackingReporterEnabled() const
return false;
bool enableTracking = true;
UNUSED_VALUE(settings::Get(tracking::Reporter::kEnableTrackingKey, enableTracking));
settings::TryGet(tracking::Reporter::kEnableTrackingKey, enableTracking);
return enableTracking;
}

2
map/routing_mark.cpp
View file

@ -102,6 +102,7 @@ uint16_t RouteMarkPoint::GetPriority() const
}
}
}
CHECK_SWITCH();
}
uint32_t RouteMarkPoint::GetIndex() const
@ -112,6 +113,7 @@ uint32_t RouteMarkPoint::GetIndex() const
case RouteMarkType::Finish: return 1;
case RouteMarkType::Intermediate: return static_cast<uint32_t >(m_markData.m_intermediateIndex + 2);
}
CHECK_SWITCH();
}
void RouteMarkPoint::SetMarkData(RouteMarkData && data)

1
map/user.cpp
View file

@ -68,6 +68,7 @@ std::string AuthenticationUrl(std::string const & socialToken,
return ss.str();
}
}
CHECK_SWITCH();
}
std::string UserDetailsUrl()

1
map/user_mark.cpp
View file

@ -86,4 +86,5 @@ string DebugPrint(UserMark::Type type)
case UserMark::Type::USER_MARK_TYPES_COUNT: return "USER_MARK_TYPES_COUNT";
case UserMark::Type::USER_MARK_TYPES_COUNT_MAX: return "USER_MARK_TYPES_COUNT_MAX";
}
CHECK_SWITCH();
}

2
openlr/openlr_match_quality/openlr_assessment_tool/traffic_mode.cpp
View file

@ -241,7 +241,7 @@ void TrafficMode::OnItemSelected(QItemSelection const & selected, QItemSelection
auto const row = selected.front().top();
CHECK_LESS(row, m_segments.size(), ());
CHECK_LESS(static_cast<size_t>(row), m_segments.size(), ());
m_currentSegment = &m_segments[row];
auto const & partnerSegment = m_currentSegment->GetPartnerSegment();

3
partners_api/banner.hpp
View file

@ -1,5 +1,7 @@
#pragma once
#include "base/assert.hpp"
#include <string>
namespace ads
@ -32,5 +34,6 @@ inline std::string DebugPrint(Banner::Type type)
case Banner::Type::Mopub: return "Mopub";
case Banner::Type::Google: return "Google";
}
CHECK_SWITCH();
}
} // namespace ads

1
partners_api/taxi_places_loader.cpp
View file

@ -55,6 +55,7 @@ std::string Loader::GetFileNameByProvider(Provider::Type const type)
case Provider::Type::Yandex: return "taxi_places/yandex.json";
case Provider::Type::Count: LOG(LERROR, ("Incorrect taxi provider")); return "";
}
CHECK_SWITCH();
}
} // namespace places
} // namespace taxi

2
partners_api/taxi_provider.hpp
View file

@ -82,6 +82,7 @@ inline std::string DebugPrint(Provider::Type type)
case Provider::Type::Maxim: return "Maxim";
case Provider::Type::Count: ASSERT(false, ()); return "";
}
CHECK_SWITCH();
}
inline std::string DebugPrint(ErrorCode code)
@ -91,6 +92,7 @@ inline std::string DebugPrint(ErrorCode code)
case ErrorCode::NoProducts: return "NoProducts";
case ErrorCode::RemoteError: return "RemoteError";
}
CHECK_SWITCH();
}
inline std::string DebugPrint(ProviderError error)

1
platform/country_defines.cpp
View file

@ -38,4 +38,5 @@ string DebugPrint(MapOptions options)
case MapOptions::Diff:
return "Diff";
}
CHECK_SWITCH();
}

3
platform/http_request.cpp
View file

@ -290,7 +290,8 @@ public:
{
// Check that resume information is correct with existing file.
uint64_t size;
if (my::GetFileSize(filePath + DOWNLOADING_FILE_EXTENSION, size) && size <= fileSize)
if (my::GetFileSize(filePath + DOWNLOADING_FILE_EXTENSION, size) &&
size <= static_cast<uint64_t>(fileSize))
openMode = FileWriter::OP_WRITE_EXISTING;
else
m_strategy.InitChunks(fileSize, chunkSize);

1
platform/local_country_file_utils.cpp
View file

@ -467,5 +467,6 @@ string DebugPrint(CountryIndexes::Index index)
case CountryIndexes::Index::Offsets:
return "Offsets";
}
CHECK_SWITCH();
}
} // namespace platform

9
platform/measurement_utils.cpp
View file

@ -7,6 +7,7 @@
#include "base/math.hpp"
#include "base/stl_add.hpp"
#include "base/string_utils.hpp"
#include "base/logging.hpp"
#include "std/cstring.hpp"
#include "std/iomanip.hpp"
@ -55,7 +56,7 @@ bool FormatDistanceImpl(double m, string & res,
bool FormatDistance(double m, string & res)
{
auto units = Units::Metric;
UNUSED_VALUE(Get(settings::kMeasurementUnits, units));
TryGet(settings::kMeasurementUnits, units);
/// @todo Put string units resources.
switch (units)
@ -63,6 +64,7 @@ bool FormatDistance(double m, string & res)
case Units::Imperial: return FormatDistanceImpl(m, res, " mi", " ft", 1609.344, 0.3048);
case Units::Metric: return FormatDistanceImpl(m, res, " km", " m", 1000.0, 1.0);
}
CHECK_SWITCH();
}
@ -163,7 +165,7 @@ void FormatMercator(m2::PointD const & mercator, string & lat, string & lon, int
string FormatAltitude(double altitudeInMeters)
{
Units units = Units::Metric;
UNUSED_VALUE(Get(settings::kMeasurementUnits, units));
TryGet(settings::kMeasurementUnits, units);
ostringstream ss;
ss << fixed << setprecision(0);
@ -180,7 +182,7 @@ string FormatAltitude(double altitudeInMeters)
string FormatSpeedWithDeviceUnits(double metersPerSecond)
{
auto units = Units::Metric;
UNUSED_VALUE(Get(settings::kMeasurementUnits, units));
TryGet(settings::kMeasurementUnits, units);
return FormatSpeedWithUnits(metersPerSecond, units);
}
@ -209,6 +211,7 @@ string FormatSpeedUnits(Units units)
case Units::Imperial: return "mph";
case Units::Metric: return "km/h";
}
CHECK_SWITCH();
}
bool OSMDistanceToMeters(string const & osmRawValue, double & outMeters)

1
platform/measurement_utils.hpp
View file

@ -19,6 +19,7 @@ inline string DebugPrint(Units units)
case Units::Imperial: return "Units::Imperial";
case Units::Metric: return "Units::Metric";
}
CHECK_SWITCH();
}
inline double MetersToMiles(double m) { return m * 0.000621371192; }

3
platform/mwm_traits.cpp
View file

@ -1,6 +1,7 @@
#include "mwm_traits.hpp"
#include "base/logging.hpp"
#include "base/macros.hpp"
namespace version
{
@ -39,6 +40,7 @@ string DebugPrint(MwmTraits::SearchIndexFormat format)
case MwmTraits::SearchIndexFormat::CompressedBitVector:
return "CompressedBitVector";
}
CHECK_SWITCH();
}
string DebugPrint(MwmTraits::HouseToStreetTableFormat format)
@ -50,5 +52,6 @@ string DebugPrint(MwmTraits::HouseToStreetTableFormat format)
case MwmTraits::HouseToStreetTableFormat::Unknown:
return "Unknown";
}
CHECK_SWITCH();
}
} // namespace version

2
platform/platform.cpp
View file

@ -306,6 +306,7 @@ string DebugPrint(Platform::EError err)
case Platform::ERR_IO_ERROR: return "An I/O error occurred.";
case Platform::ERR_UNKNOWN: return "Unknown";
}
CHECK_SWITCH();
}
string DebugPrint(Platform::ChargingStatus status)
@ -316,4 +317,5 @@ string DebugPrint(Platform::ChargingStatus status)
case Platform::ChargingStatus::Plugged: return "Plugged";
case Platform::ChargingStatus::Unplugged: return "Unplugged";
}
CHECK_SWITCH();
}

2
platform/settings.cpp
View file

@ -280,6 +280,7 @@ string ToString<measurement_utils::Units>(measurement_utils::Units const & v)
case measurement_utils::Units::Imperial: return "Foot";
case measurement_utils::Units::Metric: return "Metric";
}
CHECK_SWITCH();
}
template <>
@ -336,6 +337,7 @@ string ToString<Transliteration::Mode>(Transliteration::Mode const & mode)
case Transliteration::Mode::Enabled: return "Enabled";
case Transliteration::Mode::Disabled: return "Disabled";
}
CHECK_SWITCH();
}
template <>

8
platform/settings.hpp
View file

@ -35,6 +35,14 @@ WARN_UNUSED_RESULT bool Get(string const & key, Value & outValue)
string strVal;
return StringStorage::Instance().GetValue(key, strVal) && FromString(strVal, outValue);
}
template <class Value>
void TryGet(string const & key, Value & outValue)
{
bool unused = Get(key, outValue);
UNUSED_VALUE(unused);
}
/// Automatically saves setting to external file
template <class Value>
void Set(string const & key, Value const & value)

3
qt/mainwindow.cpp
View file

@ -124,7 +124,8 @@ MainWindow::MainWindow(Framework & framework, bool apiOpenGLES3, QString const &
#ifndef NO_DOWNLOADER
// Show intro dialog if necessary
bool bShow = true;
(void)settings::Get("ShowWelcome", bShow);
string const showWelcome = "ShowWelcome";
settings::TryGet(showWelcome, bShow);
if (bShow)
{

3
routing/bicycle_directions.cpp
View file

@ -345,7 +345,8 @@ void BicycleDirectionsEngine::FillPathSegmentsAndAdjacentEdgesMap(
continue;
}
CHECK_EQUAL(prevJunctions.size(), abs(static_cast<int32_t>(inSegId - startSegId)) + 1, ());
CHECK_EQUAL(prevJunctions.size(), static_cast<size_t>(
abs(static_cast<int32_t>(inSegId - startSegId)) + 1), ());
prevJunctions.push_back(currJunction);

1
routing/cross_mwm_connector.cpp
View file

@ -13,6 +13,7 @@ std::string DebugPrint(WeightsLoadState state)
case WeightsLoadState::NotExists: return "NotExists";
case WeightsLoadState::Loaded: return "Loaded";
}
CHECK_SWITCH();
}
} // namespace connector
} // namespace routing

1
routing/cross_mwm_connector.hpp
View file

@ -180,6 +180,7 @@ public:
case connector::WeightsLoadState::NotExists:
case connector::WeightsLoadState::Loaded: return true;
}
CHECK_SWITCH();
}
template <typename CalcWeight>

1
routing/edge_estimator.cpp
View file

@ -214,6 +214,7 @@ shared_ptr<EdgeEstimator> EdgeEstimator::Create(VehicleType vehicleType, double
CHECK(false, ("Can't create EdgeEstimator for", vehicleType));
return nullptr;
}
CHECK_SWITCH();
}
// static

8
routing/index_router.cpp
View file

@ -98,6 +98,7 @@ shared_ptr<VehicleModelFactoryInterface> CreateVehicleModelFactory(
CHECK(false, ("Can't create VehicleModelFactoryInterface for", vehicleType));
return nullptr;
}
CHECK_SWITCH();
}
unique_ptr<IDirectionsEngine> CreateDirectionsEngine(VehicleType vehicleType,
@ -115,6 +116,7 @@ unique_ptr<IDirectionsEngine> CreateDirectionsEngine(VehicleType vehicleType,
CHECK(false, ("Can't create DirectionsEngine for", vehicleType));
return nullptr;
}
CHECK_SWITCH();
}
shared_ptr<TrafficStash> CreateTrafficStash(VehicleType vehicleType, shared_ptr<NumMwmIds> numMwmIds,
@ -761,7 +763,7 @@ RouterResultCode IndexRouter::ProcessLeaps(vector<Segment> const & input,
auto const lastMwmId = input[input.size() - 2].GetMwmId();
auto const finishLeapStartIt = find_if(startLeapEndIt, input.end(),
[lastMwmId](Segment const & s) { return s.GetMwmId() == lastMwmId; });
auto const finishLeapStart = distance(input.begin(), finishLeapStartIt);
auto const finishLeapStart = static_cast<size_t>(distance(input.begin(), finishLeapStartIt));
for (size_t i = 0; i <= finishLeapStart; ++i)
{
@ -780,7 +782,7 @@ RouterResultCode IndexRouter::ProcessLeaps(vector<Segment> const & input,
{
bool const isStartLeap = i == 0;
i = isStartLeap ? startLeapEnd : input.size() - 1;
CHECK_LESS(i, input.size(), ());
CHECK_LESS(static_cast<size_t>(i), input.size(), ());
auto const & next = input[i];
// First start-to-mwm-exit and last mwm-enter-to-finish leaps need special processing.
@ -807,7 +809,7 @@ RouterResultCode IndexRouter::ProcessLeaps(vector<Segment> const & input,
else
{
++i;
CHECK_LESS(i, input.size(), ());
CHECK_LESS(static_cast<size_t>(i), input.size(), ());
auto const & next = input[i];
CHECK(!IndexGraphStarter::IsFakeSegment(current), ());

1
routing/index_router.hpp
View file

@ -127,6 +127,7 @@ private:
case AStarAlgorithm<Graph>::Result::Cancelled: return RouterResultCode::Cancelled;
case AStarAlgorithm<Graph>::Result::OK: return RouterResultCode::NoError;
}
CHECK_SWITCH();
}
template <typename Graph>

1
routing/road_graph.cpp
View file

@ -310,6 +310,7 @@ string DebugPrint(IRoadGraph::Mode mode)
case IRoadGraph::Mode::ObeyOnewayTag: return "ObeyOnewayTag";
case IRoadGraph::Mode::IgnoreOnewayTag: return "IgnoreOnewayTag";
}
CHECK_SWITCH();
}
IRoadGraph::RoadInfo MakeRoadInfoForTesting(bool bidirectional, double speedKMPH,

1
routing/routing_session.cpp
View file

@ -802,5 +802,6 @@ string DebugPrint(RoutingSession::State state)
case RoutingSession::RouteNoFollowing: return "RouteNoFollowing";
case RoutingSession::RouteRebuilding: return "RouteRebuilding";
}
CHECK_SWITCH();
}
} // namespace routing

1
routing/routing_settings.cpp
View file

@ -26,5 +26,6 @@ RoutingSettings GetRoutingSettings(VehicleType vehicleType)
CHECK(false, ("Can't create GetRoutingSettings for", vehicleType));
return {};
}
CHECK_SWITCH();
}
} // namespace routing

6
routing/routing_tests/index_graph_test.cpp
View file

@ -309,8 +309,8 @@ UNIT_TEST(FindPathManhattan)
? finish.m_projections[0].m_segment.GetFeatureId()
: finish.m_projections[0].m_segment.GetFeatureId() - kCitySize;
if (start.m_projections[0].m_segment.GetFeatureId() < kCitySize ==
finish.m_projections[0].m_segment.GetFeatureId() < kCitySize)
if ((start.m_projections[0].m_segment.GetFeatureId() < kCitySize) ==
(finish.m_projections[0].m_segment.GetFeatureId() < kCitySize))
{
uint32_t segDelta = AbsDelta(start.m_projections[0].m_segment.GetSegmentIdx(),
finish.m_projections[0].m_segment.GetSegmentIdx());
@ -352,7 +352,7 @@ UNIT_TEST(FindPathManhattan)
// Roads y:
//
// fast road R0 * - * - * -1
// / \
// ╱ ╲
// slow road R1 * - - * - - * - - * - - * 0
// J0 J1
//

8
routing/routing_tests/restriction_test.cpp
View file

@ -217,13 +217,13 @@ UNIT_CLASS_TEST(RestrictionTest, TriangularGraph_RestrictionNoF5F2RestrictionOnl
// F4
// |
// 2 *
// | \
// | ╲
// F0 F2
// | \
// | ╲
// 1 * *
// | \
// | ╲
// F0 F2
// | \
// | ╲
// 0 *---F1--*--F1--*--F3---* Start
// 0 1 2 3
// Note. All features are two setments and two-way.

1
routing/transit_info.hpp
View file

@ -149,5 +149,6 @@ inline std::string DebugPrint(TransitInfo::Type type)
case TransitInfo::Type::Edge: return "Edge";
case TransitInfo::Type::Transfer: return "Transfer";
}
CHECK_SWITCH();
}
} // namespace routing

1
routing/vehicle_mask.cpp
View file

@ -19,6 +19,7 @@ string DebugPrint(VehicleType vehicleType)
case VehicleType::Transit: return "Transit";
case VehicleType::Count: return "Count";
}
CHECK_SWITCH();
}
string ToString(VehicleType vehicleType) { return DebugPrint(vehicleType); }

3
search/features_layer_matcher.hpp
View file

@ -377,7 +377,8 @@ private:
/// Correct fix would be injection into ForEachInIntervalAndScale, so deleted features will
/// never
/// be emitted and used in other code.
UNUSED_VALUE(m_context->GetFeature(id, ft));
if (!m_context->GetFeature(id, ft))
LOG(LWARNING, ("GetFeature() returned false."));
}
MwmContext * m_context;

1
search/geocoder.cpp
View file

@ -1414,6 +1414,7 @@ CBV Geocoder::RetrieveGeometryFeatures(MwmContext const & context, m2::RectD con
case RECT_ID_LOCALITY: return m_localityRectsCache.Get(context, rect, m_params.GetScale());
case RECT_ID_COUNT: ASSERT(false, ("Invalid RectId.")); return CBV();
}
CHECK_SWITCH();
}
bool Geocoder::GetTypeInGeocoding(BaseContext const & ctx, uint32_t featureId, Model::Type & type)

3
search/geocoder_context.cpp
View file

@ -24,6 +24,7 @@ BaseContext::TokenType BaseContext::FromModelType(Model::Type type)
case Model::TYPE_COUNTRY: return TOKEN_TYPE_COUNTRY;
case Model::TYPE_COUNT: return TOKEN_TYPE_COUNT;
}
CHECK_SWITCH();
}
// static
@ -35,6 +36,7 @@ BaseContext::TokenType BaseContext::FromRegionType(Region::Type type)
case Region::TYPE_COUNTRY: return TOKEN_TYPE_COUNTRY;
case Region::TYPE_COUNT: return TOKEN_TYPE_COUNT;
}
CHECK_SWITCH();
}
size_t BaseContext::SkipUsedTokens(size_t curToken) const
@ -97,5 +99,6 @@ string DebugPrint(BaseContext::TokenType type)
case BaseContext::TOKEN_TYPE_POSTCODE: return "POSTCODE";
case BaseContext::TOKEN_TYPE_COUNT: return "COUNT";
}
CHECK_SWITCH();
}
} // namespace search

1
search/geocoder_locality.cpp
View file

@ -13,6 +13,7 @@ Model::Type Region::ToModelType(Type type)
case Region::TYPE_COUNTRY: return Model::TYPE_COUNTRY;
case Region::TYPE_COUNT: return Model::TYPE_COUNT;
}
CHECK_SWITCH();
}
std::string DebugPrint(Locality const & locality)

3
search/house_numbers_matcher.cpp
View file

@ -166,6 +166,7 @@ public:
case TStrings::Status::Prefix: return isPrefix;
case TStrings::Status::Full: return true;
}
CHECK_SWITCH();
}
private:
@ -236,6 +237,7 @@ public:
case TPatterns::Status::Prefix: return true;
case TPatterns::Status::Full: return true;
}
CHECK_SWITCH();
}
private:
@ -250,6 +252,7 @@ private:
case 'U': return Token::TYPE_BUILDING_PART_OR_LETTER;
default: CHECK(false, ("Unexpected character:", c)); return Token::TYPE_SEPARATOR;
}
CHECK_SWITCH();
}
static Token::Type TokenToType(Token const & token) { return token.m_type; }

6
search/keyword_matcher.cpp
View file

@ -57,9 +57,9 @@ KeywordMatcher::Score KeywordMatcher::CalcScore(strings::UniString const * token
int8_t prevTokenMatchDistance = 0;
bool prefixMatched = true;
for (int i = 0; i < m_keywords.size(); ++i)
for (size_t i = 0; i < m_keywords.size(); ++i)
{
for (int j = 0; j < count && !isQueryTokenMatched[i]; ++j)
for (size_t j = 0; j < count && !isQueryTokenMatched[i]; ++j)
{
if (!isNameTokenMatched[j] && m_keywords[i] == tokens[j])
{
@ -74,7 +74,7 @@ KeywordMatcher::Score KeywordMatcher::CalcScore(strings::UniString const * token
if (!m_prefix.empty())
{
prefixMatched = false;
for (int j = 0; j < count && !prefixMatched; ++j)
for (size_t j = 0; j < count && !prefixMatched; ++j)
{
if (!isNameTokenMatched[j] &&
strings::StartsWith(tokens[j].begin(), tokens[j].end(), m_prefix.begin(), m_prefix.end()))

1
search/mwm_context.cpp
View file

@ -37,6 +37,7 @@ bool MwmContext::GetFeature(uint32_t index, FeatureType & ft) const
ft.SetID(FeatureID(GetId(), index));
return true;
}
CHECK_SWITCH();
}
bool MwmContext::GetStreetIndex(uint32_t houseId, uint32_t & streetId)

1
search/nested_rects_cache.cpp
View file

@ -82,6 +82,7 @@ double NestedRectsCache::GetRadiusMeters(RectScale scale)
case RECT_SCALE_LARGE: return 2500.0;
case RECT_SCALE_COUNT: return 5000.0;
}
CHECK_SWITCH();
}
void NestedRectsCache::Update()

2
search/ranker.cpp
View file

@ -145,6 +145,7 @@ ftypes::Type GetLocalityIndex(feature::TypesHolder const & types)
case VILLAGE: return NONE;
case LOCALITY_COUNT: return type;
}
CHECK_SWITCH();
}
// TODO: Format street and house number according to local country's rules.
@ -430,6 +431,7 @@ Result Ranker::MakeResult(RankerResult const & rankerResult, bool needAddress,
case RankerResult::Type::TYPE_LATLON: return Result(r.GetCenter(), name, address);
}
ASSERT(false, ("Bad RankerResult type:", static_cast<size_t>(r.GetResultType())));
CHECK_SWITCH();
};
auto res = mk(rankerResult);

3
search/result.cpp
View file

@ -193,7 +193,8 @@ bool Results::AddResult(Result && result)
if (result.IsSuggest())
{
if (distance(m_results.begin(), it) >= kMaxNumSuggests)
auto const d = distance(m_results.begin(), it);
if (d >= static_cast<decltype(d)>(kMaxNumSuggests))
return false;
for (auto i = m_results.begin(); i != it; ++i)

3
search/retrieval.cpp
View file

@ -367,14 +367,13 @@ unique_ptr<coding::CompressedBitVector> Retrieval::Retrieve(Args &&... args) con
ASSERT(m_root0, ());
return r(*m_root0, m_context, m_cancellable, forward<Args>(args)...);
}
break;
case version::MwmTraits::SearchIndexFormat::CompressedBitVector:
{
R<FeatureIndexValue> r;
ASSERT(m_root1, ());
return r(*m_root1, m_context, m_cancellable, forward<Args>(args)...);
}
break;
}
CHECK_SWITCH();
}
} // namespace search

28
search/search_quality/assessment_tool/main_model.cpp
View file

@ -115,7 +115,7 @@ void MainModel::OnSampleSelected(int index)
CHECK(m_threadChecker.CalledOnOriginalThread(), ());
CHECK_GREATER_OR_EQUAL(index, 0, ());
CHECK_LESS(index, m_contexts.Size(), ());
CHECK_LESS(static_cast<size_t>(index), m_contexts.Size(), ());
CHECK(m_view, ());
m_selectedSample = index;
@ -176,31 +176,32 @@ void MainModel::OnSampleSelected(int index)
void MainModel::OnResultSelected(int index)
{
CHECK_GREATER_OR_EQUAL(m_selectedSample, 0, ());
CHECK_LESS(m_selectedSample, m_contexts.Size(), ());
CHECK_LESS(static_cast<size_t>(m_selectedSample), m_contexts.Size(), ());
auto const & context = m_contexts[m_selectedSample];
auto const & foundResults = context.m_foundResults;
CHECK_GREATER_OR_EQUAL(index, 0, ());
CHECK_LESS(index, foundResults.GetCount(), ());
CHECK_LESS(static_cast<size_t>(index), foundResults.GetCount(), ());
m_view->MoveViewportToResult(foundResults[index]);
}
void MainModel::OnNonFoundResultSelected(int index)
{
CHECK_GREATER_OR_EQUAL(m_selectedSample, 0, ());
CHECK_LESS(m_selectedSample, m_contexts.Size(), ());
CHECK_LESS(static_cast<size_t>(m_selectedSample), m_contexts.Size(), ());
auto const & context = m_contexts[m_selectedSample];
auto const & results = context.m_nonFoundResults;
CHECK_GREATER_OR_EQUAL(index, 0, ());
CHECK_LESS(index, results.size(), ());
CHECK_LESS(static_cast<size_t>(index), results.size(), ());
m_view->MoveViewportToResult(results[index]);
}
void MainModel::OnShowViewportClicked()
{
CHECK(m_selectedSample != kInvalidIndex, ());
CHECK_LESS(m_selectedSample, m_contexts.Size(), ());
CHECK_GREATER_OR_EQUAL(m_selectedSample, 0, ());
CHECK_LESS(static_cast<size_t>(m_selectedSample), m_contexts.Size(), ());
auto const & context = m_contexts[m_selectedSample];
m_view->MoveViewportToRect(context.m_sample.m_viewport);
@ -209,7 +210,8 @@ void MainModel::OnShowViewportClicked()
void MainModel::OnShowPositionClicked()
{
CHECK(m_selectedSample != kInvalidIndex, ());
CHECK_LESS(m_selectedSample, m_contexts.Size(), ());
CHECK_GREATER_OR_EQUAL(m_selectedSample, 0, ());
CHECK_LESS(static_cast<size_t>(m_selectedSample), m_contexts.Size(), ());
static int constexpr kViewportAroundTopResultsSizeM = 100;
static double constexpr kViewportAroundTopResultsScale = 1.2;
@ -258,7 +260,8 @@ bool MainModel::HasChanges() { return m_contexts.HasChanges(); }
bool MainModel::AlreadyInSamples(FeatureID const & id)
{
CHECK(m_selectedSample != kInvalidIndex, ());
CHECK(m_selectedSample < m_contexts.Size(), ());
CHECK_GREATER_OR_EQUAL(m_selectedSample, 0, ());
CHECK_LESS(static_cast<size_t>(m_selectedSample), m_contexts.Size(), ());
bool found = false;
ForAnyMatchingEntry(m_contexts[m_selectedSample], id, [&](Edits & edits, size_t index) {
@ -272,7 +275,8 @@ bool MainModel::AlreadyInSamples(FeatureID const & id)
void MainModel::AddNonFoundResult(FeatureID const & id)
{
CHECK(m_selectedSample != kInvalidIndex, ());
CHECK(m_selectedSample < m_contexts.Size(), ());
CHECK_GREATER_OR_EQUAL(m_selectedSample, 0, ());
CHECK_LESS(static_cast<size_t>(m_selectedSample), m_contexts.Size(), ());
auto & context = m_contexts[m_selectedSample];
@ -296,7 +300,9 @@ void MainModel::OnUpdate(View::ResultType type, size_t sampleIndex, Edits::Updat
{
using Type = Edits::Update::Type;
CHECK_LESS(sampleIndex, m_contexts.Size(), ());
CHECK_GREATER_OR_EQUAL(sampleIndex, 0, ());
CHECK_LESS(static_cast<size_t>(sampleIndex), m_contexts.Size(), ());
auto & context = m_contexts[sampleIndex];
if (update.m_type == Type::Add)
@ -395,7 +401,7 @@ void MainModel::ShowMarks(Context const & context)
void MainModel::OnChangeAllRelevancesClicked(Edits::Relevance relevance)
{
CHECK_GREATER_OR_EQUAL(m_selectedSample, 0, ());
CHECK_LESS(m_selectedSample, m_contexts.Size(), ());
CHECK_LESS(static_cast<size_t>(m_selectedSample), m_contexts.Size(), ());
auto & context = m_contexts[m_selectedSample];
context.m_foundResultsEdits.SetAllRelevances(relevance);

4
search/search_tests/keyword_matcher_test.cpp
View file

@ -260,7 +260,9 @@ string GetManyTokens(string tokenPrefix, int tokenCount, bool countForward = tru
UNIT_TEST(KeywordMatcher_QueryTooLong)
{
static_assert(kMaxNumTokens >= 2, "");
for (int queryLength = kMaxNumTokens - 2; queryLength <= kMaxNumTokens + 2; ++queryLength)
int const minLength = kMaxNumTokens - 2;
int const maxLength = kMaxNumTokens + 2;
for (int queryLength = minLength; queryLength <= maxLength; ++queryLength)
{
string const query = GetManyTokens("Q", queryLength);
string const queryWithPrefix = query + " Prefix";

6
storage/storage_defines.cpp
View file

@ -1,5 +1,7 @@
#include "storage/storage_defines.hpp"
#include "base/assert.hpp"
#include <sstream>
using namespace std;
@ -32,6 +34,7 @@ string DebugPrint(Status status)
case Status::EOutOfMemFailed:
return "OutOfMemFailed"s;
}
CHECK_SWITCH();
}
string DebugPrint(NodeStatus status)
@ -57,6 +60,7 @@ string DebugPrint(NodeStatus status)
case NodeStatus::Partly:
return "Partly"s;
}
CHECK_SWITCH();
}
string DebugPrint(NodeErrorCode status)
@ -72,6 +76,7 @@ string DebugPrint(NodeErrorCode status)
case NodeErrorCode::NoInetConnection:
return "NoInetConnection"s;
}
CHECK_SWITCH();
}
StatusAndError ParseStatus(Status innerStatus)
@ -99,6 +104,7 @@ StatusAndError ParseStatus(Status innerStatus)
case Status::EOutOfMemFailed:
return StatusAndError(NodeStatus::Error, NodeErrorCode::OutOfMemFailed);
}
CHECK_SWITCH();
}
string DebugPrint(StatusAndError statusAndError)

12
storage/storage_integration_tests/storage_http_tests.cpp
View file

@ -102,8 +102,10 @@ UNIT_CLASS_TEST(StorageHttpTest, StorageDownloadNodeAndDeleteNode)
NodeAttrs nodeAttrs;
m_storage.GetNodeAttrs(countryId, nodeAttrs);
TEST_EQUAL(mapSize.first, nodeAttrs.m_downloadingProgress.first, (countryId));
TEST_EQUAL(mapSize.second, nodeAttrs.m_downloadingProgress.second, (countryId));
TEST_EQUAL(static_cast<int64_t>(mapSize.first),
nodeAttrs.m_downloadingProgress.first, (countryId));
TEST_EQUAL(static_cast<int64_t>(mapSize.second),
nodeAttrs.m_downloadingProgress.second, (countryId));
TEST_EQUAL(countryId, kCountryId, (countryId));
};
@ -142,8 +144,10 @@ UNIT_CLASS_TEST(StorageHttpTest, StorageDownloadAndDeleteDisputedNode)
NodeAttrs nodeAttrs;
m_storage.GetNodeAttrs(countryId, nodeAttrs);
TEST_EQUAL(mapSize.first, nodeAttrs.m_downloadingProgress.first, (countryId));
TEST_EQUAL(mapSize.second, nodeAttrs.m_downloadingProgress.second, (countryId));
TEST_EQUAL(static_cast<int64_t>(mapSize.first),
nodeAttrs.m_downloadingProgress.first, (countryId));
TEST_EQUAL(static_cast<int64_t>(mapSize.second),
nodeAttrs.m_downloadingProgress.second, (countryId));
};
InitStorage(m_storage, UpdateWithoutChecks, progressFunction);

13
storage/storage_tests/storage_tests.cpp
View file

@ -337,12 +337,14 @@ protected:
LOG(LINFO, (m_countryFile, "downloading progress:", progress));
TEST_GREATER(progress.first, m_bytesDownloaded, (m_countryFile));
TEST_GREATER(progress.first, static_cast<
decltype(progress.first)>(m_bytesDownloaded), (m_countryFile));
m_bytesDownloaded = progress.first;
TEST_LESS_OR_EQUAL(m_bytesDownloaded, m_totalBytesToDownload, (m_countryFile));
TLocalAndRemoteSize localAndRemoteSize = m_storage.CountrySizeInBytes(m_countryId, m_files);
TEST_EQUAL(m_totalBytesToDownload, localAndRemoteSize.second, (m_countryFile));
TEST_EQUAL(static_cast<decltype(localAndRemoteSize.second)>(m_totalBytesToDownload),
localAndRemoteSize.second, (m_countryFile));
}
Storage & m_storage;
@ -1435,12 +1437,12 @@ UNIT_TEST(StorageTest_GetUpdateInfoSingleMwm)
storage.GetUpdateInfo("OutdatedCountry1", updateInfo);
TEST_EQUAL(updateInfo.m_numberOfMwmFilesToUpdate, 1, ());
TEST_EQUAL(updateInfo.m_totalUpdateSizeInBytes, 50, ());
TEST_EQUAL(updateInfo.m_sizeDifference, 50 - country1Size, ());
TEST_EQUAL(updateInfo.m_sizeDifference, 50 - static_cast<int64_t>(country1Size), ());
storage.GetUpdateInfo("OutdatedCountry2", updateInfo);
TEST_EQUAL(updateInfo.m_numberOfMwmFilesToUpdate, 1, ());
TEST_EQUAL(updateInfo.m_totalUpdateSizeInBytes, 1000, ());
TEST_EQUAL(updateInfo.m_sizeDifference, 1000 - country2Size, ());
TEST_EQUAL(updateInfo.m_sizeDifference, 1000 - static_cast<int64_t>(country2Size), ());
storage.GetUpdateInfo("Abkhazia", updateInfo);
TEST_EQUAL(updateInfo.m_numberOfMwmFilesToUpdate, 0, ());
@ -1457,7 +1459,8 @@ UNIT_TEST(StorageTest_GetUpdateInfoSingleMwm)
storage.GetUpdateInfo(storage.GetRootId(), updateInfo);
TEST_EQUAL(updateInfo.m_numberOfMwmFilesToUpdate, 2, ());
TEST_EQUAL(updateInfo.m_totalUpdateSizeInBytes, 1050, ());
TEST_EQUAL(updateInfo.m_sizeDifference, (1000 + 50) - (country1Size + country2Size), ());
TEST_EQUAL(updateInfo.m_sizeDifference,
(1000 + 50) - static_cast<int64_t>((country1Size + country2Size)), ());
}
#endif // defined(OMIM_OS_DESKTOP)

1
traffic/speed_groups.cpp
View file

@ -34,5 +34,6 @@ string DebugPrint(SpeedGroup const & group)
case SpeedGroup::Unknown: return "Unknown";
case SpeedGroup::Count: return "Count";
}
CHECK_SWITCH();
}
} // namespace traffic

Some files were not shown because too many files have changed in this diff Show more