Commit f8cc3ae3 authored by Sébastien Villemot's avatar Sébastien Villemot

Port to C++11 using keyword

Performed using modernize-use-using from clang-tidy.

https://clang.llvm.org/extra/clang-tidy/checks/modernize-use-using.html
parent bf891b7d
...@@ -241,7 +241,7 @@ public: ...@@ -241,7 +241,7 @@ public:
BinaryOpcode code; BinaryOpcode code;
expr_t expression; expr_t expression;
}; };
typedef vector<Constraint> constraints_t; using constraints_t = vector<Constraint>;
private: private:
const SymbolTable &symbol_table; const SymbolTable &symbol_table;
const constraints_t constraints; const constraints_t constraints;
...@@ -830,7 +830,7 @@ public: ...@@ -830,7 +830,7 @@ public:
expr_t value; expr_t value;
}; };
typedef vector< svar_identification_restriction > svar_identification_restrictions_t; using svar_identification_restrictions_t = vector<svar_identification_restriction>;
private: private:
const svar_identification_restrictions_t restrictions; const svar_identification_restrictions_t restrictions;
const bool upper_cholesky_present; const bool upper_cholesky_present;
......
...@@ -105,7 +105,7 @@ protected: ...@@ -105,7 +105,7 @@ protected:
//! Internal implementation of ParamUsedWithLeadLag() //! Internal implementation of ParamUsedWithLeadLag()
bool ParamUsedWithLeadLagInternal() const; bool ParamUsedWithLeadLagInternal() const;
private: private:
typedef list<expr_t> node_list_t; using node_list_t = list<expr_t>;
//! The list of nodes //! The list of nodes
node_list_t node_list; node_list_t node_list;
//! A counter for filling ExprNode's idx field //! A counter for filling ExprNode's idx field
......
...@@ -201,7 +201,7 @@ private: ...@@ -201,7 +201,7 @@ private:
vector<derivative_t> derivative_endo, derivative_other_endo, derivative_exo, derivative_exo_det; vector<derivative_t> derivative_endo, derivative_other_endo, derivative_exo, derivative_exo_det;
//!List for each block and for each lag-lead all the other endogenous variables and exogenous variables //!List for each block and for each lag-lead all the other endogenous variables and exogenous variables
typedef set<int> var_t; using var_t = set<int>;
typedef map<int, var_t> lag_var_t; typedef map<int, var_t> lag_var_t;
vector<lag_var_t> other_endo_block, exo_block, exo_det_block; vector<lag_var_t> other_endo_block, exo_block, exo_det_block;
......
...@@ -39,7 +39,7 @@ class UnaryOpNode; ...@@ -39,7 +39,7 @@ class UnaryOpNode;
class BinaryOpNode; class BinaryOpNode;
class PacExpectationNode; class PacExpectationNode;
typedef class ExprNode *expr_t; using expr_t = class ExprNode *;
struct ExprNodeLess; struct ExprNodeLess;
...@@ -51,7 +51,7 @@ typedef set<expr_t, ExprNodeLess> temporary_terms_t; ...@@ -51,7 +51,7 @@ typedef set<expr_t, ExprNodeLess> temporary_terms_t;
typedef map<expr_t, int> temporary_terms_idxs_t; typedef map<expr_t, int> temporary_terms_idxs_t;
//! set of temporary terms used in a block //! set of temporary terms used in a block
typedef set<int> temporary_terms_inuse_t; using temporary_terms_inuse_t = set<int>;
typedef map<int, int> map_idx_t; typedef map<int, int> map_idx_t;
......
...@@ -36,7 +36,7 @@ namespace MFS ...@@ -36,7 +36,7 @@ namespace MFS
property<vertex_out_degree_t, int > > > > > VertexProperty_t; property<vertex_out_degree_t, int > > > > > VertexProperty_t;
typedef adjacency_list<listS, listS, bidirectionalS, VertexProperty_t> AdjacencyList_t; typedef adjacency_list<listS, listS, bidirectionalS, VertexProperty_t> AdjacencyList_t;
typedef map<graph_traits<AdjacencyList_t>::vertex_descriptor, default_color_type> color_t; typedef map<graph_traits<AdjacencyList_t>::vertex_descriptor, default_color_type> color_t;
typedef vector<AdjacencyList_t::vertex_descriptor> vector_vertex_descriptor_t; using vector_vertex_descriptor_t = vector<AdjacencyList_t::vertex_descriptor>;
//! Eliminate a vertex i //! Eliminate a vertex i
/*! For a vertex i replace all edges e_k_i and e_i_j by a shorcut e_k_j and then Suppress the vertex i*/ /*! For a vertex i replace all edges e_k_i and e_i_j by a shorcut e_k_j and then Suppress the vertex i*/
......
...@@ -44,7 +44,7 @@ typedef vector<pair< pair< BlockSimulationType, int>, pair<int, int> > > block_t ...@@ -44,7 +44,7 @@ typedef vector<pair< pair< BlockSimulationType, int>, pair<int, int> > > block_t
typedef vector< pair<pair<int, int>, pair< int, expr_t > > > block_derivatives_equation_variable_laglead_nodeid_t; typedef vector< pair<pair<int, int>, pair< int, expr_t > > > block_derivatives_equation_variable_laglead_nodeid_t;
//! for all blocks derivatives description //! for all blocks derivatives description
typedef vector<block_derivatives_equation_variable_laglead_nodeid_t> blocks_derivatives_t; using blocks_derivatives_t = vector<block_derivatives_equation_variable_laglead_nodeid_t>;
//! Shared code for static and dynamic models //! Shared code for static and dynamic models
class ModelTree : public DataTree class ModelTree : public DataTree
......
...@@ -114,7 +114,7 @@ public: ...@@ -114,7 +114,7 @@ public:
string lags; string lags;
string lower_bound, upper_bound; string lower_bound, upper_bound;
}; };
typedef vector<Constraint> constraints_t; using constraints_t = vector<Constraint>;
private: private:
constraints_t constraints; constraints_t constraints;
const SymbolTable &symbol_table; const SymbolTable &symbol_table;
...@@ -134,7 +134,7 @@ public: ...@@ -134,7 +134,7 @@ public:
int exo; int exo;
string periods, lower_bound, upper_bound; string periods, lower_bound, upper_bound;
}; };
typedef vector<Constraint> constraints_t; using constraints_t = vector<Constraint>;
private: private:
constraints_t constraints; constraints_t constraints;
const SymbolTable &symbol_table; const SymbolTable &symbol_table;
...@@ -155,7 +155,7 @@ public: ...@@ -155,7 +155,7 @@ public:
string name; string name;
vector<string> list; vector<string> list;
}; };
typedef vector<Group> group_t; using group_t = vector<Group>;
private: private:
group_t shock_groups; group_t shock_groups;
vector<string> group_names; vector<string> group_names;
......
...@@ -37,9 +37,9 @@ public: ...@@ -37,9 +37,9 @@ public:
eUpper = 1 //!< Upper triangular matrix eUpper = 1 //!< Upper triangular matrix
}; };
//! Type of a matrix row //! Type of a matrix row
typedef vector<expr_t> row_t; using row_t = vector<expr_t>;
//! Type of a complete matrix //! Type of a complete matrix
typedef vector<row_t> matrix_t; using matrix_t = vector<row_t>;
//! An exception indicating that a matrix is neither upper triangular nor lower triangular //! An exception indicating that a matrix is neither upper triangular nor lower triangular
class MatrixFormException class MatrixFormException
......
...@@ -129,7 +129,7 @@ protected: ...@@ -129,7 +129,7 @@ protected:
vector<derivative_t> derivative_endo, derivative_other_endo, derivative_exo, derivative_exo_det; vector<derivative_t> derivative_endo, derivative_other_endo, derivative_exo, derivative_exo_det;
//!List for each block and for each lag-leag all the other endogenous variables and exogenous variables //!List for each block and for each lag-leag all the other endogenous variables and exogenous variables
typedef set<int> var_t; using var_t = set<int>;
typedef map<int, var_t> lag_var_t; typedef map<int, var_t> lag_var_t;
vector<lag_var_t> other_endo_block, exo_block, exo_det_block; vector<lag_var_t> other_endo_block, exo_block, exo_det_block;
......
...@@ -32,7 +32,7 @@ using namespace std; ...@@ -32,7 +32,7 @@ using namespace std;
#include "CodeInterpreter.hh" #include "CodeInterpreter.hh"
#include "ExprNode.hh" #include "ExprNode.hh"
typedef class ExprNode *expr_t; using expr_t = class ExprNode *;
//! Types of auxiliary variables //! Types of auxiliary variables
enum aux_var_t enum aux_var_t
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment