mirror of
https://git.gfz-potsdam.de/naaice/iphreeqc.git
synced 2025-12-16 08:38:23 +01:00
Merge commit '9b94f8be88ba1d2b73948f2ddb790fd976fe8e0a'
This commit is contained in:
commit
8e7f7de5af
@ -1136,7 +1136,7 @@ copy_token_tab(std::string& token, const char **cptr)
|
|||||||
* EOL,
|
* EOL,
|
||||||
* UNKNOWN.
|
* UNKNOWN.
|
||||||
*/
|
*/
|
||||||
int i, j, return_value;
|
int i, return_value;
|
||||||
char c;
|
char c;
|
||||||
/*
|
/*
|
||||||
* Strip leading spaces
|
* Strip leading spaces
|
||||||
|
|||||||
@ -1824,7 +1824,9 @@ tidy_punch(void)
|
|||||||
for (size_t i = 0; i < current_selected_output->Get_totals().size(); i++)
|
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];
|
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 */
|
/* molalities */
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user