F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug 245: build failure with gcc 4.3.x

Browse Source
This commit is contained in:
Mathieu Lacage
2008-07-02 03:16:36 -07:00
parent 67c5dfa611
commit b93a9aeef4
22 changed files with 45 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/simulator/time.cc
View File

@@ -72,7 +72,10 @@ TimeUnit<1>::TimeUnit(const std::string& s)
std::string::size_type n = s.find_first_not_of("0123456789.");
if (n != std::string::npos)
{ // Found non-numeric
double r = atof(s.substr(0, n).c_str());
std::istringstream iss;
iss.str (s.substr(0, n));
double r;
iss >> r;
std::string trailer = s.substr(n, std::string::npos);
if (trailer == std::string("s"))
{
@@ -113,7 +116,11 @@ TimeUnit<1>::TimeUnit(const std::string& s)
}
//else
//they didn't provide units, assume seconds
m_data = HighPrecision (atof(s.c_str()) * TimeStepPrecision::g_tsPrecFactor);
std::istringstream iss;
iss. str (s);
double v;
iss >> v;
m_data = HighPrecision (v * TimeStepPrecision::g_tsPrecFactor);
}
double