diff options
author | ExMix <rahuba.youri@mapswithme.com> | 2013-05-29 17:05:25 +0400 |
---|---|---|
committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 01:55:30 +0300 |
commit | 8aca19fddb8891a137a1e25240f2692aacc6942c (patch) | |
tree | 819cbea6eb9ac319d26a3ce77bb447e76608ce8f /graphics | |
parent | f5201375f926cbad7d01b67140696655098e453f (diff) |
compile warning fix
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/overlay_element.cpp | 4 | ||||
-rw-r--r-- | graphics/vertex_decl.cpp | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/graphics/overlay_element.cpp b/graphics/overlay_element.cpp index 2594f2d62c..d10552e66b 100644 --- a/graphics/overlay_element.cpp +++ b/graphics/overlay_element.cpp @@ -24,8 +24,8 @@ namespace graphics m_isDirtyRect(true), m_isDirtyLayout(true), m_isDirtyRoughRect(true), - m_userInfo(p.m_userInfo), - m_inverseMatrix(math::Identity<double, 3>()) + m_inverseMatrix(math::Identity<double, 3>()), + m_userInfo(p.m_userInfo) {} m2::PointD const OverlayElement::computeTopLeft(m2::PointD const & sz, diff --git a/graphics/vertex_decl.cpp b/graphics/vertex_decl.cpp index 5179aa6072..ccbf83e2c9 100644 --- a/graphics/vertex_decl.cpp +++ b/graphics/vertex_decl.cpp @@ -1,5 +1,6 @@ #include "vertex_decl.hpp" #include "defines.hpp" +#include "../base/assert.hpp" #include "../base/logging.hpp" namespace graphics @@ -76,6 +77,8 @@ namespace graphics case EFloat: FillPosition<float>::fill(va, &vs->m_fNormal, v, stride); break; + default: + ASSERT(false, ("Not supported")); } } }; @@ -108,6 +111,8 @@ namespace graphics case EFloat: FillTexCoord<float>::fill(va, &vs->m_fTex, v, stride); break; + default: + ASSERT(false, ("Not supported")); }; } }; |