Merge commit '9b94f8be88ba1d2b73948f2ddb790fd976fe8e0a'

This commit is contained in:
Darth Vader 2021-05-28 18:22:16 +00:00
commit 8e7f7de5af
2 changed files with 4 additions and 2 deletions

View File

@ -1136,7 +1136,7 @@ copy_token_tab(std::string& token, const char **cptr)
* EOL,
* UNKNOWN.
*/
int i, j, return_value;
int i, return_value;
char c;
/*
* Strip leading spaces

View File

@ -1824,7 +1824,9 @@ tidy_punch(void)
for (size_t i = 0; i < current_selected_output->Get_totals().size(); i++)
{
std::pair< std::string, void *> &pair_ptr = current_selected_output->Get_totals()[i];
pair_ptr.second = master_bsearch(pair_ptr.first.c_str());
std::string noplus = pair_ptr.first;
replace(noplus, "+", "");
pair_ptr.second = master_bsearch(noplus.c_str());
}
/* molalities */