From 3899dfcdf6778f87c28e2a17ef94ccdaa074228b Mon Sep 17 00:00:00 2001 From: Harry Moffat Date: Thu, 14 Dec 2006 18:11:13 +0000 Subject: [PATCH] solaris port: std:: of exit() and atoi, atof --- Cantera/src/logger.h | 2 +- Cantera/src/stringUtils.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cantera/src/logger.h b/Cantera/src/logger.h index 755a96278..b992a47f0 100644 --- a/Cantera/src/logger.h +++ b/Cantera/src/logger.h @@ -58,7 +58,7 @@ namespace Cantera { /// and reimplement this method. virtual void error(const std::string& msg) { std::cerr << msg << std::endl; - exit(-1); + std::exit(-1); } /// Return an integer specifying the application environment. diff --git a/Cantera/src/stringUtils.h b/Cantera/src/stringUtils.h index 3aa6fab84..4a17be363 100755 --- a/Cantera/src/stringUtils.h +++ b/Cantera/src/stringUtils.h @@ -31,11 +31,11 @@ namespace Cantera { std::string getFileName(const std::string& path); inline int intValue(std::string val) { - return atoi(stripws(val).c_str()); + return std::atoi(stripws(val).c_str()); } inline doublereal fpValue(std::string val) { - return atof(stripws(val).c_str()); + return std::atof(stripws(val).c_str()); } std::string wrapString(const std::string& s, int len=70);