From e2fbac15bc5f13caaf6dec8fb953f45293635c5c Mon Sep 17 00:00:00 2001
From: Michael Tautschnig <mt@debian.org>
Date: Mon, 13 Jun 2016 19:43:26 +0100
Subject: [PATCH] Avoid warnings and errors with selected compilers in jsil
 front-end

---
 src/jsil/jsil_typecheck.cpp | 6 +++---
 src/jsil/parser.y           | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/jsil/jsil_typecheck.cpp b/src/jsil/jsil_typecheck.cpp
index 5f19edf5358..999daefb77d 100644
--- a/src/jsil/jsil_typecheck.cpp
+++ b/src/jsil/jsil_typecheck.cpp
@@ -1155,9 +1155,9 @@ void jsil_typecheckt::typecheck_function_call(
         // if there are too few arguments, add undefined
         if(codet.parameters().size()>call.arguments().size())
         {
-          for(int i=call.arguments().size();
-                  i<codet.parameters().size();
-                  i++)
+          for(std::size_t i=call.arguments().size();
+              i<codet.parameters().size();
+              ++i)
             call.arguments().push_back(
               exprt("undefined", jsil_undefined_type()));
         }
diff --git a/src/jsil/parser.y b/src/jsil/parser.y
index 9581c944e9d..41aba1315ae 100644
--- a/src/jsil/parser.y
+++ b/src/jsil/parser.y
@@ -393,10 +393,10 @@ atom_expression: literal
                }
                | TOK_TYPEOF '(' expression ')'
                {
-                 exprt typeof(ID_typeof);
-                 typeof.move_to_operands(stack($3));
+                 exprt typeof_expr(ID_typeof);
+                 typeof_expr.move_to_operands(stack($3));
 
-                 newstack($$).swap(typeof);
+                 newstack($$).swap(typeof_expr);
                }
                ;