diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2016-04-18 11:51:32 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2016-04-18 11:51:32 +0200 |
| commit | c366f2b07ce16c4ccdafc7cc4199fdac2d3ffef2 (patch) | |
| tree | e9dc99f16607021d60ddb24c63ba7438e41a235d /src/Utilities.cpp | |
| parent | b8ee38bdada2067f4351b27d841e68580bcbff8e (diff) | |
| parent | 547def0ea6e3eab07b7e4c48cee6d6a81f6155e1 (diff) | |
| download | astra-c366f2b07ce16c4ccdafc7cc4199fdac2d3ffef2.tar.gz astra-c366f2b07ce16c4ccdafc7cc4199fdac2d3ffef2.tar.bz2 astra-c366f2b07ce16c4ccdafc7cc4199fdac2d3ffef2.tar.xz astra-c366f2b07ce16c4ccdafc7cc4199fdac2d3ffef2.zip | |
Merge branch 'master' into aniso
Diffstat (limited to 'src/Utilities.cpp')
| -rw-r--r-- | src/Utilities.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Utilities.cpp b/src/Utilities.cpp index 4b80503..c9740bf 100644 --- a/src/Utilities.cpp +++ b/src/Utilities.cpp @@ -42,7 +42,7 @@ namespace StringUtil { int stringToInt(const std::string& s) { - double i; + int i; std::istringstream iss(s); iss.imbue(std::locale::classic()); iss >> i; |