diff options
| author | Maksim Andrianov <maksimandrianov1@gmail.com> | 2018-08-10 16:41:13 +0300 |
|---|---|---|
| committer | Vlad Mihaylenko <vxmihaylenko@gmail.com> | 2018-08-10 17:02:50 +0300 |
| commit | 1d48f20bcb96893777c423f4bec19bd4e3faf6f7 (patch) | |
| tree | 689e368698ff8297250e4a85b118998407e77d23 | |
| parent | 6556e6ef4a514b64711cd0c36bec0b1106bab91d (diff) | |
Fixed build(removed const), fixed warnings
| -rw-r--r-- | drape/hw_texture.cpp | 4 | ||||
| -rw-r--r-- | drape/render_state.cpp | 2 | ||||
| -rw-r--r-- | feature_list/feature_list.cpp | 2 | ||||
| -rw-r--r-- | generator/relation_tags.hpp | 2 | ||||
| -rw-r--r-- | generator/translator_interface.hpp | 2 | ||||
| -rw-r--r-- | generator/translator_planet.hpp | 2 | ||||
| -rw-r--r-- | generator/translator_region.hpp | 4 |
7 files changed, 9 insertions, 9 deletions
diff --git a/drape/hw_texture.cpp b/drape/hw_texture.cpp index c39007e709..edd858eae8 100644 --- a/drape/hw_texture.cpp +++ b/drape/hw_texture.cpp @@ -53,7 +53,7 @@ glConst DecodeTextureFilter(TextureFilter filter) case TextureFilter::Linear: return gl_const::GLLinear; case TextureFilter::Nearest: return gl_const::GLNearest; } - ASSERT(false, ()); + CHECK_SWITCH(); } glConst DecodeTextureWrapping(TextureWrapping wrapping) @@ -63,7 +63,7 @@ glConst DecodeTextureWrapping(TextureWrapping wrapping) case TextureWrapping::ClampToEdge: return gl_const::GLClampToEdge; case TextureWrapping::Repeat: return gl_const::GLRepeat; } - ASSERT(false, ()); + CHECK_SWITCH(); } HWTexture::~HWTexture() diff --git a/drape/render_state.cpp b/drape/render_state.cpp index 2a1063e148..ca55f3a95f 100644 --- a/drape/render_state.cpp +++ b/drape/render_state.cpp @@ -20,7 +20,7 @@ glConst DecodeDepthFunction(DepthFunction depthFunction) case DepthFunction::GreatOrEqual: return gl_const::GLGreatOrEqual; case DepthFunction::Always: return gl_const::GLAlways; } - ASSERT(false, ()); + CHECK_SWITCH(); } } // namespace diff --git a/feature_list/feature_list.cpp b/feature_list/feature_list.cpp index fcf3e005d5..00d60dba45 100644 --- a/feature_list/feature_list.cpp +++ b/feature_list/feature_list.cpp @@ -224,7 +224,7 @@ public: name = primary; if (name.empty()) name = operatr; - string const osmId = osmIt != ft2osm.cend() ? std::to_string(osmIt->second.GetEncodedId()) : ""; + string osmId = osmIt != ft2osm.cend() ? std::to_string(osmIt->second.GetEncodedId()) : ""; if (osmId.empty()) { // For sponsored types, adding invented sponsored ids (booking = 00) to the id tail. diff --git a/generator/relation_tags.hpp b/generator/relation_tags.hpp index 58e1b37d9e..d9469367c4 100644 --- a/generator/relation_tags.hpp +++ b/generator/relation_tags.hpp @@ -11,7 +11,7 @@ #include <string> #include <utility> -class OsmElement; +struct OsmElement; namespace generator { diff --git a/generator/translator_interface.hpp b/generator/translator_interface.hpp index ef1aae89be..15e8ec9166 100644 --- a/generator/translator_interface.hpp +++ b/generator/translator_interface.hpp @@ -1,6 +1,6 @@ #pragma once -class OsmElement; +struct OsmElement; namespace generator { diff --git a/generator/translator_planet.hpp b/generator/translator_planet.hpp index f1baf4db69..ca6e6b2037 100644 --- a/generator/translator_planet.hpp +++ b/generator/translator_planet.hpp @@ -13,7 +13,7 @@ #include <functional> #include <memory> -class OsmElement; +struct OsmElement; class FeatureBuilder1; namespace feature { diff --git a/generator/translator_region.hpp b/generator/translator_region.hpp index 9f1bc86914..dca9860855 100644 --- a/generator/translator_region.hpp +++ b/generator/translator_region.hpp @@ -6,11 +6,11 @@ #include <memory> -class OsmElement; +struct OsmElement; class FeatureBuilder1; namespace feature { -class GenerateInfo; +struct GenerateInfo; } // namespace feature namespace generator |