amorfo77/inja
1
0
Fork 0
mirror of https://github.com/pantor/inja.git synced 2026-04-29 10:49:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Static cast to avoid VS140 C4244 warning (#119)

Browse Source
This commit is contained in:
Dodzey
2019-10-27 17:42:53 +00:00
committed by pantor
parent 258def7bf0
commit e7d5c5332d
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/inja/parser.hpp
View File

@@ -280,7 +280,7 @@ class Parser {
if (!parse_expression(tmpl)) return false;
// start a new if block on if stack
m_if_stack.emplace_back(tmpl.bytecodes.size());
m_if_stack.emplace_back(static_cast<decltype(m_if_stack)::value_type::jump_t>(tmpl.bytecodes.size()));
// conditional jump; destination will be filled in by else or endif
tmpl.bytecodes.emplace_back(Bytecode::Op::ConditionalJump);
@@ -530,10 +530,14 @@ class Parser {
const ParserStatic& m_static;
struct IfData {
unsigned int prev_cond_jump;
std::vector<unsigned int> uncond_jumps;
using jump_t = unsigned int;
jump_t prev_cond_jump;
std::vector<jump_t> uncond_jumps;
explicit IfData(unsigned int condJump): prev_cond_jump(condJump) {}
explicit IfData(jump_t condJump)
: prev_cond_jump(condJump)
{
}
};
std::vector<IfData> m_if_stack;

12
single_include/inja/inja.hpp
View File

@@ -2362,7 +2362,7 @@ class Parser {
if (!parse_expression(tmpl)) return false;
// start a new if block on if stack
m_if_stack.emplace_back(tmpl.bytecodes.size());
m_if_stack.emplace_back(static_cast<decltype(m_if_stack)::value_type::jump_t>(tmpl.bytecodes.size()));
// conditional jump; destination will be filled in by else or endif
tmpl.bytecodes.emplace_back(Bytecode::Op::ConditionalJump);
@@ -2612,10 +2612,14 @@ class Parser {
const ParserStatic& m_static;
struct IfData {
unsigned int prev_cond_jump;
std::vector<unsigned int> uncond_jumps;
using jump_t = unsigned int;
jump_t prev_cond_jump;
std::vector<jump_t> uncond_jumps;
explicit IfData(unsigned int condJump): prev_cond_jump(condJump) {}
explicit IfData(jump_t condJump)
: prev_cond_jump(condJump)
{
}
};
std::vector<IfData> m_if_stack;