stepan
/
dynare
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

trunk preprocessor: 

* change the way we check for success of strtod() in NumericalConstants::AddConstant, because of Windows compatibility problem
* reverted r2660 changeset


git-svn-id: https://www.dynare.org/svn/dynare/trunk@2661 ac1d8469-bf42-47a9-8791-bf33cf982152
time-shift
sebastien 2009-05-07 08:50:59 +00:00
parent 6258410a83
commit f06a89697d
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
preprocessor/Makefile.in
View File

@ -1,6 +1,6 @@
CXX = @CXX@
CXXFLAGS = @CXXFLAGS@
CPPFLAGS = -DNDEBUG @CPPFLAGS@ @DEFS@
CPPFLAGS = @CPPFLAGS@ @DEFS@
LDFLAGS = @LDFLAGS@
FLEX = @FLEX@

7
preprocessor/NumericalConstants.cc
View File

@ -19,6 +19,7 @@
#include <cstdlib>
#include <cassert>
#include <cerrno>
#include <cmath>
#include <iostream>
@ -36,9 +37,9 @@ NumericalConstants::AddConstant(const string &iConst)
mNumericalConstants.push_back(iConst);
numConstantsIndex[iConst] = id;
char *endptr;
double val = strtod(iConst.c_str(), &endptr);
assert(endptr != iConst.c_str()); // Check that the conversion succeeded
errno = 0;
double val = strtod(iConst.c_str(), NULL);
assert(errno == 0); // Check that the conversion succeeded
assert(val >= 0 || isnan(val)); // Check we have a positive constant or a NaN
double_vals.push_back(val);