github/CoolProp
1
1
Fork 0
mirror of https://github.com/CoolProp/CoolProp.git synced 2026-04-23 03:00:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Maybe make the compiler happier?

Browse Source
This commit is contained in:
Ian Bell
2018-03-11 19:02:11 -06:00
parent ac84d0ddaf
commit 8f3b3a9b85
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/CoolProp.cpp
View File

@@ -118,6 +118,12 @@ bool has_solution_concentration(const std::string &fluid_string)
return (fluid_string.find('-') != std::string::npos && fluid_string.find('%') != std::string::npos);
}
struct delim : std::numpunct<char> {
char m_c;
delim(char c): m_c(c) {};
char do_decimal_point() const { return m_c; }
};
std::string extract_fractions(const std::string &fluid_string, std::vector<double> &fractions)
{
@@ -150,10 +156,8 @@ std::string extract_fractions(const std::string &fluid_string, std::vector<doubl
// with the configuration variable FLOAT_PUNCTUATION to change the locale to something more convenient for you (e.g., a ',')
// See also http://en.cppreference.com/w/cpp/locale/numpunct/decimal_point
std::stringstream ssfraction(fraction);
struct delim : std::numpunct<char> {
char do_decimal_point() const { return get_config_string(FLOAT_PUNCTUATION)[0]; }
};
ssfraction.imbue(std::locale(ssfraction.getloc(), new delim));
char c = get_config_string(FLOAT_PUNCTUATION)[0];
ssfraction.imbue(std::locale(ssfraction.getloc(), new delim(c)));
double f;
ssfraction >> f;
if (ssfraction.rdbuf()->in_avail() != 0){