diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2017-09-28 10:38:02 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2017-09-28 17:20:46 +0000 |
| commit | 7354dc67737fdeb105656f5cec055da627bb9c29 (patch) | |
| tree | 7cc2b5f975d5e32eb94cd1344b259ea1b24018d6 /sql/sp_pcontext.h | |
| parent | 509928718d52a14739fcfb2ebf0e68b4c8e01be5 (diff) | |
| download | mariadb-git-7354dc67737fdeb105656f5cec055da627bb9c29.tar.gz | |
MDEV-13384 - misc Windows warnings fixed
Diffstat (limited to 'sql/sp_pcontext.h')
| -rw-r--r-- | sql/sp_pcontext.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sp_pcontext.h b/sql/sp_pcontext.h index 2a080536b8a..d4d532340fb 100644 --- a/sql/sp_pcontext.h +++ b/sql/sp_pcontext.h @@ -323,11 +323,11 @@ public: /// @return the current number of variables used in the parent contexts /// (from the root), including this context. uint current_var_count() const - { return m_var_offset + m_vars.elements(); } + { return m_var_offset + (uint)m_vars.elements(); } /// @return the number of variables in this context alone. uint context_var_count() const - { return m_vars.elements(); } + { return (uint)m_vars.elements(); } /// @return map index in this parsing context to runtime offset. uint var_context2runtime(uint i) const @@ -476,10 +476,10 @@ public: const LEX_STRING *find_cursor(uint offset) const; uint max_cursor_index() const - { return m_max_cursor_index + m_cursors.elements(); } + { return m_max_cursor_index + (uint)m_cursors.elements(); } uint current_cursor_count() const - { return m_cursor_offset + m_cursors.elements(); } + { return m_cursor_offset + (uint)m_cursors.elements(); } private: /// Constructor for a tree node. |