From a7f8eaa336e7a79eb9e05291fa372977096e795c Mon Sep 17 00:00:00 2001
From: Houtan Bastani <houtan@dynare.org>
Date: Mon, 9 Jul 2018 11:53:29 +0200
Subject: [PATCH] remove warnings introduced in
244552393baec541e0d02a2c378a21a6c9409989
---
src/macro/MacroDriver.cc | 4 ++--
src/macro/MacroValue.cc | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/macro/MacroDriver.cc b/src/macro/MacroDriver.cc
index 70d92f1c..ed70e556 100644
--- a/src/macro/MacroDriver.cc
+++ b/src/macro/MacroDriver.cc
@@ -107,7 +107,7 @@ MacroDriver::replace_vars_in_str(const string &s) const
regex_search(macro, name, name_regex);
try
{
- const MacroValue *mv;
+ const MacroValue *mv = nullptr;
bool found_in_func_env = false;
for (unsigned i = func_env.size(); i-- > 0;)
{
@@ -162,7 +162,7 @@ MacroDriver::eval_string_function(const string &name, const MacroValue *args)
throw MacroValue::TypeError("You are using " + name + " as if it were a macro function");
vector<string *> func_args = fmv->get_args();
- if (func_args.size() != dynamic_cast<const IntMV *>(args->length())->get_int_value())
+ if (func_args.size() != (size_t)dynamic_cast<const IntMV *>(args->length())->get_int_value())
{
cerr << "Macroprocessor: The evaluation of: " << name << " could not be completed" << endl
<< "because the number of arguments provided is different than the number of" << endl
diff --git a/src/macro/MacroValue.cc b/src/macro/MacroValue.cc
index 4aef91e2..7817d07e 100644
--- a/src/macro/MacroValue.cc
+++ b/src/macro/MacroValue.cc
@@ -523,7 +523,7 @@ FuncMV::operator==(const MacroValue &mv) const noexcept(false)
return new IntMV(driver, 0);
if (args.size() == mv2->args.size())
- for (int i = 0; i < args.size(); i++)
+ for (size_t i = 0; i < args.size(); i++)
if (args[i] != mv2->args[i])
return new IntMV(driver, 0);
--
GitLab