diff options
73 files changed, 106 insertions, 104 deletions
diff --git a/base/assert.hpp b/base/assert.hpp index 1ab2939bc9..3f43a9690b 100644 --- a/base/assert.hpp +++ b/base/assert.hpp @@ -99,9 +99,11 @@ AssertFailedFn SetAssertFunction(AssertFailedFn fn); #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 statement")); \ - std::abort(); \ -} while(false) +// The macro that causes this warning to be ignored: +// "control reaches end of non-void function". +#define UNREACHABLE() \ + do \ + { \ + CHECK(false, ("Unreachable statement.")); \ + std::abort(); \ + } while (false) diff --git a/base/base_tests/levenshtein_dfa_test.cpp b/base/base_tests/levenshtein_dfa_test.cpp index 112d1e2228..0560d4f535 100644 --- a/base/base_tests/levenshtein_dfa_test.cpp +++ b/base/base_tests/levenshtein_dfa_test.cpp @@ -42,7 +42,7 @@ string DebugPrint(Status status) case Status::Rejects: return "Rejects"; case Status::Intermediate: return "Intermediate"; } - CHECK_SWITCH(); + UNREACHABLE(); } string DebugPrint(Result const & result) diff --git a/base/geo_object_id.cpp b/base/geo_object_id.cpp index adaf312449..63c7c40731 100644 --- a/base/geo_object_id.cpp +++ b/base/geo_object_id.cpp @@ -49,7 +49,7 @@ GeoObjectId::Type GeoObjectId::GetType() const case 0x80: return GeoObjectId::Type::ObsoleteOsmWay; case 0xC0: return GeoObjectId::Type::ObsoleteOsmRelation; } - CHECK_SWITCH(); + UNREACHABLE(); } GeoObjectId MakeOsmNode(uint64_t id) @@ -88,7 +88,7 @@ std::string DebugPrint(GeoObjectId::Type const & t) case GeoObjectId::Type::ObsoleteOsmWay: return "Osm Way"; case GeoObjectId::Type::ObsoleteOsmRelation: return "Osm Relation"; } - CHECK_SWITCH(); + UNREACHABLE(); } std::string DebugPrint(GeoObjectId const & id) diff --git a/coding/compressed_bit_vector.cpp b/coding/compressed_bit_vector.cpp index 45b00abdcb..33762975aa 100644 --- a/coding/compressed_bit_vector.cpp +++ b/coding/compressed_bit_vector.cpp @@ -461,7 +461,7 @@ string DebugPrint(CompressedBitVector::StorageStrategy strat) case CompressedBitVector::StorageStrategy::Dense: return "Dense"; case CompressedBitVector::StorageStrategy::Sparse: return "Sparse"; } - CHECK_SWITCH(); + UNREACHABLE(); } // static diff --git a/coding/zlib.cpp b/coding/zlib.cpp index 9b156cd629..0184cb97d8 100644 --- a/coding/zlib.cpp +++ b/coding/zlib.cpp @@ -19,7 +19,7 @@ int ToInt(ZLib::Deflate::Level level) case Level::BestCompression: return Z_BEST_COMPRESSION; case Level::DefaultCompression: return Z_DEFAULT_COMPRESSION; } - CHECK_SWITCH(); + UNREACHABLE(); } } // namespace diff --git a/descriptions/serdes.hpp b/descriptions/serdes.hpp index e05e38e713..2a8bb1e523 100644 --- a/descriptions/serdes.hpp +++ b/descriptions/serdes.hpp @@ -168,7 +168,7 @@ public: { case Version::V0: return DeserializeV0(*subReader, featureIndex, langPriority, description); } - CHECK_SWITCH(); + UNREACHABLE(); return false; } diff --git a/drape/hw_texture.cpp b/drape/hw_texture.cpp index b230a5fb20..f4a98b4322 100644 --- a/drape/hw_texture.cpp +++ b/drape/hw_texture.cpp @@ -64,7 +64,7 @@ void UnpackFormat(ref_ptr<dp::GraphicsContext> context, TextureFormat format, CHECK(false, ()); return; } - CHECK_SWITCH(); + UNREACHABLE(); } glConst DecodeTextureFilter(TextureFilter filter) @@ -74,7 +74,7 @@ glConst DecodeTextureFilter(TextureFilter filter) case TextureFilter::Linear: return gl_const::GLLinear; case TextureFilter::Nearest: return gl_const::GLNearest; } - CHECK_SWITCH(); + UNREACHABLE(); } glConst DecodeTextureWrapping(TextureWrapping wrapping) @@ -84,7 +84,7 @@ glConst DecodeTextureWrapping(TextureWrapping wrapping) case TextureWrapping::ClampToEdge: return gl_const::GLClampToEdge; case TextureWrapping::Repeat: return gl_const::GLRepeat; } - CHECK_SWITCH(); + UNREACHABLE(); } HWTexture::~HWTexture() diff --git a/editor/edits_migration.cpp b/editor/edits_migration.cpp index d04738efe7..fb1911888a 100644 --- a/editor/edits_migration.cpp +++ b/editor/edits_migration.cpp @@ -117,6 +117,6 @@ FeatureID MigrateFeatureIndex(osm::Editor::ForEachFeaturesNearByFn & forEach, case XMLFeature::Type::Relation: return MigrateWayOrRelatonFeatureIndex(forEach, xml, featureStatus, generateID); } - CHECK_SWITCH(); + UNREACHABLE(); } } // namespace editor diff --git a/editor/xml_feature.cpp b/editor/xml_feature.cpp index 849505ae3d..58e7c5a36e 100644 --- a/editor/xml_feature.cpp +++ b/editor/xml_feature.cpp @@ -365,7 +365,7 @@ string XMLFeature::TypeToString(Type type) case Type::Way: return kWayType; case Type::Relation: return kRelationType; } - CHECK_SWITCH(); + UNREACHABLE(); } // static diff --git a/generator/emitter_factory.hpp b/generator/emitter_factory.hpp index e972fca3ba..3b07f8033c 100644 --- a/generator/emitter_factory.hpp +++ b/generator/emitter_factory.hpp @@ -33,6 +33,6 @@ std::shared_ptr<EmitterInterface> CreateEmitter(EmitterType type, Args&&... args case EmitterType::Restaurants: return create<EmitterRestaurants>(std::forward<Args>(args)...); } - CHECK_SWITCH(); + UNREACHABLE(); } } // namespace generator diff --git a/generator/intermediate_data.cpp b/generator/intermediate_data.cpp index 4114cfbf57..b4dac2e01b 100644 --- a/generator/intermediate_data.cpp +++ b/generator/intermediate_data.cpp @@ -407,7 +407,7 @@ CreatePointStorageReader(feature::GenerateInfo::NodeStorageType type, string con case feature::GenerateInfo::NodeStorageType::Memory: return make_shared<RawMemPointStorageReader>(name); } - CHECK_SWITCH(); + UNREACHABLE(); } shared_ptr<PointStorageWriterInterface> @@ -422,7 +422,7 @@ CreatePointStorageWriter(feature::GenerateInfo::NodeStorageType type, string con case feature::GenerateInfo::NodeStorageType::Memory: return make_shared<RawMemPointStorageWriter>(name); } - CHECK_SWITCH(); + UNREACHABLE(); } } // namespace cache } // namespace generator diff --git a/generator/maxspeeds_parser.cpp b/generator/maxspeeds_parser.cpp index ecbcd582a2..b8dd678967 100644 --- a/generator/maxspeeds_parser.cpp +++ b/generator/maxspeeds_parser.cpp @@ -214,7 +214,7 @@ string UnitsToString(Units units) case Units::Metric: return "Metric"; case Units::Imperial: return "Imperial"; } - CHECK_SWITCH(); + UNREACHABLE(); } Units StringToUnits(string const & units) diff --git a/generator/osm_element.cpp b/generator/osm_element.cpp index 8f7470c897..1af4ba8134 100644 --- a/generator/osm_element.cpp +++ b/generator/osm_element.cpp @@ -28,7 +28,7 @@ std::string DebugPrint(OsmElement::EntityType e) case OsmElement::EntityType::Member: return "member"; } - CHECK_SWITCH(); + UNREACHABLE(); } diff --git a/generator/translator_factory.hpp b/generator/translator_factory.hpp index 9c0f13619c..fb5049e06e 100644 --- a/generator/translator_factory.hpp +++ b/generator/translator_factory.hpp @@ -32,6 +32,6 @@ std::shared_ptr<TranslatorInterface> CreateTranslator(TranslatorType type, Args& case TranslatorType::GeoObjects: return create<TranslatorGeoObjects>(std::forward<Args>(args)...); } - CHECK_SWITCH(); + UNREACHABLE(); } } // namespace generator diff --git a/geocoder/geocoder.cpp b/geocoder/geocoder.cpp index f5df358702..98698d0b9d 100644 --- a/geocoder/geocoder.cpp +++ b/geocoder/geocoder.cpp @@ -35,7 +35,7 @@ double GetWeight(geocoder::Type t) case geocoder::Type::Building: return 0.1; case geocoder::Type::Count: return 0.0; } - CHECK_SWITCH(); + UNREACHABLE(); } // todo(@m) This is taken from search/geocoder.hpp. Refactor. diff --git a/geocoder/types.cpp b/geocoder/types.cpp index 52b6024467..89602e418e 100644 --- a/geocoder/types.cpp +++ b/geocoder/types.cpp @@ -20,7 +20,7 @@ string ToString(Type type) case Type::Building: return "building"; case Type::Count: return "count"; } - CHECK_SWITCH(); + UNREACHABLE(); } string DebugPrint(Type type) diff --git a/geometry/line2d.cpp b/geometry/line2d.cpp index d0074d37b2..e11ce3bf04 100644 --- a/geometry/line2d.cpp +++ b/geometry/line2d.cpp @@ -61,7 +61,7 @@ string DebugPrint(LineIntersector::Result::Type type) case Type::One: return "One"; case Type::Infinity: return "Infinity"; } - CHECK_SWITCH(); + UNREACHABLE(); } string DebugPrint(LineIntersector::Result const & result) diff --git a/indexer/feature_decl.cpp b/indexer/feature_decl.cpp index cf0762a71f..a1fc055371 100644 --- a/indexer/feature_decl.cpp +++ b/indexer/feature_decl.cpp @@ -21,7 +21,7 @@ string DebugPrint(feature::EGeomType type) case EGeomType::GEOM_LINE: return "GEOM_LINE"; case EGeomType::GEOM_AREA: return "GEOM_AREA"; } - CHECK_SWITCH(); + UNREACHABLE(); } // static diff --git a/indexer/ftraits.hpp b/indexer/ftraits.hpp index 5fcc471c7d..8b0acfd26d 100644 --- a/indexer/ftraits.hpp +++ b/indexer/ftraits.hpp @@ -207,7 +207,7 @@ inline std::string DebugPrint(WheelchairAvailability wheelchair) case WheelchairAvailability::Yes: return "Yes"; case WheelchairAvailability::Limited: return "Limited"; } - CHECK_SWITCH(); + UNREACHABLE(); } class Wheelchair : public TraitsBase<Wheelchair, WheelchairAvailability> diff --git a/indexer/ftypes_matcher.cpp b/indexer/ftypes_matcher.cpp index cc3206b5df..e15649da25 100644 --- a/indexer/ftypes_matcher.cpp +++ b/indexer/ftypes_matcher.cpp @@ -371,7 +371,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(); + UNREACHABLE(); } IsWifiChecker::IsWifiChecker() diff --git a/indexer/mwm_set.cpp b/indexer/mwm_set.cpp index 8cdb0c77c1..c1130ee50e 100644 --- a/indexer/mwm_set.cpp +++ b/indexer/mwm_set.cpp @@ -452,7 +452,7 @@ string DebugPrint(MwmSet::RegResult result) case MwmSet::RegResult::UnsupportedFileFormat: return "UnsupportedFileFormat"; } - CHECK_SWITCH(); + UNREACHABLE(); } string DebugPrint(MwmSet::Event::Type type) diff --git a/indexer/postcodes_matcher.cpp b/indexer/postcodes_matcher.cpp index 1cb630bad0..6be3e46fad 100644 --- a/indexer/postcodes_matcher.cpp +++ b/indexer/postcodes_matcher.cpp @@ -67,7 +67,7 @@ public: case TStringSet::Status::Prefix: return isPrefix; case TStringSet::Status::Full: return true; } - CHECK_SWITCH(); + UNREACHABLE(); } inline size_t GetMaxNumTokensInPostcode() const { return m_maxNumTokensInPostcode; } diff --git a/kml/serdes.cpp b/kml/serdes.cpp index a1bfa5a54c..d8c1e5b0a8 100644 --- a/kml/serdes.cpp +++ b/kml/serdes.cpp @@ -122,7 +122,7 @@ std::string GetStyleForPredefinedColor(PredefinedColor color) case PredefinedColor::Count: return {}; } - CHECK_SWITCH(); + UNREACHABLE(); } BookmarkIcon GetIcon(std::string const & iconName) diff --git a/kml/types.hpp b/kml/types.hpp index 73807d319c..484e27c6db 100644 --- a/kml/types.hpp +++ b/kml/types.hpp @@ -44,7 +44,7 @@ inline std::string DebugPrint(PredefinedColor color) case PredefinedColor::Orange: return "Orange"; case PredefinedColor::Count: return {}; } - CHECK_SWITCH(); + UNREACHABLE(); } enum class AccessRules : uint8_t @@ -70,7 +70,7 @@ inline std::string DebugPrint(AccessRules accessRules) case AccessRules::Public: return "Public"; case AccessRules::Count: return {}; } - CHECK_SWITCH(); + UNREACHABLE(); } enum class BookmarkIcon : uint16_t @@ -127,7 +127,7 @@ inline std::string DebugPrint(BookmarkIcon icon) case BookmarkIcon::Water: return "Water"; case BookmarkIcon::Count: return {}; } - CHECK_SWITCH(); + UNREACHABLE(); } struct ColorData diff --git a/map/booking_filter_cache.cpp b/map/booking_filter_cache.cpp index 4a8c7aacd5..ad6719ac7d 100644 --- a/map/booking_filter_cache.cpp +++ b/map/booking_filter_cache.cpp @@ -106,7 +106,7 @@ std::string DebugPrint(Cache::HotelStatus status) case Cache::HotelStatus::Unavailable: return "Unavailable"; case Cache::HotelStatus::Available: return "Available"; } - CHECK_SWITCH(); + UNREACHABLE(); } } // namespace availability } // namespace filter diff --git a/map/bookmark.cpp b/map/bookmark.cpp index 7ee04a538c..acfa9bc632 100644 --- a/map/bookmark.cpp +++ b/map/bookmark.cpp @@ -36,7 +36,7 @@ std::string GetBookmarkIconType(kml::BookmarkIcon const & icon) ASSERT(false, ("Invalid bookmark icon type")); return {}; } - CHECK_SWITCH(); + UNREACHABLE(); } } // namespace @@ -106,7 +106,7 @@ df::ColorConstant Bookmark::GetColorConstant() const case kml::PredefinedColor::Count: return "BookmarkRed"; } - CHECK_SWITCH(); + UNREACHABLE(); } bool Bookmark::HasCreationAnimation() const diff --git a/map/bookmark_helpers.hpp b/map/bookmark_helpers.hpp index 425161c9ae..0e2c6c022b 100644 --- a/map/bookmark_helpers.hpp +++ b/map/bookmark_helpers.hpp @@ -28,7 +28,7 @@ inline std::string DebugPrint(KmlFileType fileType) case KmlFileType::Text: return "Text"; case KmlFileType::Binary: return "Binary"; } - CHECK_SWITCH(); + UNREACHABLE(); } std::unique_ptr<kml::FileData> LoadKmlFile(std::string const & file, KmlFileType fileType); diff --git a/map/bookmark_manager.cpp b/map/bookmark_manager.cpp index 47bc8b93b5..769b66b42e 100644 --- a/map/bookmark_manager.cpp +++ b/map/bookmark_manager.cpp @@ -99,7 +99,7 @@ bool IsValidFilterType(BookmarkManager::CategoryFilterType const filter, case BookmarkManager::CategoryFilterType::Public: return fromCatalog; case BookmarkManager::CategoryFilterType::Private: return !fromCatalog; } - CHECK_SWITCH(); + UNREACHABLE(); } class FindMarkFunctor diff --git a/map/chart_generator.cpp b/map/chart_generator.cpp index 8ce9675f6d..6ade1637f4 100644 --- a/map/chart_generator.cpp +++ b/map/chart_generator.cpp @@ -63,7 +63,7 @@ agg::rgba8 GetLineColor(MapStyle mapStyle) case MapStyleMerged: return agg::rgba8(30, 150, 240, 255); } - CHECK_SWITCH(); + UNREACHABLE(); } agg::rgba8 GetCurveColor(MapStyle mapStyle) @@ -81,7 +81,7 @@ agg::rgba8 GetCurveColor(MapStyle mapStyle) case MapStyleMerged: return agg::rgba8(30, 150, 240, 20); } - CHECK_SWITCH(); + UNREACHABLE(); } } // namespace diff --git a/map/cloud.cpp b/map/cloud.cpp index b56fb84817..c01f98b0ee 100644 --- a/map/cloud.cpp +++ b/map/cloud.cpp @@ -127,7 +127,7 @@ bool CanUpload(uint64_t totalUploadingSize) return platform::GetCurrentNetworkPolicy().CanUse() && totalUploadingSize <= kMaxWwanUploadingSizeInBytes; } - CHECK_SWITCH(); + UNREACHABLE(); } struct SnapshotCreateRequestData diff --git a/map/cloud.hpp b/map/cloud.hpp index 52a5ccf446..a3fb2bb88b 100644 --- a/map/cloud.hpp +++ b/map/cloud.hpp @@ -391,7 +391,7 @@ inline std::string DebugPrint(Cloud::SynchronizationType type) case Cloud::SynchronizationType::Backup: return "Backup"; case Cloud::SynchronizationType::Restore: return "Restore"; } - CHECK_SWITCH(); + UNREACHABLE(); } inline std::string DebugPrint(Cloud::SynchronizationResult result) @@ -405,7 +405,7 @@ inline std::string DebugPrint(Cloud::SynchronizationResult result) case Cloud::SynchronizationResult::UserInterrupted: return "UserInterrupted"; case Cloud::SynchronizationResult::InvalidCall: return "InvalidCall"; } - CHECK_SWITCH(); + UNREACHABLE(); } inline std::string DebugPrint(Cloud::RestoringRequestResult result) @@ -416,5 +416,5 @@ inline std::string DebugPrint(Cloud::RestoringRequestResult result) case Cloud::RestoringRequestResult::NoBackup: return "NoBackup"; case Cloud::RestoringRequestResult::NotEnoughDiskSpace: return "NotEnoughDiskSpace"; } - CHECK_SWITCH(); + UNREACHABLE(); } diff --git a/map/discovery/discovery_manager.cpp b/map/discovery/discovery_manager.cpp index 6ffc76124f..ba99e8109c 100644 --- a/map/discovery/discovery_manager.cpp +++ b/map/discovery/discovery_manager.cpp @@ -19,7 +19,7 @@ std::string GetQuery(discovery::ItemType const type) case discovery::ItemType::Viator: ASSERT(false, ()); return ""; } - CHECK_SWITCH(); + UNREACHABLE(); } } // namespace diff --git a/map/mwm_url.cpp b/map/mwm_url.cpp index 258f00829a..7258f10537 100644 --- a/map/mwm_url.cpp +++ b/map/mwm_url.cpp @@ -285,7 +285,7 @@ ParsedMapApi::ParsingResult ParsedMapApi::Parse(Uri const & uri) return ParsingResult::Catalogue; } } - CHECK_SWITCH(); + UNREACHABLE(); } bool ParsedMapApi::RouteKeyValue(string const & key, string const & value, vector<string> & pattern) diff --git a/map/osm_opening_hours.hpp b/map/osm_opening_hours.hpp index 800954e8a3..fb2809595f 100644 --- a/map/osm_opening_hours.hpp +++ b/map/osm_opening_hours.hpp @@ -31,7 +31,7 @@ inline std::string DebugPrint(EPlaceState state) case EPlaceState::CloseSoon: return "EPlaceState::CloseSoon"; } - CHECK_SWITCH(); + UNREACHABLE(); } inline EPlaceState PlaceStateCheck(std::string const & openingHours, time_t timestamp) diff --git a/map/purchase.cpp b/map/purchase.cpp index bf4aa4d0b3..0668a9e2e1 100644 --- a/map/purchase.cpp +++ b/map/purchase.cpp @@ -140,7 +140,7 @@ bool Purchase::IsSubscriptionActive(SubscriptionType type) const { case SubscriptionType::RemoveAds: return m_removeAdsSubscriptionData.m_isActive; } - CHECK_SWITCH(); + UNREACHABLE(); } void Purchase::SetSubscriptionEnabled(SubscriptionType type, bool isEnabled) diff --git a/map/routing_manager.cpp b/map/routing_manager.cpp index f51fff052b..5bfdb153b9 100644 --- a/map/routing_manager.cpp +++ b/map/routing_manager.cpp @@ -205,7 +205,7 @@ VehicleType GetVehicleType(RouterType routerType) case RouterType::Transit: return VehicleType::Transit; case RouterType::Count: CHECK(false, ("Invalid type", routerType)); return VehicleType::Count; } - CHECK_SWITCH(); + UNREACHABLE(); } } // namespace diff --git a/map/routing_mark.cpp b/map/routing_mark.cpp index 9e245a77c9..6bd0252b21 100644 --- a/map/routing_mark.cpp +++ b/map/routing_mark.cpp @@ -115,7 +115,7 @@ uint16_t RouteMarkPoint::GetPriority() const } } } - CHECK_SWITCH(); + UNREACHABLE(); } uint32_t RouteMarkPoint::GetIndex() const @@ -126,7 +126,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(); + UNREACHABLE(); } void RouteMarkPoint::SetMarkData(RouteMarkData && data) diff --git a/map/user.cpp b/map/user.cpp index f541cf07c2..89becd999e 100644 --- a/map/user.cpp +++ b/map/user.cpp @@ -83,7 +83,7 @@ std::string AuthenticationUrl(std::string const & socialToken, return ss.str(); } } - CHECK_SWITCH(); + UNREACHABLE(); } std::string UserDetailsUrl() diff --git a/map/user_mark.cpp b/map/user_mark.cpp index cd077ea8ce..475710c893 100644 --- a/map/user_mark.cpp +++ b/map/user_mark.cpp @@ -101,5 +101,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(); + UNREACHABLE(); } diff --git a/partners_api/banner.hpp b/partners_api/banner.hpp index 653da797bb..e9be2768e1 100644 --- a/partners_api/banner.hpp +++ b/partners_api/banner.hpp @@ -40,6 +40,6 @@ inline std::string DebugPrint(Banner::Type type) case Banner::Type::Mopub: return "Mopub"; case Banner::Type::Google: return "Google"; } - CHECK_SWITCH(); + UNREACHABLE(); } } // namespace ads diff --git a/partners_api/taxi_places_loader.cpp b/partners_api/taxi_places_loader.cpp index f51d7bedc0..19ac52643f 100644 --- a/partners_api/taxi_places_loader.cpp +++ b/partners_api/taxi_places_loader.cpp @@ -56,7 +56,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(); + UNREACHABLE(); } } // namespace places } // namespace taxi diff --git a/partners_api/taxi_provider.hpp b/partners_api/taxi_provider.hpp index c2333ef4df..2a9c63fec5 100644 --- a/partners_api/taxi_provider.hpp +++ b/partners_api/taxi_provider.hpp @@ -84,7 +84,7 @@ inline std::string DebugPrint(Provider::Type type) case Provider::Type::Rutaxi: return "Rutaxi"; case Provider::Type::Count: ASSERT(false, ()); return ""; } - CHECK_SWITCH(); + UNREACHABLE(); } inline std::string DebugPrint(ErrorCode code) @@ -94,7 +94,7 @@ inline std::string DebugPrint(ErrorCode code) case ErrorCode::NoProducts: return "NoProducts"; case ErrorCode::RemoteError: return "RemoteError"; } - CHECK_SWITCH(); + UNREACHABLE(); } inline std::string DebugPrint(ProviderError error) diff --git a/platform/country_defines.cpp b/platform/country_defines.cpp index 1533887524..fa14841629 100644 --- a/platform/country_defines.cpp +++ b/platform/country_defines.cpp @@ -38,5 +38,5 @@ string DebugPrint(MapOptions options) case MapOptions::Diff: return "Diff"; } - CHECK_SWITCH(); + UNREACHABLE(); } diff --git a/platform/http_request.cpp b/platform/http_request.cpp index f1895c05f1..f2dece1621 100644 --- a/platform/http_request.cpp +++ b/platform/http_request.cpp @@ -417,6 +417,6 @@ string DebugPrint(HttpRequest::Status status) case HttpRequest::Status::FileNotFound: return "File not found"; } - CHECK_SWITCH(); + UNREACHABLE(); } } // namespace downloader diff --git a/platform/local_country_file_utils.cpp b/platform/local_country_file_utils.cpp index a7d11b8104..282c4c656e 100644 --- a/platform/local_country_file_utils.cpp +++ b/platform/local_country_file_utils.cpp @@ -467,6 +467,6 @@ string DebugPrint(CountryIndexes::Index index) case CountryIndexes::Index::Offsets: return "Offsets"; } - CHECK_SWITCH(); + UNREACHABLE(); } } // namespace platform diff --git a/platform/measurement_utils.cpp b/platform/measurement_utils.cpp index 60b0d7d8c4..04357c6731 100644 --- a/platform/measurement_utils.cpp +++ b/platform/measurement_utils.cpp @@ -59,7 +59,7 @@ double ToSpeedKmPH(double speed, measurement_utils::Units units) case Units::Imperial: return MphToKmph(speed); case Units::Metric: return speed; } - CHECK_SWITCH(); + UNREACHABLE(); } bool FormatDistance(double m, string & res) @@ -73,7 +73,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(); + UNREACHABLE(); } @@ -220,7 +220,7 @@ string FormatSpeedUnits(Units units) case Units::Imperial: return "mph"; case Units::Metric: return "km/h"; } - CHECK_SWITCH(); + UNREACHABLE(); } bool OSMDistanceToMeters(string const & osmRawValue, double & outMeters) diff --git a/platform/measurement_utils.hpp b/platform/measurement_utils.hpp index 96c2f50910..f085d7b650 100644 --- a/platform/measurement_utils.hpp +++ b/platform/measurement_utils.hpp @@ -21,7 +21,7 @@ inline std::string DebugPrint(Units units) case Units::Imperial: return "Units::Imperial"; case Units::Metric: return "Units::Metric"; } - CHECK_SWITCH(); + UNREACHABLE(); } inline double MetersToMiles(double m) { return m * 0.000621371192; } diff --git a/platform/mwm_traits.cpp b/platform/mwm_traits.cpp index 708664d419..9d982e30fb 100644 --- a/platform/mwm_traits.cpp +++ b/platform/mwm_traits.cpp @@ -46,7 +46,7 @@ string DebugPrint(MwmTraits::SearchIndexFormat format) case MwmTraits::SearchIndexFormat::CompressedBitVector: return "CompressedBitVector"; } - CHECK_SWITCH(); + UNREACHABLE(); } string DebugPrint(MwmTraits::HouseToStreetTableFormat format) @@ -58,6 +58,6 @@ string DebugPrint(MwmTraits::HouseToStreetTableFormat format) case MwmTraits::HouseToStreetTableFormat::Unknown: return "Unknown"; } - CHECK_SWITCH(); + UNREACHABLE(); } } // namespace version diff --git a/platform/platform.cpp b/platform/platform.cpp index e9123c4d19..d3b5a58fcb 100644 --- a/platform/platform.cpp +++ b/platform/platform.cpp @@ -335,7 +335,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(); + UNREACHABLE(); } string DebugPrint(Platform::ChargingStatus status) @@ -346,5 +346,5 @@ string DebugPrint(Platform::ChargingStatus status) case Platform::ChargingStatus::Plugged: return "Plugged"; case Platform::ChargingStatus::Unplugged: return "Unplugged"; } - CHECK_SWITCH(); + UNREACHABLE(); } diff --git a/platform/settings.cpp b/platform/settings.cpp index f26b39d2e4..d7ad3c95a5 100644 --- a/platform/settings.cpp +++ b/platform/settings.cpp @@ -280,7 +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(); + UNREACHABLE(); } template <> @@ -337,7 +337,7 @@ string ToString<Transliteration::Mode>(Transliteration::Mode const & mode) case Transliteration::Mode::Enabled: return "Enabled"; case Transliteration::Mode::Disabled: return "Disabled"; } - CHECK_SWITCH(); + UNREACHABLE(); } template <> diff --git a/routing/cross_mwm_connector.cpp b/routing/cross_mwm_connector.cpp index 575c3467c8..dcf89f73de 100644 --- a/routing/cross_mwm_connector.cpp +++ b/routing/cross_mwm_connector.cpp @@ -13,7 +13,7 @@ std::string DebugPrint(WeightsLoadState state) case WeightsLoadState::NotExists: return "NotExists"; case WeightsLoadState::Loaded: return "Loaded"; } - CHECK_SWITCH(); + UNREACHABLE(); } } // namespace connector } // namespace routing diff --git a/routing/cross_mwm_connector.hpp b/routing/cross_mwm_connector.hpp index deeeef2d6f..0ba23a282e 100644 --- a/routing/cross_mwm_connector.hpp +++ b/routing/cross_mwm_connector.hpp @@ -180,7 +180,7 @@ public: case connector::WeightsLoadState::NotExists: case connector::WeightsLoadState::Loaded: return true; } - CHECK_SWITCH(); + UNREACHABLE(); } template <typename CalcWeight> diff --git a/routing/edge_estimator.cpp b/routing/edge_estimator.cpp index 823f3e7068..386570dd73 100644 --- a/routing/edge_estimator.cpp +++ b/routing/edge_estimator.cpp @@ -245,7 +245,7 @@ shared_ptr<EdgeEstimator> EdgeEstimator::Create(VehicleType vehicleType, double CHECK(false, ("Can't create EdgeEstimator for", vehicleType)); return nullptr; } - CHECK_SWITCH(); + UNREACHABLE(); } // static diff --git a/routing/index_router.cpp b/routing/index_router.cpp index f6b7d78240..621d440d81 100644 --- a/routing/index_router.cpp +++ b/routing/index_router.cpp @@ -98,7 +98,7 @@ shared_ptr<VehicleModelFactoryInterface> CreateVehicleModelFactory( CHECK(false, ("Can't create VehicleModelFactoryInterface for", vehicleType)); return nullptr; } - CHECK_SWITCH(); + UNREACHABLE(); } unique_ptr<IDirectionsEngine> CreateDirectionsEngine(VehicleType vehicleType, @@ -117,7 +117,7 @@ unique_ptr<IDirectionsEngine> CreateDirectionsEngine(VehicleType vehicleType, CHECK(false, ("Can't create DirectionsEngine for", vehicleType)); return nullptr; } - CHECK_SWITCH(); + UNREACHABLE(); } shared_ptr<TrafficStash> CreateTrafficStash(VehicleType vehicleType, shared_ptr<NumMwmIds> numMwmIds, diff --git a/routing/index_router.hpp b/routing/index_router.hpp index 64af3ad631..c51b6c69a0 100644 --- a/routing/index_router.hpp +++ b/routing/index_router.hpp @@ -128,7 +128,7 @@ private: case AStarAlgorithm<Graph>::Result::Cancelled: return RouterResultCode::Cancelled; case AStarAlgorithm<Graph>::Result::OK: return RouterResultCode::NoError; } - CHECK_SWITCH(); + UNREACHABLE(); } template <typename Graph> diff --git a/routing/road_graph.cpp b/routing/road_graph.cpp index bffb6a8e25..65a40dd773 100644 --- a/routing/road_graph.cpp +++ b/routing/road_graph.cpp @@ -314,7 +314,7 @@ string DebugPrint(IRoadGraph::Mode mode) case IRoadGraph::Mode::ObeyOnewayTag: return "ObeyOnewayTag"; case IRoadGraph::Mode::IgnoreOnewayTag: return "IgnoreOnewayTag"; } - CHECK_SWITCH(); + UNREACHABLE(); } IRoadGraph::RoadInfo MakeRoadInfoForTesting(bool bidirectional, double speedKMPH, diff --git a/routing/routing_quality/mapbox/api.cpp b/routing/routing_quality/mapbox/api.cpp index dba14ae6e3..841ecbbc62 100644 --- a/routing/routing_quality/mapbox/api.cpp +++ b/routing/routing_quality/mapbox/api.cpp @@ -40,7 +40,7 @@ string VehicleTypeToMapboxType(routing::VehicleType type) return ""s; } - CHECK_SWITCH(); + UNREACHABLE(); } string LatLonsToString(vector<ms::LatLon> const & coords) diff --git a/routing/routing_session.cpp b/routing/routing_session.cpp index 0486b19f8d..34011444d7 100644 --- a/routing/routing_session.cpp +++ b/routing/routing_session.cpp @@ -841,6 +841,6 @@ string DebugPrint(RoutingSession::State state) case RoutingSession::RouteNoFollowing: return "RouteNoFollowing"; case RoutingSession::RouteRebuilding: return "RouteRebuilding"; } - CHECK_SWITCH(); + UNREACHABLE(); } } // namespace routing diff --git a/routing/routing_settings.cpp b/routing/routing_settings.cpp index 21ec9c656b..134c44868f 100644 --- a/routing/routing_settings.cpp +++ b/routing/routing_settings.cpp @@ -40,6 +40,6 @@ RoutingSettings GetRoutingSettings(VehicleType vehicleType) // TODO (@gmoryes) make m_speedCameraWarningEnabled to true after tests ok. Now it can be on with: // TODO (@gmoryes) typing "?speedcams" in search panel. } - CHECK_SWITCH(); + UNREACHABLE(); } } // namespace routing diff --git a/routing/transit_info.hpp b/routing/transit_info.hpp index 766b7bc3b3..b499b8dbcf 100644 --- a/routing/transit_info.hpp +++ b/routing/transit_info.hpp @@ -149,6 +149,6 @@ inline std::string DebugPrint(TransitInfo::Type type) case TransitInfo::Type::Edge: return "Edge"; case TransitInfo::Type::Transfer: return "Transfer"; } - CHECK_SWITCH(); + UNREACHABLE(); } } // namespace routing diff --git a/routing/vehicle_mask.cpp b/routing/vehicle_mask.cpp index d0f685deaf..91bf39594b 100644 --- a/routing/vehicle_mask.cpp +++ b/routing/vehicle_mask.cpp @@ -19,7 +19,7 @@ string DebugPrint(VehicleType vehicleType) case VehicleType::Transit: return "Transit"; case VehicleType::Count: return "Count"; } - CHECK_SWITCH(); + UNREACHABLE(); } string ToString(VehicleType vehicleType) { return DebugPrint(vehicleType); } diff --git a/search/geocoder.cpp b/search/geocoder.cpp index e32fa6dfee..2bfb071a63 100644 --- a/search/geocoder.cpp +++ b/search/geocoder.cpp @@ -1437,7 +1437,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(); + UNREACHABLE(); } bool Geocoder::GetTypeInGeocoding(BaseContext const & ctx, uint32_t featureId, Model::Type & type) diff --git a/search/geocoder_context.cpp b/search/geocoder_context.cpp index efca03df32..cd2aaec133 100644 --- a/search/geocoder_context.cpp +++ b/search/geocoder_context.cpp @@ -24,7 +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(); + UNREACHABLE(); } // static @@ -36,7 +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(); + UNREACHABLE(); } size_t BaseContext::SkipUsedTokens(size_t curToken) const @@ -99,6 +99,6 @@ string DebugPrint(BaseContext::TokenType type) case BaseContext::TOKEN_TYPE_POSTCODE: return "POSTCODE"; case BaseContext::TOKEN_TYPE_COUNT: return "COUNT"; } - CHECK_SWITCH(); + UNREACHABLE(); } } // namespace search diff --git a/search/geocoder_locality.cpp b/search/geocoder_locality.cpp index f92b233223..a1920e9f21 100644 --- a/search/geocoder_locality.cpp +++ b/search/geocoder_locality.cpp @@ -13,7 +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(); + UNREACHABLE(); } std::string DebugPrint(Locality const & locality) diff --git a/search/house_numbers_matcher.cpp b/search/house_numbers_matcher.cpp index 8ade89e197..2c5dc75e1e 100644 --- a/search/house_numbers_matcher.cpp +++ b/search/house_numbers_matcher.cpp @@ -166,7 +166,7 @@ public: case TStrings::Status::Prefix: return isPrefix; case TStrings::Status::Full: return true; } - CHECK_SWITCH(); + UNREACHABLE(); } private: @@ -237,7 +237,7 @@ public: case TPatterns::Status::Prefix: return true; case TPatterns::Status::Full: return true; } - CHECK_SWITCH(); + UNREACHABLE(); } private: @@ -252,7 +252,7 @@ private: case 'U': return Token::TYPE_BUILDING_PART_OR_LETTER; default: CHECK(false, ("Unexpected character:", c)); return Token::TYPE_SEPARATOR; } - CHECK_SWITCH(); + UNREACHABLE(); } static Token::Type TokenToType(Token const & token) { return token.m_type; } diff --git a/search/mwm_context.cpp b/search/mwm_context.cpp index 76544b7560..6ad7e0d57f 100644 --- a/search/mwm_context.cpp +++ b/search/mwm_context.cpp @@ -38,7 +38,7 @@ bool MwmContext::GetFeature(uint32_t index, FeatureType & ft) const ft.SetID(FeatureID(GetId(), index)); return true; } - CHECK_SWITCH(); + UNREACHABLE(); } bool MwmContext::GetOriginalFeature(uint32_t index, FeatureType & ft) const diff --git a/search/nested_rects_cache.cpp b/search/nested_rects_cache.cpp index bb8e64edc0..4ebc5b3253 100644 --- a/search/nested_rects_cache.cpp +++ b/search/nested_rects_cache.cpp @@ -82,7 +82,7 @@ double NestedRectsCache::GetRadiusMeters(RectScale scale) case RECT_SCALE_LARGE: return 2500.0; case RECT_SCALE_COUNT: return 5000.0; } - CHECK_SWITCH(); + UNREACHABLE(); } void NestedRectsCache::Update() diff --git a/search/ranker.cpp b/search/ranker.cpp index 6e4ea87bd6..fe6b5e2999 100644 --- a/search/ranker.cpp +++ b/search/ranker.cpp @@ -158,7 +158,7 @@ ftypes::Type GetLocalityIndex(feature::TypesHolder const & types) case VILLAGE: return NONE; case LOCALITY_COUNT: return type; } - CHECK_SWITCH(); + UNREACHABLE(); } // TODO: Format street and house number according to local country's rules. @@ -460,7 +460,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(); + UNREACHABLE(); }; auto res = mk(rankerResult); diff --git a/search/retrieval.cpp b/search/retrieval.cpp index 5dc0d818ee..f1eabff838 100644 --- a/search/retrieval.cpp +++ b/search/retrieval.cpp @@ -372,6 +372,6 @@ unique_ptr<coding::CompressedBitVector> Retrieval::Retrieve(Args &&... args) con return r(*m_root1, m_context, m_cancellable, forward<Args>(args)...); } } - CHECK_SWITCH(); + UNREACHABLE(); } } // namespace search diff --git a/storage/storage_defines.cpp b/storage/storage_defines.cpp index 186e67e96e..5ef0e11b89 100644 --- a/storage/storage_defines.cpp +++ b/storage/storage_defines.cpp @@ -34,7 +34,7 @@ string DebugPrint(Status status) case Status::EOutOfMemFailed: return "OutOfMemFailed"s; } - CHECK_SWITCH(); + UNREACHABLE(); } string DebugPrint(NodeStatus status) @@ -60,7 +60,7 @@ string DebugPrint(NodeStatus status) case NodeStatus::Partly: return "Partly"s; } - CHECK_SWITCH(); + UNREACHABLE(); } string DebugPrint(NodeErrorCode status) @@ -76,7 +76,7 @@ string DebugPrint(NodeErrorCode status) case NodeErrorCode::NoInetConnection: return "NoInetConnection"s; } - CHECK_SWITCH(); + UNREACHABLE(); } StatusAndError ParseStatus(Status innerStatus) @@ -104,7 +104,7 @@ StatusAndError ParseStatus(Status innerStatus) case Status::EOutOfMemFailed: return StatusAndError(NodeStatus::Error, NodeErrorCode::OutOfMemFailed); } - CHECK_SWITCH(); + UNREACHABLE(); } string DebugPrint(StatusAndError statusAndError) diff --git a/track_analyzing/track_analyzer/cmd_table.cpp b/track_analyzing/track_analyzer/cmd_table.cpp index 8b62257304..05f28147fc 100644 --- a/track_analyzing/track_analyzer/cmd_table.cpp +++ b/track_analyzing/track_analyzer/cmd_table.cpp @@ -69,7 +69,7 @@ bool DayTimeToBool(DayTimeType type) return false; } - CHECK_SWITCH(); + UNREACHABLE(); } class CarModelTypes final diff --git a/traffic/speed_groups.cpp b/traffic/speed_groups.cpp index 2083c696b3..64d3d1cf1b 100644 --- a/traffic/speed_groups.cpp +++ b/traffic/speed_groups.cpp @@ -34,6 +34,6 @@ string DebugPrint(SpeedGroup const & group) case SpeedGroup::Unknown: return "Unknown"; case SpeedGroup::Count: return "Count"; } - CHECK_SWITCH(); + UNREACHABLE(); } } // namespace traffic diff --git a/ugc/storage.hpp b/ugc/storage.hpp index bda776f2fc..a578e25e4b 100644 --- a/ugc/storage.hpp +++ b/ugc/storage.hpp @@ -70,7 +70,7 @@ inline std::string DebugPrint(Storage::SettingResult const & result) case Storage::SettingResult::InvalidUGC: return "Invalid UGC"; case Storage::SettingResult::WritingError: return "Writing Error"; } - CHECK_SWITCH(); + UNREACHABLE(); } } // namespace ugc |