commit e7d5c5332d543f0fcc2218979ff7fc41952449b6
author Dodzey <Dodzey@users.noreply.github.com> Sun Oct 27 17:42:53 2019 +0000
committer pantor <1885260+pantor@users.noreply.github.com> Sun Oct 27 18:42:53 2019 +0100
tree 80d7bc774e3fe2aa02ffd4c38b224747ff7cd55b
parent 258def7bf0c61413780e582e8177b5f5f094b05b

Static cast to avoid VS140 C4244 warning (#119)

include/inja/parser.hpp

diff --git a/include/inja/parser.hpp b/include/inja/parser.hpp
index 461f693..bbddd30 100644
--- a/include/inja/parser.hpp
+++ b/include/inja/parser.hpp
@@ -280,7 +280,7 @@
       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 @@
   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;

single_include/inja/inja.hpp

diff --git a/single_include/inja/inja.hpp b/single_include/inja/inja.hpp
index cd77c2c..beb284e 100644
--- a/single_include/inja/inja.hpp
+++ b/single_include/inja/inja.hpp
@@ -2362,7 +2362,7 @@
       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 @@
   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;