Various fixes for silencing errors and warnings under Clang 6
parent
bcdfb43fd3
commit
ac94ad906e
|
@ -1484,7 +1484,7 @@ public:
|
||||||
unsigned int det_exo_size_arg, unsigned int nb_col_det_exo_jacob_arg, unsigned int exo_size_arg, unsigned int nb_col_exo_jacob_arg, unsigned int other_endo_size_arg, unsigned int nb_col_other_endo_jacob_arg,
|
unsigned int det_exo_size_arg, unsigned int nb_col_det_exo_jacob_arg, unsigned int exo_size_arg, unsigned int nb_col_exo_jacob_arg, unsigned int other_endo_size_arg, unsigned int nb_col_other_endo_jacob_arg,
|
||||||
const vector<unsigned int> &det_exogenous_arg, const vector<unsigned int> &exogenous_arg, const vector<unsigned int> &other_endogenous_arg) :
|
const vector<unsigned int> &det_exogenous_arg, const vector<unsigned int> &exogenous_arg, const vector<unsigned int> &other_endogenous_arg) :
|
||||||
size{static_cast<int>(size_arg)},
|
size{static_cast<int>(size_arg)},
|
||||||
type{type_arg},
|
type{static_cast<uint8_t>(type_arg)},
|
||||||
variable{variable_arg.begin()+first_element, variable_arg.begin()+(first_element+block_size)},
|
variable{variable_arg.begin()+first_element, variable_arg.begin()+(first_element+block_size)},
|
||||||
equation{equation_arg.begin()+first_element, equation_arg.begin()+(first_element+block_size)},
|
equation{equation_arg.begin()+first_element, equation_arg.begin()+(first_element+block_size)},
|
||||||
other_endogenous{other_endogenous_arg},
|
other_endogenous{other_endogenous_arg},
|
||||||
|
@ -1509,7 +1509,7 @@ public:
|
||||||
const vector<int> &variable_arg, const vector<int> &equation_arg,
|
const vector<int> &variable_arg, const vector<int> &equation_arg,
|
||||||
bool is_linear_arg, int endo_nbr_arg, int Max_Lag_arg, int Max_Lead_arg, int &u_count_int_arg, int nb_col_jacob_arg) :
|
bool is_linear_arg, int endo_nbr_arg, int Max_Lag_arg, int Max_Lead_arg, int &u_count_int_arg, int nb_col_jacob_arg) :
|
||||||
size{static_cast<int>(size_arg)},
|
size{static_cast<int>(size_arg)},
|
||||||
type{type_arg},
|
type{static_cast<uint8_t>(type_arg)},
|
||||||
variable{variable_arg.begin()+first_element, variable_arg.begin()+(first_element+block_size)},
|
variable{variable_arg.begin()+first_element, variable_arg.begin()+(first_element+block_size)},
|
||||||
equation{equation_arg.begin()+first_element, equation_arg.begin()+(first_element+block_size)},
|
equation{equation_arg.begin()+first_element, equation_arg.begin()+(first_element+block_size)},
|
||||||
is_linear{is_linear_arg},
|
is_linear{is_linear_arg},
|
||||||
|
|
|
@ -39,7 +39,7 @@ DynamicModel::copyHelper(const DynamicModel &m)
|
||||||
for (const auto &it : m.static_only_equations)
|
for (const auto &it : m.static_only_equations)
|
||||||
static_only_equations.push_back(dynamic_cast<BinaryOpNode *>(f(it)));
|
static_only_equations.push_back(dynamic_cast<BinaryOpNode *>(f(it)));
|
||||||
|
|
||||||
auto convert_vector_tt = [this,f](vector<temporary_terms_t> vtt)
|
auto convert_vector_tt = [f](vector<temporary_terms_t> vtt)
|
||||||
{
|
{
|
||||||
vector<temporary_terms_t> vtt2;
|
vector<temporary_terms_t> vtt2;
|
||||||
for (const auto &tt : vtt)
|
for (const auto &tt : vtt)
|
||||||
|
@ -72,7 +72,7 @@ DynamicModel::copyHelper(const DynamicModel &m)
|
||||||
for (const auto &it : m.dynamic_jacobian)
|
for (const auto &it : m.dynamic_jacobian)
|
||||||
dynamic_jacobian[it.first] = f(it.second);
|
dynamic_jacobian[it.first] = f(it.second);
|
||||||
|
|
||||||
auto convert_derivative_t = [this,f](derivative_t dt)
|
auto convert_derivative_t = [f](derivative_t dt)
|
||||||
{
|
{
|
||||||
derivative_t dt2;
|
derivative_t dt2;
|
||||||
for (const auto &it : dt)
|
for (const auto &it : dt)
|
||||||
|
|
|
@ -27,6 +27,7 @@ using namespace std;
|
||||||
#include <deque>
|
#include <deque>
|
||||||
#include <map>
|
#include <map>
|
||||||
#include <ostream>
|
#include <ostream>
|
||||||
|
#include <array>
|
||||||
|
|
||||||
#include "DataTree.hh"
|
#include "DataTree.hh"
|
||||||
#include "ExtendedPreprocessorTypes.hh"
|
#include "ExtendedPreprocessorTypes.hh"
|
||||||
|
|
|
@ -35,7 +35,7 @@ StaticModel::copyHelper(const StaticModel &m)
|
||||||
{
|
{
|
||||||
auto f = [this](expr_t e) { return e->clone(*this); };
|
auto f = [this](expr_t e) { return e->clone(*this); };
|
||||||
|
|
||||||
auto convert_vector_tt = [this,f](vector<temporary_terms_t> vtt)
|
auto convert_vector_tt = [f](vector<temporary_terms_t> vtt)
|
||||||
{
|
{
|
||||||
vector<temporary_terms_t> vtt2;
|
vector<temporary_terms_t> vtt2;
|
||||||
for (const auto &tt : vtt)
|
for (const auto &tt : vtt)
|
||||||
|
@ -70,7 +70,7 @@ StaticModel::copyHelper(const StaticModel &m)
|
||||||
for (const auto &it : m.dynamic_jacobian)
|
for (const auto &it : m.dynamic_jacobian)
|
||||||
dynamic_jacobian[it.first] = f(it.second);
|
dynamic_jacobian[it.first] = f(it.second);
|
||||||
|
|
||||||
auto convert_derivative_t = [this,f](derivative_t dt)
|
auto convert_derivative_t = [f](derivative_t dt)
|
||||||
{
|
{
|
||||||
derivative_t dt2;
|
derivative_t dt2;
|
||||||
for (const auto &it : dt)
|
for (const auto &it : dt)
|
||||||
|
|
|
@ -41,6 +41,7 @@ using MacroValuePtr = shared_ptr<MacroValue>;
|
||||||
class MacroValue
|
class MacroValue
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
virtual ~MacroValue() = default;
|
||||||
//! Exception thrown when type error occurs in macro language
|
//! Exception thrown when type error occurs in macro language
|
||||||
class TypeError
|
class TypeError
|
||||||
{
|
{
|
||||||
|
@ -118,6 +119,7 @@ class IntMV : public MacroValue
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
explicit IntMV(int value_arg);
|
explicit IntMV(int value_arg);
|
||||||
|
virtual ~IntMV() = default;
|
||||||
|
|
||||||
//! Underlying integer value
|
//! Underlying integer value
|
||||||
const int value;
|
const int value;
|
||||||
|
@ -156,6 +158,7 @@ class StringMV : public MacroValue
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
explicit StringMV(string value_arg);
|
explicit StringMV(string value_arg);
|
||||||
|
virtual ~StringMV() = default;
|
||||||
//! Underlying string value
|
//! Underlying string value
|
||||||
const string value;
|
const string value;
|
||||||
|
|
||||||
|
@ -175,6 +178,7 @@ class FuncMV : public MacroValue
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
FuncMV(vector<string> args, string body_arg);
|
FuncMV(vector<string> args, string body_arg);
|
||||||
|
virtual ~FuncMV() = default;
|
||||||
//! Function args & body
|
//! Function args & body
|
||||||
const vector<string> args;
|
const vector<string> args;
|
||||||
const string body;
|
const string body;
|
||||||
|
@ -189,6 +193,7 @@ class ArrayMV : public MacroValue
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
explicit ArrayMV(vector<MacroValuePtr> values_arg);
|
explicit ArrayMV(vector<MacroValuePtr> values_arg);
|
||||||
|
virtual ~ArrayMV() = default;
|
||||||
|
|
||||||
//! Underlying vector
|
//! Underlying vector
|
||||||
const vector<MacroValuePtr> values;
|
const vector<MacroValuePtr> values;
|
||||||
|
@ -230,6 +235,7 @@ class TupleMV : public MacroValue
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
explicit TupleMV(vector<MacroValuePtr> values_arg);
|
explicit TupleMV(vector<MacroValuePtr> values_arg);
|
||||||
|
virtual ~TupleMV() = default;
|
||||||
|
|
||||||
//! Underlying vector
|
//! Underlying vector
|
||||||
const vector<MacroValuePtr> values;
|
const vector<MacroValuePtr> values;
|
||||||
|
|
Loading…
Reference in New Issue