diff --git a/src/SymbolTable.cc b/src/SymbolTable.cc index 1357838407d4edd9bca454c6eb88a576602ac49e..69b3eac2a62e95e95e6c0b7b7d0e33a298788726 100644 --- a/src/SymbolTable.cc +++ b/src/SymbolTable.cc @@ -512,7 +512,7 @@ SymbolTable::addExpectationAuxiliaryVar(int information_set, int index, exit(EXIT_FAILURE); } - aux_var_info = AuxVarInfo(symb_id, AuxVarType::expectation, 0, 0, 0, information_set, expr_arg, ""); + AuxVarInfo aux_var_info = {symb_id, AuxVarType::expectation, 0, 0, 0, information_set, expr_arg, ""}; aux_vars.emplace_back(aux_var_info); return symb_id; @@ -536,9 +536,8 @@ SymbolTable::addLogTransformAuxiliaryVar(int orig_symb_id, int orig_lead_lag, exit(EXIT_FAILURE); } - aux_var_info = AuxVarInfo(symb_id, AuxVarType::logTransform, orig_symb_id, orig_lead_lag, 0, 0, - expr_arg, ""); - aux_vars.push_back(aux_var_info); + AuxVarInfo aux_var_info = {symb_id, AuxVarType::logTransform, orig_symb_id, orig_lead_lag, 0, 0, expr_arg, ""}; + aux_vars.emplace_back(aux_var_info); return symb_id; } @@ -560,8 +559,8 @@ SymbolTable::addDiffLagAuxiliaryVar(int index, expr_t expr_arg, int orig_symb_id exit(EXIT_FAILURE); } - aux_var_info = AuxVarInfo(symb_id, AuxVarType::diffLag, orig_symb_id, orig_lag, 0, 0, expr_arg, ""); - aux_vars.push_back(aux_var_info); + AuxVarInfo aux_var_info = {symb_id, AuxVarType::diffLag, orig_symb_id, orig_lag, 0, 0, expr_arg, ""}; + aux_vars.emplace_back(aux_var_info); return symb_id; } @@ -583,8 +582,8 @@ SymbolTable::addDiffLeadAuxiliaryVar(int index, expr_t expr_arg, int orig_symb_i exit(EXIT_FAILURE); } - aux_var_info = AuxVarInfo(symb_id, AuxVarType::diffLead, orig_symb_id, orig_lead, 0, 0, expr_arg, ""); - aux_vars.push_back(aux_var_info); + AuxVarInfo aux_var_info = {symb_id, AuxVarType::diffLead, orig_symb_id, orig_lead, 0, 0, expr_arg, ""}; + aux_vars.emplace_back(aux_var_info); return symb_id; } @@ -651,8 +650,8 @@ SymbolTable::addMultiplierAuxiliaryVar(int index) noexcept(false) exit(EXIT_FAILURE); } - aux_var_info = AuxVarInfo(symb_id, AuxVarType::multiplier, 0, 0, index, 0, nullptr, ""); - aux_vars.push_back(aux_var_info); + AuxVarInfo aux_var_info = {symb_id, AuxVarType::multiplier, 0, 0, index, 0, nullptr, ""}; + aux_vars.emplace_back(aux_var_info); return symb_id; } @@ -673,9 +672,9 @@ SymbolTable::addDiffForwardAuxiliaryVar(int orig_symb_id, int orig_lead_lag, exit(EXIT_FAILURE); } - aux_var_info = AuxVarInfo(symb_id, AuxVarType::diffForward, orig_symb_id, orig_lead_lag, 0, 0, - expr_arg, ""); - aux_vars.push_back(aux_var_info); + AuxVarInfo aux_var_info = {symb_id, AuxVarType::diffForward, orig_symb_id, orig_lead_lag, 0, 0, expr_arg, ""}; + aux_vars.emplace_back(aux_var_info); + return symb_id; } @@ -696,8 +695,8 @@ SymbolTable::addPacExpectationAuxiliaryVar(const string& name, expr_t expr_arg) exit(EXIT_FAILURE); } - aux_var_info = AuxVarInfo(symb_id, AuxVarType::pacExpectation, 0, 0, 0, 0, expr_arg, ""); - aux_vars.push_back(aux_var_info); + AuxVarInfo aux_var_info = {symb_id, AuxVarType::pacExpectation, 0, 0, 0, 0, expr_arg, ""}; + aux_vars.emplace_back(aux_var_info); return symb_id; } @@ -718,8 +717,8 @@ SymbolTable::addPacTargetNonstationaryAuxiliaryVar(const string& name, expr_t ex exit(EXIT_FAILURE); } - aux_var_info = AuxVarInfo(symb_id, AuxVarType::pacTargetNonstationary, 0, 0, 0, 0, expr_arg, ""); - aux_vars.push_back(aux_var_info); + AuxVarInfo aux_var_info = {symb_id, AuxVarType::pacTargetNonstationary, 0, 0, 0, 0, expr_arg, ""}; + aux_vars.emplace_back(aux_var_info); return symb_id; }