diff --git a/src/SymbolTable.cc b/src/SymbolTable.cc index 94045162ae2fc4e8147163285caf0a085e6b7a2b..82dafe87ae0c7f53b9754fc6c63413447619c83a 100644 --- a/src/SymbolTable.cc +++ b/src/SymbolTable.cc @@ -437,8 +437,8 @@ SymbolTable::addLeadAuxiliaryVarInternal(bool endo, int index, expr_t expr_arg) exit(EXIT_FAILURE); } - aux_vars.emplace_back(symb_id, (endo ? AuxVarType::endoLead : AuxVarType::exoLead), 0, 0, 0, 0, - expr_arg, ""); + aux_vars.push_back(AuxVarInfo {symb_id, (endo ? AuxVarType::endoLead : AuxVarType::exoLead), 0, 0, + 0, 0, expr_arg, ""}); return symb_id; } @@ -461,8 +461,8 @@ SymbolTable::addLagAuxiliaryVarInternal(bool endo, int orig_symb_id, int orig_le exit(EXIT_FAILURE); } - aux_vars.emplace_back(symb_id, (endo ? AuxVarType::endoLag : AuxVarType::exoLag), orig_symb_id, - orig_lead_lag, 0, 0, expr_arg, ""); + aux_vars.push_back(AuxVarInfo {symb_id, (endo ? AuxVarType::endoLag : AuxVarType::exoLag), + orig_symb_id, orig_lead_lag, 0, 0, expr_arg, ""}); return symb_id; } @@ -511,7 +511,8 @@ SymbolTable::addExpectationAuxiliaryVar(int information_set, int index, exit(EXIT_FAILURE); } - aux_vars.emplace_back(symb_id, AuxVarType::expectation, 0, 0, 0, information_set, expr_arg, ""); + aux_vars.push_back( + AuxVarInfo {symb_id, AuxVarType::expectation, 0, 0, 0, information_set, expr_arg, ""}); return symb_id; } @@ -534,8 +535,8 @@ SymbolTable::addLogTransformAuxiliaryVar(int orig_symb_id, int orig_lead_lag, exit(EXIT_FAILURE); } - aux_vars.emplace_back(symb_id, AuxVarType::logTransform, orig_symb_id, orig_lead_lag, 0, 0, - expr_arg, ""); + aux_vars.push_back(AuxVarInfo {symb_id, AuxVarType::logTransform, orig_symb_id, orig_lead_lag, 0, + 0, expr_arg, ""}); return symb_id; } @@ -557,7 +558,8 @@ SymbolTable::addDiffLagAuxiliaryVar(int index, expr_t expr_arg, int orig_symb_id exit(EXIT_FAILURE); } - aux_vars.emplace_back(symb_id, AuxVarType::diffLag, orig_symb_id, orig_lag, 0, 0, expr_arg, ""); + aux_vars.push_back( + AuxVarInfo {symb_id, AuxVarType::diffLag, orig_symb_id, orig_lag, 0, 0, expr_arg, ""}); return symb_id; } @@ -579,7 +581,8 @@ SymbolTable::addDiffLeadAuxiliaryVar(int index, expr_t expr_arg, int orig_symb_i exit(EXIT_FAILURE); } - aux_vars.emplace_back(symb_id, AuxVarType::diffLead, orig_symb_id, orig_lead, 0, 0, expr_arg, ""); + aux_vars.push_back( + AuxVarInfo {symb_id, AuxVarType::diffLead, orig_symb_id, orig_lead, 0, 0, expr_arg, ""}); return symb_id; } @@ -601,7 +604,8 @@ SymbolTable::addDiffAuxiliaryVar(int index, expr_t expr_arg, const optional<int> exit(EXIT_FAILURE); } - aux_vars.emplace_back(symb_id, AuxVarType::diff, orig_symb_id, orig_lag, 0, 0, expr_arg, ""); + aux_vars.push_back( + AuxVarInfo {symb_id, AuxVarType::diff, orig_symb_id, orig_lag, 0, 0, expr_arg, ""}); return symb_id; } @@ -624,8 +628,8 @@ SymbolTable::addUnaryOpAuxiliaryVar(int index, expr_t expr_arg, string unary_op, exit(EXIT_FAILURE); } - aux_vars.emplace_back(symb_id, AuxVarType::unaryOp, orig_symb_id, orig_lag, 0, 0, expr_arg, - move(unary_op)); + aux_vars.push_back( + AuxVarInfo {symb_id, AuxVarType::unaryOp, orig_symb_id, orig_lag, 0, 0, expr_arg, unary_op}); return symb_id; } @@ -646,7 +650,7 @@ SymbolTable::addMultiplierAuxiliaryVar(int index) noexcept(false) exit(EXIT_FAILURE); } - aux_vars.emplace_back(symb_id, AuxVarType::multiplier, 0, 0, index, 0, nullptr, ""); + aux_vars.push_back(AuxVarInfo {symb_id, AuxVarType::multiplier, 0, 0, index, 0, nullptr, ""}); return symb_id; } @@ -667,8 +671,8 @@ SymbolTable::addDiffForwardAuxiliaryVar(int orig_symb_id, int orig_lead_lag, exit(EXIT_FAILURE); } - aux_vars.emplace_back(symb_id, AuxVarType::diffForward, orig_symb_id, orig_lead_lag, 0, 0, - expr_arg, ""); + aux_vars.push_back(AuxVarInfo {symb_id, AuxVarType::diffForward, orig_symb_id, orig_lead_lag, 0, + 0, expr_arg, ""}); return symb_id; } @@ -689,7 +693,7 @@ SymbolTable::addPacExpectationAuxiliaryVar(const string& name, expr_t expr_arg) exit(EXIT_FAILURE); } - aux_vars.emplace_back(symb_id, AuxVarType::pacExpectation, 0, 0, 0, 0, expr_arg, ""); + aux_vars.push_back(AuxVarInfo {symb_id, AuxVarType::pacExpectation, 0, 0, 0, 0, expr_arg, ""}); return symb_id; } @@ -710,7 +714,8 @@ SymbolTable::addPacTargetNonstationaryAuxiliaryVar(const string& name, expr_t ex exit(EXIT_FAILURE); } - aux_vars.emplace_back(symb_id, AuxVarType::pacTargetNonstationary, 0, 0, 0, 0, expr_arg, ""); + aux_vars.push_back( + AuxVarInfo {symb_id, AuxVarType::pacTargetNonstationary, 0, 0, 0, 0, expr_arg, ""}); return symb_id; }